[FFmpeg-devel] [PATCH v3 6/6] avfilter/showinfo: refactor to use avutil/uuid

[Pierre-Anthony Lemieux]

On Tue, May 31, 2022 at 12:10 AM Andreas Rheinhardt
<andreas.rheinhardt at outlook.com> wrote:
>
> pal at sandflow.com:
> > From: Pierre-Anthony Lemieux <pal at palemieux.com>
> >
> > ---
> >  libavfilter/vf_showinfo.c | 17 +++++------------
> >  1 file changed, 5 insertions(+), 12 deletions(-)
> >
> > diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c
> > index 12d39310ef..0d6f2805bb 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,21 @@ 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 (i = 16; i < sd->size; i++)
>
> You can (and should) now use a for-loop with variable-declaration (and
> the type should be changed to size_t, as AVFrameSideData is now size_t,
> too).

Will fix. Thanks.

>
> >          av_log(ctx, AV_LOG_INFO, "%02x", user_data[i]);
> > -    }
> >      av_log(ctx, AV_LOG_INFO, "\n");
> >  }
> >
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".