commit bee2086f90277ee229da3157ad055df013858d75
author fei.deng <fei.deng@amlogic.com> Tue Jun 14 14:59:48 2022 +0800
committer fei.deng <fei.deng@amlogic.com> Tue Jun 14 14:59:48 2022 +0800
tree d436691ad8bc33d8af313cf9a6522975da653508
parent 01cd7b56c4156a84b6b83fe43150b69b86c125ac

amlv4l2dec: CB2 fix get pts wrong [1/1]

PD#SH-10006

Problem:
if the es is not good,decoder don't output all decoded
frame, the function gst_aml_v4l2_video_dec_get_oldest_frame
of amlv4l2dec will got wrong pts

Solution:
implementing a new function
gst_aml_v4l2_video_dec_get_right_frame to replace
gst_aml_v4l2_video_dec_get_oldest_frame

Verify:
ap222

Change-Id: I06f9247cebba9cdd4301474e64f27fbe0bac8a0f
Signed-off-by: fei.deng <fei.deng@amlogic.com>

src/gstamlv4l2videodec.c

diff --git a/src/gstamlv4l2videodec.c b/src/gstamlv4l2videodec.c
index 9e9a4c9..4608bab 100644
--- a/src/gstamlv4l2videodec.c
+++ b/src/gstamlv4l2videodec.c
@@ -612,6 +612,43 @@
     return frame;
 }
 
+static GstVideoCodecFrame *
+gst_aml_v4l2_video_dec_get_right_frame(GstVideoDecoder *decoder, GstClockTime pts)
+{
+    GstVideoCodecFrame *frame = NULL;
+    GList *frames, *l;
+    gint count = 0;
+
+    frames = gst_video_decoder_get_frames(decoder);
+
+    for (l = frames; l != NULL; l = l->next)
+    {
+        GstVideoCodecFrame *f = l->data;
+
+        if (GST_CLOCK_TIME_IS_VALID(pts) && (ABS(f->pts - pts)) < 10) {
+            frame = f;
+            break;
+        } else {
+            if (!frame || (GST_CLOCK_TIME_IS_VALID(frame->pts) && GST_CLOCK_TIME_IS_VALID(f->pts) && (frame->pts > f->pts)))
+                frame = f;
+        }
+
+        count++;
+    }
+
+    if (frame)
+    {
+        GST_LOG_OBJECT(decoder,
+                       "frame is %d %" GST_TIME_FORMAT " and %d frames left",
+                       frame->system_frame_number, GST_TIME_ARGS(frame->pts), count - 1);
+        gst_video_codec_frame_ref(frame);
+    }
+
+    g_list_free_full(frames, (GDestroyNotify)gst_video_codec_frame_unref);
+
+    return frame;
+}
+
 static gboolean
 gst_aml_v4l2_video_remove_padding(GstCapsFeatures *features,
                                   GstStructure *structure, gpointer user_data)
@@ -774,6 +811,7 @@
         /* Pool may be NULL if we started going to READY state */
         if (pool == NULL)
         {
+            GST_WARNING_OBJECT(decoder, "gst_video_decoder_get_buffer_pool goto beach");
             ret = GST_FLOW_FLUSHING;
             goto beach;
         }
@@ -788,8 +826,10 @@
             return;
         }
 
-        if (ret != GST_FLOW_OK)
+        if (ret != GST_FLOW_OK) {
+            GST_WARNING_OBJECT(decoder, "gst_buffer_pool_acquire_buffer goto beach ret:%d",ret);
             goto beach;
+        }
 
         GST_LOG_OBJECT(decoder, "Process output buffer");
         ret = gst_aml_v4l2_buffer_pool_process(v4l2_pool, &buffer);
@@ -804,7 +844,7 @@
     if (ret != GST_FLOW_OK)
         goto beach;
 
-    frame = gst_aml_v4l2_video_dec_get_oldest_frame(decoder);
+    frame = gst_aml_v4l2_video_dec_get_right_frame(decoder, GST_BUFFER_TIMESTAMP (buffer));
 
     if (frame)
     {