mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-03 04:52:28 +00:00
[658/906] mixer: fix eos timestamp check
This commit is contained in:
parent
a61423c7a2
commit
7fdc174bbb
1 changed files with 4 additions and 1 deletions
|
@ -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) {
|
||||
|
|
Loading…
Reference in a new issue