MMFMWK-8489: VPU Decoder: make sure the output timestamp is increasing

If there are some repetitive timestamp,
the output timestamp may be not increasing.
In such case, the gstreamer avsync will not work.
So keep the output timestamp increasing will fix it.

Signed-off-by: ming_qian <ming.qian@nxp.com>

diff --git a/drivers/mxc/vpu_malone/vpu_b0.c b/drivers/mxc/vpu_malone/vpu_b0.c
index 4fff407..c115469 100644 (file)
--- a/drivers/mxc/vpu_malone/vpu_b0.c
+++ b/drivers/mxc/vpu_malone/vpu_b0.c
@@ -1178,7 +1178,9 @@ static void vpu_dec_receive_ts(struct vpu_ctx *ctx,
        if (input_ts < 0)
                input_ts = TSM_TIMESTAMP_NONE;
 
-       if (input_ts != TSM_TIMESTAMP_NONE && input_ts > ctx->output_ts)
+       if (TSM_TS_IS_VALID(input_ts) && input_ts == ctx->output_ts)
+               vpu_dbg(LVL_BIT_TS, "repetitive timestamp\n");
+       if (TSM_TS_IS_VALID(input_ts) && input_ts > ctx->output_ts)
                ctx->output_ts = input_ts;
 
        if (down_interruptible(&ctx->tsm_lock)) {
@@ -1252,6 +1254,11 @@ static void vpu_dec_send_ts(struct vpu_ctx *ctx, struct v4l2_buffer *buf)
        }
 
        ts = TSManagerSend2(ctx->tsm, NULL);
+       if (TSM_TS_IS_VALID(ts) && ts < ctx->capture_ts) {
+               vpu_dbg(LVL_BIT_TS, "revise timestamp: %32lld -> %32lld\n",
+                               ts, ctx->capture_ts);
+               ts = ctx->capture_ts;
+       }
        vpu_dbg(LVL_BIT_TS, "[OUTPUT TS]%32lld (%lld)\n",
                        ts, getTSManagerFrameInterval(ctx->tsm));
        buf->timestamp = ns_to_timeval(ts);
@@ -1259,7 +1266,7 @@ static void vpu_dec_send_ts(struct vpu_ctx *ctx, struct v4l2_buffer *buf)
 
        up(&ctx->tsm_lock);
 
-       if (ts != TSM_TIMESTAMP_NONE)
+       if (TSM_TS_IS_VALID(ts))
                ctx->capture_ts = ts;
 }
 
@@ -2695,8 +2702,8 @@ static bool vpu_dec_stream_is_ready(struct vpu_ctx *ctx)
        }
 
        if (ctx->ts_threshold > 0 &&
-               ctx->output_ts != TSM_TIMESTAMP_NONE &&
-               ctx->capture_ts != TSM_TIMESTAMP_NONE) {
+               TSM_TS_IS_VALID(ctx->output_ts) &&
+               TSM_TS_IS_VALID(ctx->capture_ts)) {
                s64 threshold = ctx->ts_threshold * NSEC_PER_MSEC;
 
                if (ctx->output_ts > ctx->capture_ts + threshold)