From: Matthew Waters <ystreet00@gmail.com>
Date: Thu, 31 Jan 2013 12:32:49 +0000 (+1100)
Subject: [658/906] mixer: fix eos timestamp check
X-Git-Tag: 1.19.3~507^2~11874
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7fdc174bbbb57305ac0a1a5aaf09670a3b3b9894;p=platform%2Fupstream%2Fgstreamer.git

[658/906] mixer: fix eos timestamp check
---

diff --git a/gst-libs/gst/gl/gstglmixer.c b/gst-libs/gst/gl/gstglmixer.c
index 8517040..5991141 100644
--- a/gst-libs/gst/gl/gstglmixer.c
+++ b/gst-libs/gst/gl/gstglmixer.c
@@ -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) {