avfilter/vf_showinfo: add udu_sei_as_ascii option

Some encoders (e.g., libx264) dump encoder configuration as user data unregistered SEI message. This option try to print it as ascii character when possible.

Zhao Zhili committed 2 years ago

Commit 56ca0f21 parent fb54c893 files · +17 −3Browse files

Unified · Split

3 files

doc/filters.texi +4 −0
libavfilter/version.h +1 −1
libavfilter/vf_showinfo.c +12 −2

doc/filters.texi+4−0

@@ -21796,6 +21796,10 @@ This filter supports the following options: · 21795 unmodified lines
21796	@table @option	21796	@table @option
21797	@item checksum	21797	@item checksum
21798	Calculate checksums of each plane. By default enabled.	21798	Calculate checksums of each plane. By default enabled.
		21799
		21800	@item udu_sei_as_ascii
		21801	Try to print user data unregistered SEI as ascii character when possible,
		21802	in hex format otherwise.
21799	@end table	21803	@end table
21800		21804
21801	The shown line contains a sequence of key/value pairs of the form	21805	The shown line contains a sequence of key/value pairs of the form

libavfilter/version.h+1−1

@@ -32,7 +32,7 @@ · 31 unmodified lines
32	#include "version_major.h"	32	#include "version_major.h"
33		33
34	#define LIBAVFILTER_VERSION_MINOR 14	34	#define LIBAVFILTER_VERSION_MINOR 14
35	#define LIBAVFILTER_VERSION_MICRO 101	35	#define LIBAVFILTER_VERSION_MICRO 102
36		36
37		37
38	#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \	38	#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \

libavfilter/vf_showinfo.c+12−2

  * filter for showing textual video frame information
  */
+#include <ctype.h>
 #include <inttypes.h>
 #include "libavutil/bswap.h"
 typedef struct ShowInfoContext {
     const AVClass *class;
     int calculate_checksums;
+    int udu_sei_as_ascii;
 } ShowInfoContext;
 #define OFFSET(x) offsetof(ShowInfoContext, x)
 static const AVOption showinfo_options[] = {
     { "checksum", "calculate checksums", OFFSET(calculate_checksums), AV_OPT_TYPE_BOOL, {.i64=1}, 0, 1, VF },
+    { "udu_sei_as_ascii", "try to print user data unregistered SEI as ascii character when possible",
+        OFFSET(udu_sei_as_ascii), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VF },
     { NULL }
 };
 static void dump_sei_unregistered_metadata(AVFilterContext *ctx, const AVFrameSideData *sd)
 {
     const uint8_t *user_data = sd->data;
+    ShowInfoContext *s = ctx->priv;
     if (sd->size < AV_UUID_LEN) {
         av_log(ctx, AV_LOG_ERROR, "invalid data(%"SIZE_SPECIFIER" < "
     av_log(ctx, AV_LOG_INFO, "UUID=" AV_PRI_UUID "\n", AV_UUID_ARG(user_data));
     av_log(ctx, AV_LOG_INFO, "User Data=");
-    for (size_t i = 16; i < sd->size; i++)
+    for (size_t i = 16; i < sd->size; i++) {
-        av_log(ctx, AV_LOG_INFO, "%02x", user_data[i]);
+        const char *format = "%02x";
+        if (s->udu_sei_as_ascii)
+            format = isprint(user_data[i]) ? "%c" : "\\x%02x";
+        av_log(ctx, AV_LOG_INFO, format, user_data[i]);
+    }
     av_log(ctx, AV_LOG_INFO, "\n");
 }

avfilter/vf_showinfo: add udu_sei_as_ascii option

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code