Re: [FFmpeg-devel] [PATCH v4 06/13] avutil/frame: add helper for adding side data to set

[James Almer <jamrial@gmail.com>]

On 9/1/2023 5:38 PM, Jan Ekström wrote:
> Additionally, add an API test to check that the no-duplicates
> addition works after duplicates have been inserted.
> ---
>   libavutil/Makefile              |  1 +
>   libavutil/frame.c               | 18 ++++++
>   libavutil/frame.h               | 20 +++++++
>   libavutil/tests/side_data_set.c | 97 +++++++++++++++++++++++++++++++++
>   tests/fate/libavutil.mak        |  4 ++
>   tests/ref/fate/side_data_set    | 14 +++++
>   6 files changed, 154 insertions(+)
>   create mode 100644 libavutil/tests/side_data_set.c
>   create mode 100644 tests/ref/fate/side_data_set
> 
> diff --git a/libavutil/Makefile b/libavutil/Makefile
> index 7828c94dc5..339eaf3539 100644
> --- a/libavutil/Makefile
> +++ b/libavutil/Makefile
> @@ -264,6 +264,7 @@ TESTPROGS = adler32                                                     \
>               ripemd                                                      \
>               sha                                                         \
>               sha512                                                      \
> +            side_data_set                                               \
>               softfloat                                                   \
>               tree                                                        \
>               twofish                                                     \
> diff --git a/libavutil/frame.c b/libavutil/frame.c
> index 0b1a8e5244..f64ddb3645 100644
> --- a/libavutil/frame.c
> +++ b/libavutil/frame.c
> @@ -861,6 +861,24 @@ AVFrameSideData *av_frame_new_side_data(AVFrame *frame,
>       return ret;
>   }
>   
> +AVFrameSideData *av_frame_side_data_set_new_item(AVFrameSideDataSet *set,

Maybe av_frame_side_data_set_new_entry(), or just 
av_frame_side_data_set_new()? I don't particularly like item.

> +                                                 enum AVFrameSideDataType type,
> +                                                 size_t size,
> +                                                 unsigned int flags)
> +{
> +    AVBufferRef     *buf = av_buffer_alloc(size);
> +    AVFrameSideData *ret = NULL;
> +
> +    if (flags & AV_FRAME_SIDE_DATA_SET_FLAG_NO_DUPLICATES)
> +        remove_side_data(&set->sd, &set->nb_sd, type);
> +
> +    ret = add_side_data_to_set_from_buf(set, type, buf);
> +    if (!ret)
> +        av_buffer_unref(&buf);
> +
> +    return ret;
> +}
> +
>   AVFrameSideData *av_frame_get_side_data(const AVFrame *frame,
>                                           enum AVFrameSideDataType type)
>   {
> diff --git a/libavutil/frame.h b/libavutil/frame.h
> index dc87d38adc..5aed08b796 100644
> --- a/libavutil/frame.h
> +++ b/libavutil/frame.h
> @@ -1065,6 +1065,26 @@ const char *av_frame_side_data_name(enum AVFrameSideDataType type);
>    */
>   void av_frame_side_data_set_uninit(AVFrameSideDataSet *set);
>   
> +#define AV_FRAME_SIDE_DATA_SET_FLAG_NO_DUPLICATES (1 << 0)
> +
> +/**
> + * Add a new side data entry to a set.
> + *
> + * @param set a set to which the side data should be added
> + * @param type type of the added side data
> + * @param size size of the side data
> + * @param flags Some combination of AV_FRAME_SIDE_DATA_SET_FLAG_* flags, or 0.
> + *
> + * @return newly added side data on success, NULL on error. In case of
> + *         AV_FRAME_SIDE_DATA_SET_FLAG_NO_DUPLICATES being set, entries
> + *         of matching AVFrameSideDataType will be removed before the
> + *         addition is attempted.
> + */
> +AVFrameSideData *av_frame_side_data_set_new_item(AVFrameSideDataSet *set,
> +                                                 enum AVFrameSideDataType type,
> +                                                 size_t size,
> +                                                 unsigned int flags);
> +
>   /**
>    * @}
>    */
> diff --git a/libavutil/tests/side_data_set.c b/libavutil/tests/side_data_set.c
> new file mode 100644
> index 0000000000..056d79f655
> --- /dev/null
> +++ b/libavutil/tests/side_data_set.c
> @@ -0,0 +1,97 @@
> +/*
> + * Copyright (c) 2023 Jan Ekström <jeebjp@gmail.com>
> + *
> + * This file is part of FFmpeg.
> + *
> + * FFmpeg is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Lesser General Public
> + * License as published by the Free Software Foundation; either
> + * version 2.1 of the License, or (at your option) any later version.
> + *
> + * FFmpeg is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> + * Lesser General Public License for more details.
> + *
> + * You should have received a copy of the GNU Lesser General Public
> + * License along with FFmpeg; if not, write to the Free Software
> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
> + */
> +
> +#include <stdio.h>
> +#include "libavutil/frame.c"
> +#include "libavutil/mastering_display_metadata.h"
> +
> +static void print_clls(const AVFrameSideDataSet set)
> +{
> +    for (int i = 0; i < set.nb_sd; i++) {
> +        AVFrameSideData *sd = set.sd[i];
> +
> +        printf("sd %d, %s",
> +               i, av_frame_side_data_name(sd->type));
> +
> +        if (sd->type != AV_FRAME_DATA_CONTENT_LIGHT_LEVEL) {
> +            putchar('\n');
> +            continue;
> +        }
> +
> +        printf(": MaxCLL: %u\n",
> +               ((AVContentLightMetadata *)sd->data)->MaxCLL);
> +    }
> +}
> +
> +int main(void)
> +{
> +    AVFrameSideDataSet set = { 0 };
> +
> +    av_assert0(
> +        av_frame_side_data_set_new_item(
> +            &set, AV_FRAME_DATA_AMBIENT_VIEWING_ENVIRONMENT, 0, 0));
> +
> +    // test entries in the middle
> +    for (int value = 1; value < 4; value++) {
> +        AVFrameSideData *sd = av_frame_side_data_set_new_item(
> +            &set, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL,
> +            sizeof(AVContentLightMetadata), 0);
> +
> +        av_assert0(sd);
> +
> +        ((AVContentLightMetadata *)sd->data)->MaxCLL = value;
> +    }
> +
> +    av_assert0(
> +        av_frame_side_data_set_new_item(
> +            &set, AV_FRAME_DATA_SPHERICAL, 0, 0));
> +
> +    // test entries at the end
> +    for (int value = 1; value < 4; value++) {
> +        AVFrameSideData *sd = av_frame_side_data_set_new_item(
> +            &set, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL,
> +            sizeof(AVContentLightMetadata), 0);
> +
> +        av_assert0(sd);
> +
> +        ((AVContentLightMetadata *)sd->data)->MaxCLL = value + 3;
> +    }
> +
> +    puts("Initial addition results with duplicates:");
> +    print_clls(set);
> +
> +    {
> +        AVFrameSideData *sd = av_frame_side_data_set_new_item(
> +            &set, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL,
> +            sizeof(AVContentLightMetadata),
> +            AV_FRAME_SIDE_DATA_SET_FLAG_NO_DUPLICATES);
> +
> +        av_assert0(sd);
> +
> +        ((AVContentLightMetadata *)sd->data)->MaxCLL = 1337;
> +    }
> +
> +    puts("\nFinal state after a single 'no-duplicates' addition:");
> +    print_clls(set);
> +
> +    av_frame_side_data_set_uninit(&set);
> +
> +    return 0;
> +}
> diff --git a/tests/fate/libavutil.mak b/tests/fate/libavutil.mak
> index 80153f4395..6864ea9c03 100644
> --- a/tests/fate/libavutil.mak
> +++ b/tests/fate/libavutil.mak
> @@ -148,6 +148,10 @@ FATE_LIBAVUTIL += fate-sha512
>   fate-sha512: libavutil/tests/sha512$(EXESUF)
>   fate-sha512: CMD = run libavutil/tests/sha512$(EXESUF)
>   
> +FATE_LIBAVUTIL += fate-side_data_set
> +fate-side_data_set: libavutil/tests/side_data_set$(EXESUF)
> +fate-side_data_set: CMD = run libavutil/tests/side_data_set$(EXESUF)
> +
>   FATE_LIBAVUTIL += fate-tree
>   fate-tree: libavutil/tests/tree$(EXESUF)
>   fate-tree: CMD = run libavutil/tests/tree$(EXESUF)
> diff --git a/tests/ref/fate/side_data_set b/tests/ref/fate/side_data_set
> new file mode 100644
> index 0000000000..7d8c684d8f
> --- /dev/null
> +++ b/tests/ref/fate/side_data_set
> @@ -0,0 +1,14 @@
> +Initial addition results with duplicates:
> +sd 0, Ambient viewing environment
> +sd 1, Content light level metadata: MaxCLL: 1
> +sd 2, Content light level metadata: MaxCLL: 2
> +sd 3, Content light level metadata: MaxCLL: 3
> +sd 4, Spherical Mapping
> +sd 5, Content light level metadata: MaxCLL: 4
> +sd 6, Content light level metadata: MaxCLL: 5
> +sd 7, Content light level metadata: MaxCLL: 6
> +
> +Final state after a single 'no-duplicates' addition:
> +sd 0, Ambient viewing environment
> +sd 1, Spherical Mapping
> +sd 2, Content light level metadata: MaxCLL: 1337
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".