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

Revert "vaapidecode: implement negotiate() vmethod"

Browse source 
This reverts commit 3285121181.

videodecode's negotiate() vmethod is also called when events arrive,
but this would mean that the proper configuration of sink pad might
not be complete, thus we should not update the src pad.

Let's keep the old non-vmethod negotitate().
This commit is contained in:
Víctor Manuel Jáquez Leal 2016-12-09 17:42:42 +01:00
parent 2d9547273e
commit ba49dc9dd7
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst/vaapi/gstvaapidecode.c
View file

@ -458,18 +458,20 @@ set_display_res:
}
static gboolean
gst_vaapidecode_negotiate (GstVideoDecoder * vdec)
gst_vaapidecode_negotiate (GstVaapiDecode * decode)
{
GstVaapiDecode *const decode = GST_VAAPIDECODE (vdec);
GstVideoDecoder *const vdec = GST_VIDEO_DECODER (decode);
GstVaapiPluginBase *const plugin = GST_VAAPI_PLUGIN_BASE (vdec);
GST_DEBUG_OBJECT (decode, "Input codec state changed, doing renegotiation");
if (!gst_vaapi_plugin_base_set_caps (plugin, decode->sinkpad_caps, NULL))
return FALSE;
if (!gst_vaapidecode_update_src_caps (decode))
return FALSE;
if (!gst_vaapi_plugin_base_set_caps (plugin, NULL, decode->srcpad_caps))
return FALSE;
if (!GST_VIDEO_DECODER_CLASS (parent_class)->negotiate (vdec))
if (!gst_video_decoder_negotiate (vdec))
return FALSE;
return TRUE;
@ -507,8 +509,8 @@ gst_vaapidecode_push_decoded_frame (GstVideoDecoder * vdec,
if (gst_pad_needs_reconfigure (GST_VIDEO_DECODER_SRC_PAD (vdec))
|| alloc_renegotiate || caps_renegotiate) {
GST_INFO_OBJECT (decode, "input codec state changed: renegotiating");
if (!gst_video_decoder_negotiate (vdec))
if (!gst_vaapidecode_negotiate (decode))
return GST_FLOW_ERROR;
}
@ -1308,7 +1310,6 @@ gst_vaapidecode_class_init (GstVaapiDecodeClass * klass)
vdec_class->sink_query = GST_DEBUG_FUNCPTR (gst_vaapidecode_sink_query);
vdec_class->getcaps = GST_DEBUG_FUNCPTR (gst_vaapidecode_sink_getcaps);
vdec_class->sink_event = GST_DEBUG_FUNCPTR (gst_vaapidecode_sink_event);
vdec_class->negotiate = GST_DEBUG_FUNCPTR (gst_vaapidecode_negotiate);
map = (GstVaapiDecoderMap *) g_type_get_qdata (G_OBJECT_CLASS_TYPE (klass),
GST_VAAPI_DECODE_PARAMS_QDATA);