diff mbox series

[FFmpeg-devel,2/2] avfilter/vf_showinfo: add dump_s12m_timecode() helper function

Message ID 1593865979-16104-2-git-send-email-lance.lmwang@gmail.com
State Accepted
Commit f9277cd796575c075cbf7c5bacd1c25ab86f5758
Headers show
Series [FFmpeg-devel,1/2] avfilter/vf_showinfo: check sd->size before reference the sd->data
Related show

Checks

Context Check Description
andriy/default pending
andriy/make success Make finished
andriy/make_fate success Make fate finished

Commit Message

Limin Wang July 4, 2020, 12:32 p.m. UTC
From: Limin Wang <lance.lmwang@gmail.com>

Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
---
 libavfilter/vf_showinfo.c | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)
diff mbox series

Patch

diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c
index 1634f68..f8a54fc 100644
--- a/libavfilter/vf_showinfo.c
+++ b/libavfilter/vf_showinfo.c
@@ -114,6 +114,22 @@  static void dump_stereo3d(AVFilterContext *ctx, AVFrameSideData *sd)
         av_log(ctx, AV_LOG_INFO, " (inverted)");
 }
 
+static void dump_s12m_timecode(AVFilterContext *ctx, AVFrameSideData *sd)
+{
+    const uint32_t *tc = (const uint32_t *)sd->data;
+
+    if ((sd->size != sizeof(uint32_t) * 4) || (tc[0] > 3)) {
+        av_log(ctx, AV_LOG_ERROR, "invalid data\n");
+        return;
+    }
+
+    for (int j = 1; j <= tc[0]; j++) {
+        char tcbuf[AV_TIMECODE_STR_SIZE];
+        av_timecode_make_smpte_tc_string(tcbuf, tc[j], 0);
+        av_log(ctx, AV_LOG_INFO, "timecode - %s%s", tcbuf, j != tc[0]  ? ", " : "");
+    }
+}
+
 static void dump_roi(AVFilterContext *ctx, AVFrameSideData *sd)
 {
     int nb_rois;
@@ -364,17 +380,7 @@  static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
             dump_stereo3d(ctx, sd);
             break;
         case AV_FRAME_DATA_S12M_TIMECODE: {
-            uint32_t *tc = (uint32_t*)sd->data;
-
-            if ((sd->size != sizeof(uint32_t) * 4) || (tc[0] > 3)) {
-                av_log(ctx, AV_LOG_ERROR, "invalid data\n");
-                break;
-            }
-            for (int j = 1; j <= tc[0]; j++) {
-                char tcbuf[AV_TIMECODE_STR_SIZE];
-                av_timecode_make_smpte_tc_string(tcbuf, tc[j], 0);
-                av_log(ctx, AV_LOG_INFO, "timecode - %s%s", tcbuf, j != tc[0] ? ", " : "");
-            }
+            dump_s12m_timecode(ctx, sd);
             break;
         }
         case AV_FRAME_DATA_DISPLAYMATRIX: