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

vtdec: Fix caps criticals during negotiation

Browse source 
Calling gst_pad_peer_query_caps() without a filter can give us EMPTY caps, whereas all the code below
assumes that's not the case. Replacing query+intersect with a filtered query ensures we always get a subset
of the template caps back.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6454>
This commit is contained in:
Piotr Brzeziński 2024-03-22 16:14:24 +01:00 committed by GStreamer Marge Bot
parent 6eab0524ca
commit 4020144a65
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
subprojects/gst-plugins-bad/sys/applemedia/vtdec.c
View file

@ -482,7 +482,22 @@ gst_vtdec_negotiate (GstVideoDecoder * decoder)
gst_video_codec_state_unref (output_state);
}
peercaps = gst_pad_peer_query_caps (GST_VIDEO_DECODER_SRC_PAD (vtdec), NULL);
templcaps =
gst_pad_get_pad_template_caps (GST_VIDEO_DECODER_SRC_PAD (decoder));
peercaps =
gst_pad_peer_query_caps (GST_VIDEO_DECODER_SRC_PAD (vtdec), templcaps);
gst_caps_unref (templcaps);
if (gst_caps_is_empty (peercaps)) {
GST_INFO_OBJECT (vtdec, "empty peer caps, can't negotiate");
gst_caps_unref (peercaps);
if (prevcaps)
gst_caps_unref (prevcaps);
return FALSE;
}
if (prevcaps && gst_caps_can_intersect (prevcaps, peercaps)) {
/* The hardware decoder can become (temporarily) unavailable across
* VTDecompressionSessionCreate/Destroy calls. So if the currently configured
@ -492,14 +507,10 @@ gst_vtdec_negotiate (GstVideoDecoder * decoder)
GST_INFO_OBJECT (vtdec,
"current and peer caps are compatible, keeping current caps");
caps = gst_caps_ref (prevcaps);
gst_caps_unref (peercaps);
} else {
templcaps =
gst_pad_get_pad_template_caps (GST_VIDEO_DECODER_SRC_PAD (decoder));
caps =
gst_caps_intersect_full (peercaps, templcaps, GST_CAPS_INTERSECT_FIRST);
gst_caps_unref (templcaps);
caps = peercaps;
}
gst_caps_unref (peercaps);
caps = gst_caps_truncate (gst_caps_make_writable (caps));