diff options
| author | Pierre-Anthony Lemieux <pal@palemieux.com> | 2022-06-01 17:30:37 -0700 |
|---|---|---|
| committer | Zane van Iperen <zane@zanevaniperen.com> | 2022-06-12 18:34:38 +1000 |
| commit | 4d45f5acbd9ab55cd8d29d01843f28315ee27fee (patch) | |
| tree | 2df77c884f147f0ee79989bcd44070a7c2b7e40f /libavfilter/vf_showinfo.c | |
| parent | 751549af9b367877253c6f4244d022e743ed51f3 (diff) | |
| download | ffmpeg-4d45f5acbd9ab55cd8d29d01843f28315ee27fee.tar.gz | |
avfilter/showinfo: refactor to use avutil/uuid
Diffstat (limited to 'libavfilter/vf_showinfo.c')
| -rw-r--r-- | libavfilter/vf_showinfo.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c index 12d39310ef..6efcafce28 100644 --- a/libavfilter/vf_showinfo.c +++ b/libavfilter/vf_showinfo.c @@ -42,6 +42,7 @@ #include "libavutil/mastering_display_metadata.h" #include "libavutil/video_enc_params.h" #include "libavutil/detection_bbox.h" +#include "libavutil/uuid.h" #include "avfilter.h" #include "internal.h" @@ -421,29 +422,20 @@ static void dump_video_enc_params(AVFilterContext *ctx, const AVFrameSideData *s static void dump_sei_unregistered_metadata(AVFilterContext *ctx, const AVFrameSideData *sd) { - const int uuid_size = 16; const uint8_t *user_data = sd->data; - int i; - if (sd->size < uuid_size) { + if (sd->size < AV_UUID_LEN) { av_log(ctx, AV_LOG_ERROR, "invalid data(%"SIZE_SPECIFIER" < " - "UUID(%d-bytes))\n", sd->size, uuid_size); + "UUID(%d-bytes))\n", sd->size, AV_UUID_LEN); return; } av_log(ctx, AV_LOG_INFO, "User Data Unregistered:\n"); - av_log(ctx, AV_LOG_INFO, "UUID="); - for (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"); + 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 (; i < sd->size; i++) { + for (size_t i = 16; i < sd->size; i++) av_log(ctx, AV_LOG_INFO, "%02x", user_data[i]); - } av_log(ctx, AV_LOG_INFO, "\n"); } |