mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 01:30:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

videomixer2: store video info with buffers to keep it in sync

Browse source 
Instead the queued buffer might have an old caps while the pad
is already storing the information for a new caps. Mixing those
while handling buffers will often lead to issues

https://bugzilla.gnome.org/show_bug.cgi?id=725948
This commit is contained in:
Thiago Santos 2014-03-11 00:46:06 -03:00
parent 4f47442c7f
commit 373eceef7c
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gst/videomixer/videomixer2.c
View file

@ -138,8 +138,11 @@ struct _GstVideoMixer2Collect
GstVideoMixer2Pad *mixpad; GstVideoMixer2Pad *mixpad;
GstBuffer *queued; /* buffer for which we don't know the end time yet */ GstBuffer *queued; /* buffer for which we don't know the end time yet */
GstVideoInfo queued_vinfo;
GstBuffer *buffer; /* buffer that should be blended now */ GstBuffer *buffer; /* buffer that should be blended now */
GstVideoInfo buffer_vinfo;
GstClockTime start_time; GstClockTime start_time;
GstClockTime end_time; GstClockTime end_time;
}; };
@ -860,6 +863,7 @@ gst_videomixer2_fill_queues (GstVideoMixer2 * mix,
GstVideoMixer2Collect *mixcol = pad->mixcol; GstVideoMixer2Collect *mixcol = pad->mixcol;
GstSegment *segment = &pad->mixcol->collect.segment; GstSegment *segment = &pad->mixcol->collect.segment;
GstBuffer *buf; GstBuffer *buf;
GstVideoInfo *vinfo;
buf = gst_collect_pads_peek (mix->collect, &mixcol->collect); buf = gst_collect_pads_peek (mix->collect, &mixcol->collect);
if (buf) { if (buf) {
@ -872,6 +876,8 @@ gst_videomixer2_fill_queues (GstVideoMixer2 * mix,
return -2; return -2;
} }
vinfo = &pad->info;
/* FIXME: Make all this work with negative rates */ /* FIXME: Make all this work with negative rates */
if ((mixcol->buffer && start_time < GST_BUFFER_TIMESTAMP (mixcol->buffer)) if ((mixcol->buffer && start_time < GST_BUFFER_TIMESTAMP (mixcol->buffer))
@ -890,6 +896,7 @@ gst_videomixer2_fill_queues (GstVideoMixer2 * mix,
start_time = GST_BUFFER_TIMESTAMP (mixcol->queued); start_time = GST_BUFFER_TIMESTAMP (mixcol->queued);
gst_buffer_unref (buf); gst_buffer_unref (buf);
buf = gst_buffer_ref (mixcol->queued); buf = gst_buffer_ref (mixcol->queued);
vinfo = &mixcol->queued_vinfo;
} else { } else {
end_time = GST_BUFFER_DURATION (buf); end_time = GST_BUFFER_DURATION (buf);
@ -897,6 +904,7 @@ gst_videomixer2_fill_queues (GstVideoMixer2 * mix,
mixcol->queued = buf; mixcol->queued = buf;
buf = gst_collect_pads_pop (mix->collect, &mixcol->collect); buf = gst_collect_pads_pop (mix->collect, &mixcol->collect);
gst_buffer_unref (buf); gst_buffer_unref (buf);
mixcol->queued_vinfo = pad->info;
need_more_data = TRUE; need_more_data = TRUE;
continue; continue;
} }
@ -958,6 +966,7 @@ gst_videomixer2_fill_queues (GstVideoMixer2 * mix,
"Taking new buffer with start time %" GST_TIME_FORMAT, "Taking new buffer with start time %" GST_TIME_FORMAT,
GST_TIME_ARGS (start_time)); GST_TIME_ARGS (start_time));
gst_buffer_replace (&mixcol->buffer, buf); gst_buffer_replace (&mixcol->buffer, buf);
mixcol->buffer_vinfo = *vinfo;
mixcol->start_time = start_time; mixcol->start_time = start_time;
mixcol->end_time = end_time; mixcol->end_time = end_time;
@ -1093,7 +1102,8 @@ gst_videomixer2_blend_buffers (GstVideoMixer2 * mix,
if (GST_CLOCK_TIME_IS_VALID (stream_time)) if (GST_CLOCK_TIME_IS_VALID (stream_time))
gst_object_sync_values (GST_OBJECT (pad), stream_time); gst_object_sync_values (GST_OBJECT (pad), stream_time);
gst_video_frame_map (&frame, &pad->info, mixcol->buffer, GST_MAP_READ); gst_video_frame_map (&frame, &mixcol->buffer_vinfo, mixcol->buffer,
GST_MAP_READ);
if (pad->convert) { if (pad->convert) {
gint converted_size; gint converted_size;