From a44517a1e83e50b9b5d4fbc9ea8f37541b7d2bdb Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Fri, 20 Sep 2013 11:54:42 +1000 Subject: [PATCH] [814/906] mixer: timestamp buffers --- gst-libs/gst/gl/gstglmixer.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gst-libs/gst/gl/gstglmixer.c b/gst-libs/gst/gl/gstglmixer.c index 3a73a62..b9c2c69 100644 --- a/gst-libs/gst/gl/gstglmixer.c +++ b/gst-libs/gst/gl/gstglmixer.c @@ -1746,7 +1746,14 @@ gst_gl_mixer_collected (GstCollectPads * pads, GstGLMixer * mix) ret = gst_buffer_pool_acquire_buffer (mix->priv->pool, &outbuf, NULL); - g_assert (mix_class->process_buffers || mix_class->process_textures); + GST_BUFFER_TIMESTAMP (outbuf) = output_start_time; + GST_BUFFER_DURATION (outbuf) = output_end_time - output_start_time; + + if (!mix_class->process_buffers && !mix_class->process_textures) { + ret = GST_FLOW_ERROR; + g_assert_not_reached (); + goto error; + } if (mix_class->process_buffers) gst_gl_mixer_process_buffers (mix, outbuf); -- 2.7.4