mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-01 04:10:41 +00:00
Code Issues 1 Projects Releases Wiki Activity

av1parse: Use the intersected caps to decide the alignment.

Browse source 
When we negotiate with downstream, We should use the intersected
caps of input and output to decide the alignment and stream format.
The current code just uses the input caps which may lack the stream
format.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1837>
This commit is contained in:
He Junyan 2022-03-03 22:38:56 +08:00 committed by GStreamer Marge Bot
parent ccd1ed9cbc
commit 81bae87079
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
subprojects/gst-plugins-bad/gst/videoparsers/gstav1parse.c
View file

@ -761,9 +761,11 @@ gst_av1_parse_negotiate (GstAV1Parse * self, GstCaps * in_caps)
/* Both upsteam and downstream support, best */
if (in_caps && caps) {
if (gst_caps_can_intersect (in_caps, caps)) {
GST_DEBUG_OBJECT (self, "downstream accepts upstream caps");
align = gst_av1_parse_alignment_from_caps (in_caps);
gst_clear_caps (&caps);
GstCaps *common_caps = NULL;
common_caps = gst_caps_intersect (in_caps, caps);
align = gst_av1_parse_alignment_from_caps (common_caps);
gst_clear_caps (&common_caps);
}
}
if (align != GST_AV1_PARSE_ALIGN_NONE)
@ -867,7 +869,8 @@ gst_av1_parse_set_sink_caps (GstBaseParse * parse, GstCaps * caps)
if (align == GST_AV1_PARSE_ALIGN_NONE) {
align = GST_AV1_PARSE_ALIGN_BYTE;
gst_caps_set_simple (in_caps, "alignment", G_TYPE_STRING,
gst_av1_parse_alignment_to_string (align), NULL);
gst_av1_parse_alignment_to_string (align),
"stream-format", G_TYPE_STRING, "obu-stream", NULL);
}
/* negotiate with downstream, set output align */