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

videomixer: Dequeue current buffer on FLUSH_STOP and don't unref NULL buffers

Browse source 
... NULL buffers shouldn't really happen anymore when popping the
buffer from GstCollectPads but better check for this and print a warning.
This commit is contained in:
Sebastian Dröge 2009-12-12 16:55:13 +01:00
parent 760eaf7b2a
commit 66d3ac8fb7
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
gst/videomixer/videomixer.c
View file

@ -1136,6 +1136,7 @@ gst_videomixer_fill_queues (GstVideoMixer * mix)
GST_LOG_OBJECT (mix, "we need a new buffer"); GST_LOG_OBJECT (mix, "we need a new buffer");
buf = gst_collect_pads_peek (mix->collect, data); buf = gst_collect_pads_peek (mix->collect, data);
if (buf) { if (buf) {
guint64 duration; guint64 duration;
@ -1287,9 +1288,16 @@ gst_videomixer_update_queues (GstVideoMixer * mix)
pad->queued -= interval; pad->queued -= interval;
GST_LOG_OBJECT (pad, "queued now %" G_GINT64_FORMAT, pad->queued); GST_LOG_OBJECT (pad, "queued now %" G_GINT64_FORMAT, pad->queued);
if (pad->queued <= 0) { if (pad->queued <= 0) {
GstBuffer *buffer =
gst_collect_pads_pop (mix->collect, &mixcol->collect);
GST_LOG_OBJECT (pad, "unreffing buffer"); GST_LOG_OBJECT (pad, "unreffing buffer");
gst_buffer_unref (gst_collect_pads_pop (mix->collect, if (buffer)
&mixcol->collect)); gst_buffer_unref (buffer);
else
GST_WARNING_OBJECT (pad,
"Buffer was removed by GstCollectPads in the meantime");
gst_buffer_unref (mixcol->buffer); gst_buffer_unref (mixcol->buffer);
mixcol->buffer = NULL; mixcol->buffer = NULL;
} }
@ -1503,6 +1511,7 @@ gst_videomixer_src_event (GstPad * pad, GstEvent * event)
static gboolean static gboolean
gst_videomixer_sink_event (GstPad * pad, GstEvent * event) gst_videomixer_sink_event (GstPad * pad, GstEvent * event)
{ {
GstVideoMixerPad *vpad = GST_VIDEO_MIXER_PAD (pad);
GstVideoMixer *videomixer = GST_VIDEO_MIXER (gst_pad_get_parent (pad)); GstVideoMixer *videomixer = GST_VIDEO_MIXER (gst_pad_get_parent (pad));
gboolean ret; gboolean ret;
@ -1518,6 +1527,12 @@ gst_videomixer_sink_event (GstPad * pad, GstEvent * event)
* and downstream (using our source pad, the bastard!). * and downstream (using our source pad, the bastard!).
*/ */
videomixer->sendseg = TRUE; videomixer->sendseg = TRUE;
/* Reset pad state after FLUSH_STOP */
if (vpad->mixcol->buffer)
gst_buffer_unref (vpad->mixcol->buffer);
vpad->mixcol->buffer = NULL;
vpad->queued = 0;
break; break;
case GST_EVENT_NEWSEGMENT: case GST_EVENT_NEWSEGMENT:
videomixer->sendseg = TRUE; videomixer->sendseg = TRUE;