mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

vaapidecode: return pad's template caps if no display

Browse source 
A caps query can occur before the element has a display. In that case, the
element can return its pad's template. But when the element already has a
display, and the caps probe fails, the element shall return an empty caps, so
the auto-plug could try with another decoder.

If the element has a display and the caps probe works, then the computed caps
should be returned.

Signed-off-by: Víctor Manuel Jáquez Leal <victorx.jaquez@intel.com>

https://bugzilla.gnome.org/show_bug.cgi?id=757598
This commit is contained in:
Víctor Manuel Jáquez Leal 2015-10-28 13:01:04 +01:00
parent d69f747d09
commit 75e7a0a36c
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gst/vaapi/gstvaapidecode.c
View file

@ -954,12 +954,6 @@ gst_vaapidecode_ensure_allowed_caps (GstVaapiDecode * decode)
GArray *profiles; GArray *profiles;
guint i; guint i;
if (decode->allowed_caps)
return TRUE;
if (!GST_VAAPI_PLUGIN_BASE_DISPLAY (decode))
goto error_no_display;
profiles = profiles =
gst_vaapi_display_get_decode_profiles (GST_VAAPI_PLUGIN_BASE_DISPLAY gst_vaapi_display_get_decode_profiles (GST_VAAPI_PLUGIN_BASE_DISPLAY
(decode)); (decode));
@ -999,11 +993,6 @@ gst_vaapidecode_ensure_allowed_caps (GstVaapiDecode * decode)
return TRUE; return TRUE;
/* ERRORS */ /* ERRORS */
error_no_display:
{
GST_INFO_OBJECT (decode, "no VA display shared yet");
return FALSE;
}
error_no_profiles: error_no_profiles:
{ {
GST_ERROR ("failed to retrieve VA decode profiles"); GST_ERROR ("failed to retrieve VA decode profiles");
@ -1022,9 +1011,19 @@ gst_vaapidecode_get_caps (GstPad * pad)
{ {
GstVaapiDecode *const decode = GST_VAAPIDECODE (GST_OBJECT_PARENT (pad)); GstVaapiDecode *const decode = GST_VAAPIDECODE (GST_OBJECT_PARENT (pad));
if (decode->allowed_caps)
goto bail;
/* if we haven't a display yet, return our pad's template caps */
if (!GST_VAAPI_PLUGIN_BASE_DISPLAY (decode))
return gst_pad_get_pad_template_caps (pad);
/* if the allowed caps calculation fails, return an empty caps, so
* the auto-plug can try other decoder */
if (!gst_vaapidecode_ensure_allowed_caps (decode)) if (!gst_vaapidecode_ensure_allowed_caps (decode))
return gst_caps_new_empty (); return gst_caps_new_empty ();
bail:
return gst_caps_ref (decode->allowed_caps); return gst_caps_ref (decode->allowed_caps);
} }