Unified · Split
| @@ -42,6 +42,7 @@ · 41 unmodified lines | ||
| 42 | 42 | #include "libavutil/mastering_display_metadata.h" |
| 43 | 43 | #include "libavutil/video_enc_params.h" |
| 44 | 44 | #include "libavutil/detection_bbox.h" |
| 45 | +#include "libavutil/uuid.h" | |
| 45 | 46 | |
| 46 | 47 | #include "avfilter.h" |
| 47 | 48 | #include "internal.h" |
| @@ -421,29 +422,20 @@ static void dump_video_enc_params(AVFilterContext *ctx, const AVFrameSideData *s · 373 unmodified lines | ||
| 421 | 422 | |
| 422 | 423 | static void dump_sei_unregistered_metadata(AVFilterContext *ctx, const AVFrameSideData *sd) |
| 423 | 424 | { |
| 424 | − const int uuid_size = 16; | |
| 425 | 425 | const uint8_t *user_data = sd->data; |
| 426 | − int i; | |
| 427 | 426 | |
| 428 | − if (sd->size < uuid_size) { | |
| 427 | + if (sd->size < AV_UUID_LEN) { | |
| 429 | 428 | av_log(ctx, AV_LOG_ERROR, "invalid data(%"SIZE_SPECIFIER" < " |
| 430 | − "UUID(%d-bytes))\n", sd->size, uuid_size); | |
| 429 | + "UUID(%d-bytes))\n", sd->size, AV_UUID_LEN); | |
| 431 | 430 | return; |
| 432 | 431 | } |
| 433 | 432 | |
| 434 | 433 | av_log(ctx, AV_LOG_INFO, "User Data Unregistered:\n"); |
| 435 | − av_log(ctx, AV_LOG_INFO, "UUID="); | |
| 436 | − for (i = 0; i < uuid_size; i++) { | |
| 437 | − av_log(ctx, AV_LOG_INFO, "%02x", user_data[i]); | |
| 438 | − if (i == 3 || i == 5 || i == 7 || i == 9) | |
| 439 | − av_log(ctx, AV_LOG_INFO, "-"); | |
| 440 | − } | |
| 441 | − av_log(ctx, AV_LOG_INFO, "\n"); | |
| 434 | + av_log(ctx, AV_LOG_INFO, "UUID=" AV_PRI_UUID "\n", AV_UUID_ARG(user_data)); | |
| 442 | 435 | |
| 443 | 436 | av_log(ctx, AV_LOG_INFO, "User Data="); |
| 444 | − for (; i < sd->size; i++) { | |
| 437 | + for (size_t i = 16; i < sd->size; i++) | |
| 445 | 438 | av_log(ctx, AV_LOG_INFO, "%02x", user_data[i]); |
| 446 | − } | |
| 447 | 439 | av_log(ctx, AV_LOG_INFO, "\n"); |
| 448 | 440 | } |
| 449 | 441 | |