mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-22 22:16:22 +00:00
Code Issues 1 Projects Releases Wiki Activity

vaapidecode: force add h264 SVC profiles in caps

Browse source 
When vaapih264dec's base-only profile is set to TRUE, fake SVC profile
support in caps.

https://bugzilla.gnome.org/show_bug.cgi?id=732266

Signed-off-by: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
This commit is contained in:
Orestis Floros 2017-08-28 17:34:50 -07:00 committed by Sreerenj Balachandran
parent 0955752898
commit 1ae42facc1
1 changed files with 36 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
gst/vaapi/gstvaapidecode.c
View file

@ -1161,6 +1161,14 @@ is_mvc_profile (GstVaapiProfile profile)
|| profile == GST_VAAPI_PROFILE_H264_STEREO_HIGH; || profile == GST_VAAPI_PROFILE_H264_STEREO_HIGH;
} }
static gboolean
is_svc_profile (GstVaapiProfile profile)
{
return profile == GST_VAAPI_PROFILE_H264_SCALABLE_BASELINE
|| profile == GST_VAAPI_PROFILE_H264_SCALABLE_HIGH;
}
static GstCaps * static GstCaps *
add_h264_profile_in_caps (GstCaps * caps, const gchar * profile_name) add_h264_profile_in_caps (GstCaps * caps, const gchar * profile_name)
{ {
@ -1179,6 +1187,7 @@ gst_vaapidecode_ensure_allowed_sinkpad_caps (GstVaapiDecode * decode)
gboolean base_only = FALSE; gboolean base_only = FALSE;
gboolean have_high = FALSE; gboolean have_high = FALSE;
gboolean have_mvc = FALSE; gboolean have_mvc = FALSE;
gboolean have_svc = FALSE;
profiles = profiles =
gst_vaapi_display_get_decode_profiles (GST_VAAPI_PLUGIN_BASE_DISPLAY gst_vaapi_display_get_decode_profiles (GST_VAAPI_PLUGIN_BASE_DISPLAY
@ -1217,17 +1226,38 @@ gst_vaapidecode_ensure_allowed_sinkpad_caps (GstVaapiDecode * decode)
allowed_sinkpad_caps = gst_caps_merge (allowed_sinkpad_caps, caps); allowed_sinkpad_caps = gst_caps_merge (allowed_sinkpad_caps, caps);
have_mvc |= is_mvc_profile (profile); have_mvc |= is_mvc_profile (profile);
have_svc |= is_svc_profile (profile);
have_high |= profile == GST_VAAPI_PROFILE_H264_HIGH; have_high |= profile == GST_VAAPI_PROFILE_H264_HIGH;
} }
if (base_only && !have_mvc && have_high) { if (base_only && (!have_mvc || !have_svc) && have_high) {
GST_DEBUG ("base_only: Force adding MVC profiles in caps"); if (!have_mvc) {
GST_DEBUG ("base_only: force adding MVC profiles in caps");
allowed_sinkpad_caps = allowed_sinkpad_caps =
add_h264_profile_in_caps (allowed_sinkpad_caps, "multiview-high"); add_h264_profile_in_caps (allowed_sinkpad_caps, "multiview-high");
allowed_sinkpad_caps = allowed_sinkpad_caps =
add_h264_profile_in_caps (allowed_sinkpad_caps, "stereo-high"); add_h264_profile_in_caps (allowed_sinkpad_caps, "stereo-high");
} }
if (!have_svc) {
GST_DEBUG ("base_only: force adding SVC profiles in caps");
allowed_sinkpad_caps =
add_h264_profile_in_caps (allowed_sinkpad_caps,
"scalable-constrained-baseline");
allowed_sinkpad_caps =
add_h264_profile_in_caps (allowed_sinkpad_caps, "scalable-baseline");
allowed_sinkpad_caps =
add_h264_profile_in_caps (allowed_sinkpad_caps,
"scalable-high-intra");
allowed_sinkpad_caps =
add_h264_profile_in_caps (allowed_sinkpad_caps,
"scalable-constrained-high");
allowed_sinkpad_caps =
add_h264_profile_in_caps (allowed_sinkpad_caps, "scalable-high");
}
}
decode->allowed_sinkpad_caps = gst_caps_simplify (allowed_sinkpad_caps); decode->allowed_sinkpad_caps = gst_caps_simplify (allowed_sinkpad_caps);
g_array_unref (profiles); g_array_unref (profiles);