mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-17 13:56:32 +00:00
Code Issues 1 Projects Releases Wiki Activity

cccombiner: fix scheduling with interlaced video buffers

Browse source 
The initial code was written with the misunderstanding that
IS_TOP_FIELD indicated that an interlaced buffer contained
a top field, not that it contained only a top field

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2413>
This commit is contained in:
Mathieu Duponchelle 2021-07-15 21:10:14 +02:00 committed by GStreamer Marge Bot
parent 52fff41aae
commit 20483c3449
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ext/closedcaption/gstcccombiner.c
View file

@ -853,7 +853,7 @@ gst_cc_combiner_collect_captions (GstCCCombiner * self, gboolean timeout)
/* Only relevant in alternate and mixed mode, no need to look at the caps */ /* Only relevant in alternate and mixed mode, no need to look at the caps */
if (GST_BUFFER_FLAG_IS_SET (self->current_video_buffer, if (GST_BUFFER_FLAG_IS_SET (self->current_video_buffer,
GST_VIDEO_BUFFER_FLAG_INTERLACED)) { GST_VIDEO_BUFFER_FLAG_INTERLACED)) {
if (GST_VIDEO_BUFFER_IS_TOP_FIELD (self->current_video_buffer)) { if (!GST_VIDEO_BUFFER_IS_BOTTOM_FIELD (self->current_video_buffer)) {
dequeue_caption (self, tc, 0); dequeue_caption (self, tc, 0);
} }
} else { } else {
@ -867,11 +867,12 @@ gst_cc_combiner_collect_captions (GstCCCombiner * self, gboolean timeout)
if (self->progressive) { if (self->progressive) {
dequeue_caption (self, tc, 0); dequeue_caption (self, tc, 0);
} else if (GST_BUFFER_FLAG_IS_SET (self->current_video_buffer, } else if (GST_BUFFER_FLAG_IS_SET (self->current_video_buffer,
GST_VIDEO_BUFFER_FLAG_INTERLACED)) { GST_VIDEO_BUFFER_FLAG_INTERLACED) &&
GST_BUFFER_FLAG_IS_SET (self->current_video_buffer,
GST_VIDEO_BUFFER_FLAG_ONEFIELD)) {
if (GST_VIDEO_BUFFER_IS_TOP_FIELD (self->current_video_buffer)) { if (GST_VIDEO_BUFFER_IS_TOP_FIELD (self->current_video_buffer)) {
dequeue_caption (self, tc, 0); dequeue_caption (self, tc, 0);
} } else {
if (GST_VIDEO_BUFFER_IS_BOTTOM_FIELD (self->current_video_buffer)) {
dequeue_caption (self, tc, 1); dequeue_caption (self, tc, 1);
} }
} else { } else {
@ -886,7 +887,7 @@ gst_cc_combiner_collect_captions (GstCCCombiner * self, gboolean timeout)
dequeue_caption (self, tc, 0); dequeue_caption (self, tc, 0);
} else if (GST_BUFFER_FLAG_IS_SET (self->current_video_buffer, } else if (GST_BUFFER_FLAG_IS_SET (self->current_video_buffer,
GST_VIDEO_BUFFER_FLAG_INTERLACED)) { GST_VIDEO_BUFFER_FLAG_INTERLACED)) {
if (GST_VIDEO_BUFFER_IS_TOP_FIELD (self->current_video_buffer)) { if (!GST_VIDEO_BUFFER_IS_BOTTOM_FIELD (self->current_video_buffer)) {
dequeue_caption (self, tc, 0); dequeue_caption (self, tc, 0);
} }
} else { } else {