mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-05 02:02:26 +00:00
Code Issues 1 Projects Releases Wiki Activity

[658/906] mixer: fix eos timestamp check

Browse source
This commit is contained in:
Matthew Waters 2013-01-31 23:32:49 +11:00 committed by Tim-Philipp Müller
parent 535074cc87
commit 0cc3150e37
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gst-libs/gst/gl/gstglmixer.c
View file

@ -1403,7 +1403,7 @@ gst_gl_mixer_fill_queues (GstGLMixer * mix,
}
} else {
if (mixcol->end_time != -1) {
if (mixcol->end_time < output_start_time) {
if (mixcol->end_time <= output_start_time) {
gst_buffer_replace (&mixcol->buffer, NULL);
mixcol->start_time = mixcol->end_time = -1;
if (!GST_COLLECT_PADS_STATE_IS_SET (mixcol,
@ -1686,6 +1686,9 @@ gst_gl_mixer_collected (GstCollectPads * pads, GstGLMixer * mix)
if (mix->segment.stop != -1)
output_end_time = MIN (output_end_time, mix->segment.stop);
GST_LOG ("got output times start:%" GST_TIME_FORMAT " end:%" GST_TIME_FORMAT,
GST_TIME_ARGS (output_start_time), GST_TIME_ARGS (output_end_time));
res = gst_gl_mixer_fill_queues (mix, output_start_time, output_end_time);
if (res == 0) {