diff mbox series

[FFmpeg-devel,v8,3/4] avfilter/vf_showinfo: display H.26[45] user data unregistered sei message

Message ID 20200108154603.5748-3-lance.lmwang@gmail.com
State Superseded
Headers show
Series [FFmpeg-devel,v8,1/4] avutil: add AV_FRAME_DATA_SEI_UNREGISTERED side data type
Related show

Checks

Context Check Description
andriy/ffmpeg-patchwork pending
andriy/ffmpeg-patchwork success Applied patch
andriy/ffmpeg-patchwork success Configure finished
andriy/ffmpeg-patchwork success Make finished
andriy/ffmpeg-patchwork success Make fate finished

Commit Message

Limin Wang Jan. 8, 2020, 3:46 p.m. UTC
From: Limin Wang <lance.lmwang@gmail.com>

Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
---
 libavfilter/vf_showinfo.c | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

Comments

Moritz Barsnick Jan. 9, 2020, 9:37 a.m. UTC | #1
On Wed, Jan 08, 2020 at 23:46:02 +0800, lance.lmwang@gmail.com wrote:
> +    /* Only print the user data details if it's string */
> +    if (string_is_print(user_data)) {
> +        av_log(ctx, AV_LOG_INFO, "User Data=");
> +        av_log(ctx, AV_LOG_INFO, "%s", user_data);
> +    }

Is this missing a final linebreak? Just wondering, I didn't test.

Moritz
Limin Wang Jan. 9, 2020, 10:37 a.m. UTC | #2
On Thu, Jan 09, 2020 at 10:37:44AM +0100, Moritz Barsnick wrote:
> On Wed, Jan 08, 2020 at 23:46:02 +0800, lance.lmwang@gmail.com wrote:
> > +    /* Only print the user data details if it's string */
> > +    if (string_is_print(user_data)) {
> > +        av_log(ctx, AV_LOG_INFO, "User Data=");
> > +        av_log(ctx, AV_LOG_INFO, "%s", user_data);
> > +    }
> 
> Is this missing a final linebreak? Just wondering, I didn't test.

good catch, if you're checking the code, you'll notice the line break is
placed after the case condition.

> 
> Moritz
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> 
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
diff mbox series

Patch

diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c
index 5fff123..fc24e29 100644
--- a/libavfilter/vf_showinfo.c
+++ b/libavfilter/vf_showinfo.c
@@ -23,6 +23,7 @@ 
  */
 
 #include <inttypes.h>
+#include <ctype.h>
 
 #include "libavutil/bswap.h"
 #include "libavutil/adler32.h"
@@ -170,6 +171,39 @@  static void dump_content_light_metadata(AVFilterContext *ctx, AVFrameSideData *s
            metadata->MaxCLL, metadata->MaxFALL);
 }
 
+static int string_is_print(const uint8_t *str)
+{
+    while (isprint(*str)) str++;
+    return !*str;
+}
+
+static void dump_sei_unregistered_metadata(AVFilterContext *ctx, AVFrameSideData *sd)
+{
+    const int uuid_size = 16;
+    uint8_t *user_data = sd->data;
+
+    if (sd->size < uuid_size) {
+        av_log(ctx, AV_LOG_ERROR, "invalid data(%d < UUID(%d-bytes))", sd->size, uuid_size);
+        return;
+    }
+
+    av_log(ctx, AV_LOG_INFO, "User Data Unregistered:\n");
+    av_log(ctx, AV_LOG_INFO, "UUID=");
+    for (int i = 0; i < uuid_size; i++) {
+        av_log(ctx, AV_LOG_INFO, "%02x", user_data[i]);
+        if (i == 3 || i == 5 || i == 7 || i == 9)
+            av_log(ctx, AV_LOG_INFO, "-");
+    }
+    av_log(ctx, AV_LOG_INFO, "\n");
+
+    user_data += uuid_size;
+    /* Only print the user data details if it's string */
+    if (string_is_print(user_data)) {
+        av_log(ctx, AV_LOG_INFO, "User Data=");
+        av_log(ctx, AV_LOG_INFO, "%s", user_data);
+    }
+}
+
 static void dump_color_property(AVFilterContext *ctx, AVFrame *frame)
 {
     const char *color_range_str     = av_color_range_name(frame->color_range);
@@ -347,6 +381,9 @@  static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
             av_log(ctx, AV_LOG_INFO, "GOP timecode - %s", tcbuf);
             break;
         }
+        case AV_FRAME_DATA_SEI_UNREGISTERED:
+            dump_sei_unregistered_metadata(ctx, sd);
+            break;
         default:
             av_log(ctx, AV_LOG_WARNING, "unknown side data type %d (%d bytes)",
                    sd->type, sd->size);