mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-28 04:31:06 +00:00
Code Issues 1 Projects Releases Wiki Activity

plugins: don't create display at caps query

Browse source 
Caps query can happen before the element has a bus. The display creation should
be should occur on the context negotiation, when the bus is already configured.
Then at caps query no display should be created.

Instead of force the display creation, we graciously fail the allowed_caps()
creation.

This change only applies for vaapidecode and vaapisink. The vaapipostroc, as a
basetransform descendant, seems to be not affected by this, nor the encoders.

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 12:59:02 +01:00
parent b2707c8eec
commit d69f747d09
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst/vaapi/gstvaapidecode.c
View file

@ -957,7 +957,7 @@ gst_vaapidecode_ensure_allowed_caps (GstVaapiDecode * decode)
if (decode->allowed_caps) if (decode->allowed_caps)
return TRUE; return TRUE;
if (!gst_vaapidecode_ensure_display (decode)) if (!GST_VAAPI_PLUGIN_BASE_DISPLAY (decode))
goto error_no_display; goto error_no_display;
profiles = profiles =
@ -1001,7 +1001,7 @@ gst_vaapidecode_ensure_allowed_caps (GstVaapiDecode * decode)
/* ERRORS */ /* ERRORS */
error_no_display: error_no_display:
{ {
GST_ERROR ("failed to retrieve VA display"); GST_INFO_OBJECT (decode, "no VA display shared yet");
return FALSE; return FALSE;
} }
error_no_profiles: error_no_profiles:

2
gst/vaapi/gstvaapisink.c
View file

@ -1206,7 +1206,7 @@ gst_vaapisink_get_caps_impl (GstBaseSink * base_sink)
if (!out_caps) if (!out_caps)
return NULL; return NULL;
if (gst_vaapisink_ensure_display (sink)) { if (GST_VAAPI_PLUGIN_BASE_DISPLAY (sink)) {
raw_caps = gst_vaapi_plugin_base_get_allowed_raw_caps (GST_VAAPI_PLUGIN_BASE (sink)); raw_caps = gst_vaapi_plugin_base_get_allowed_raw_caps (GST_VAAPI_PLUGIN_BASE (sink));
if (raw_caps) { if (raw_caps) {
out_caps = gst_caps_make_writable (out_caps); out_caps = gst_caps_make_writable (out_caps);