From bd60f141e9a0d191a72a8779834d46922485f84f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Tue, 6 Dec 2011 12:46:51 +0100
Subject: [PATCH] omxvideoenc: Use correct timestamp, duration and filled
 length for the EOS buffers

---
 omx/gstomxvideoenc.c | 14 ++++++++++++++
 omx/gstomxvideoenc.h |  2 ++
 2 files changed, 16 insertions(+)

diff --git a/omx/gstomxvideoenc.c b/omx/gstomxvideoenc.c
index 4bec814459..9ac382a63b 100644
--- a/omx/gstomxvideoenc.c
+++ b/omx/gstomxvideoenc.c
@@ -980,6 +980,7 @@ gst_omx_video_enc_start (GstBaseVideoEncoder * encoder)
 
   self = GST_OMX_VIDEO_ENC (encoder);
 
+  self->last_upstream_ts = 0;
   self->eos = FALSE;
   self->downstream_flow_ret = GST_FLOW_OK;
   ret =
@@ -1181,6 +1182,7 @@ gst_omx_video_enc_reset (GstBaseVideoEncoder * encoder)
   gst_omx_port_set_flushing (self->out_port, FALSE);
 
   /* Start the srcpad loop again */
+  self->last_upstream_ts = 0;
   self->eos = FALSE;
   self->downstream_flow_ret = GST_FLOW_OK;
   gst_pad_start_task (GST_BASE_VIDEO_CODEC_SRC_PAD (self),
@@ -1448,6 +1450,7 @@ gst_omx_video_enc_handle_frame (GstBaseVideoEncoder * encoder,
     if (timestamp != GST_CLOCK_TIME_NONE) {
       buf->omx_buf->nTimeStamp =
           gst_util_uint64_scale (timestamp, OMX_TICKS_PER_SECOND, GST_SECOND);
+      self->last_upstream_ts = timestamp;
     }
 
     duration = frame->presentation_duration;
@@ -1455,6 +1458,7 @@ gst_omx_video_enc_handle_frame (GstBaseVideoEncoder * encoder,
       buf->omx_buf->nTickCount =
           gst_util_uint64_scale (buf->omx_buf->nFilledLen, duration,
           GST_BUFFER_SIZE (frame->sink_buffer));
+      self->last_upstream_ts += duration;
     }
 
     id = g_slice_new0 (BufferIdentification);
@@ -1533,6 +1537,11 @@ gst_omx_video_enc_finish (GstBaseVideoEncoder * encoder)
    * the EOS buffer arrives on the output port. */
   acq_ret = gst_omx_port_acquire_buffer (self->in_port, &buf);
   if (acq_ret == GST_OMX_ACQUIRE_BUFFER_OK) {
+    buf->omx_buf->nFilledLen = 0;
+    buf->omx_buf->nTimeStamp =
+        gst_util_uint64_scale (self->last_upstream_ts, OMX_TICKS_PER_SECOND,
+        GST_SECOND);
+    buf->omx_buf->nTickCount = 0;
     buf->omx_buf->nFlags |= OMX_BUFFERFLAG_EOS;
     gst_omx_port_release_buffer (self->in_port, buf);
     GST_DEBUG_OBJECT (self, "Sent EOS to the component");
@@ -1583,6 +1592,11 @@ gst_omx_video_enc_drain (GstOMXVideoEnc * self)
 
   g_mutex_lock (self->drain_lock);
   self->draining = TRUE;
+  buf->omx_buf->nFilledLen = 0;
+  buf->omx_buf->nTimeStamp =
+      gst_util_uint64_scale (self->last_upstream_ts, OMX_TICKS_PER_SECOND,
+      GST_SECOND);
+  buf->omx_buf->nTickCount = 0;
   buf->omx_buf->nFlags |= OMX_BUFFERFLAG_EOS;
   gst_omx_port_release_buffer (self->in_port, buf);
   GST_DEBUG_OBJECT (self, "Waiting until component is drained");
diff --git a/omx/gstomxvideoenc.h b/omx/gstomxvideoenc.h
index 5565b0eb3e..e728d0652b 100644
--- a/omx/gstomxvideoenc.h
+++ b/omx/gstomxvideoenc.h
@@ -58,6 +58,8 @@ struct _GstOMXVideoEnc
    * the first buffer */
   gboolean started;
 
+  GstClockTime last_upstream_ts;
+
   /* Draining state */
   GMutex *drain_lock;
   GCond *drain_cond;