mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-24 18:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

vaapidecode: intersect with filter in getcaps()

Browse source 
In commit 6034734d I forgot to add the caps filter intersection in the
getcaps() vmethod generating a regression when a capsfilter is set in the
pipeline.

This commit adds the caps filter intersection.
This commit is contained in:
Víctor Manuel Jáquez Leal 2016-03-01 11:35:49 +01:00
parent 0bae36bb88
commit 861ef4d218
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gst/vaapi/gstvaapidecode.c
View file

@ -1005,13 +1005,16 @@ static GstCaps *
gst_vaapidecode_sink_getcaps (GstVideoDecoder * vdec, GstCaps * filter) gst_vaapidecode_sink_getcaps (GstVideoDecoder * vdec, GstCaps * filter)
{ {
GstVaapiDecode *const decode = GST_VAAPIDECODE (vdec); GstVaapiDecode *const decode = GST_VAAPIDECODE (vdec);
GstCaps *tmp, *caps = NULL;
if (decode->allowed_caps) if (decode->allowed_caps)
goto bail; goto bail;
/* if we haven't a display yet, return our pad's template caps */ /* if we haven't a display yet, return our pad's template caps */
if (!GST_VAAPI_PLUGIN_BASE_DISPLAY (decode)) if (!GST_VAAPI_PLUGIN_BASE_DISPLAY (decode)) {
return gst_pad_get_pad_template_caps (GST_VIDEO_DECODER_SINK_PAD (vdec)); caps = gst_pad_get_pad_template_caps (GST_VIDEO_DECODER_SINK_PAD (vdec));
goto bail;
}
/* if the allowed caps calculation fails, return an empty caps, so /* if the allowed caps calculation fails, return an empty caps, so
* the auto-plug can try other decoder */ * the auto-plug can try other decoder */
@ -1019,7 +1022,16 @@ gst_vaapidecode_sink_getcaps (GstVideoDecoder * vdec, GstCaps * filter)
return gst_caps_new_empty (); return gst_caps_new_empty ();
bail: bail:
return gst_caps_ref (decode->allowed_caps); if (!caps)
caps = gst_caps_ref (decode->allowed_caps);
if (filter) {
tmp = caps;
caps = gst_caps_intersect_full (filter, tmp, GST_CAPS_INTERSECT_FIRST);
gst_caps_unref (tmp);
}
return caps;
} }
static gboolean static gboolean