RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avfilter/showinfo: refactor to use avutil/uuid

This commit is contained in:
Pierre-Anthony Lemieux 2022-06-01 17:30:37 -07:00 committed by Zane van Iperen
parent 751549af9b
commit 4d45f5acbd
No known key found for this signature in database
GPG Key ID: 68616B2D8AC4DCC5
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavfilter/vf_showinfo.c
View File

@ -42,6 +42,7 @@
#include "libavutil/mastering_display_metadata.h" #include "libavutil/mastering_display_metadata.h"
#include "libavutil/video_enc_params.h" #include "libavutil/video_enc_params.h"
#include "libavutil/detection_bbox.h" #include "libavutil/detection_bbox.h"
#include "libavutil/uuid.h"
#include "avfilter.h" #include "avfilter.h"
#include "internal.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) static void dump_sei_unregistered_metadata(AVFilterContext *ctx, const AVFrameSideData *sd)
{ {
const int uuid_size = 16;
const uint8_t *user_data = sd->data; 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" < " 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; return;
} }
av_log(ctx, AV_LOG_INFO, "User Data Unregistered:\n"); av_log(ctx, AV_LOG_INFO, "User Data Unregistered:\n");
av_log(ctx, AV_LOG_INFO, "UUID="); av_log(ctx, AV_LOG_INFO, "UUID=" AV_PRI_UUID "\n", AV_UUID_ARG(user_data));
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, "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, "%02x", user_data[i]);
}
av_log(ctx, AV_LOG_INFO, "\n"); av_log(ctx, AV_LOG_INFO, "\n");
} }