[FFmpeg-devel] [PATCH 1/9] libavutil/hdr_dynamic_vivid_metadata: fix three spline params

[Zhao Zhili]

On Sat, 2023-02-25 at 05:08 +0800, Zhao Zhili wrote:
> From: Zhao Zhili <zhilizhao at tencent.com>
> 
> There are two group of three_Spline params.
> 
> Signed-off-by: Zhao Zhili <zhilizhao at tencent.com>
> ---
>  doc/APIchanges                         |  4 ++
>  libavutil/hdr_dynamic_vivid_metadata.h | 63 +++++++++++++++++++++++++-
>  libavutil/version.h                    |  3 +-
>  3 files changed, 68 insertions(+), 2 deletions(-)
> 
> diff --git a/doc/APIchanges b/doc/APIchanges
> index 0ba18e8609..4739ef47e9 100644
> --- a/doc/APIchanges
> +++ b/doc/APIchanges
> @@ -2,6 +2,10 @@ The last version increases of all libraries were on 2023-02-09
>  
>  API changes, most recent first:
>  
> +2023-02-24 - xxxxxxxxxx - lavu 58.4.100 - hdr_dynamic_vivid_metadata.h
> +  Add two group of three spline params.
> +  Deprecate previous define which only supports one group of params.
> +
>  -------- 8< --------- FFmpeg 6.0 was cut here -------- 8< ---------
>  
>  2023-02-16 - 927042b409 - lavf 60.2.100 - avformat.h
> diff --git a/libavutil/hdr_dynamic_vivid_metadata.h b/libavutil/hdr_dynamic_vivid_metadata.h
> index a34f83072c..4524a81557 100644
> --- a/libavutil/hdr_dynamic_vivid_metadata.h
> +++ b/libavutil/hdr_dynamic_vivid_metadata.h
> @@ -24,6 +24,52 @@
>  #include "frame.h"
>  #include "rational.h"
>  
> +/**
> + * HDR Vivid three spline params.
> + */
> +typedef struct AVHDRVivid3SplineParams {
> +    /**
> +     * The mode of three Spline. the value shall be in the range
> +     * of 0 to 3, inclusive.
> +     */
> +    int th_mode;
> +
> +    /**
> +     * three_Spline_TH_enable_MB is in the range of 0.0 to 1.0, inclusive
> +     * and in multiples of 1.0/255.
> +     *
> +     */
> +    AVRational th_enable_mb;
> +
> +    /**
> +     * 3Spline_TH_enable of three Spline.
> +     * The value shall be in the range of 0.0 to 1.0, inclusive.
> +     * and in multiples of 1.0/4095.
> +     */
> +    AVRational th_enable;
> +
> +    /**
> +     * 3Spline_TH_Delta1 of three Spline.
> +     * The value shall be in the range of 0.0 to 0.25, inclusive,
> +     * and in multiples of 0.25/1023.
> +     */
> +    AVRational th_delta1;
> +
> +    /**
> +     * 3Spline_TH_Delta2 of three Spline.
> +     * The value shall be in the range of 0.0 to 0.25, inclusive,
> +     * and in multiples of 0.25/1023.
> +     */
> +    AVRational th_delta2;
> +
> +    /**
> +     * 3Spline_enable_Strength of three Spline.
> +     * The value shall be in the range of 0.0 to 1.0, inclusive,
> +     * and in multiples of 1.0/255.
> +     */
> +    AVRational enable_strength;
> +} AVHDRVivid3SplineParams;
> +
>  /**
>   * Color tone mapping parameters at a processing window in a dynamic metadata for
>   * CUVA 005.1:2021.
> @@ -122,46 +168,61 @@ typedef struct AVHDRVividColorToneMappingParams {
>       */
>      int three_Spline_num;
>  
> +#if FF_API_HDR_VIVID_THREE_SPLINE
>      /**
>       * The mode of three Spline. the value shall be in the range
>       * of 0 to 3, inclusive.
> +     * @deprecated Use three_spline instead
>       */
> +    attribute_deprecated
>      int three_Spline_TH_mode;
>  
>      /**
>       * three_Spline_TH_enable_MB is in the range of 0.0 to 1.0, inclusive
>       * and in multiples of 1.0/255.
> -     *
> +     * @deprecated Use three_spline instead
>       */
> +    attribute_deprecated
>      AVRational three_Spline_TH_enable_MB;
>  
>      /**
>       * 3Spline_TH_enable of three Spline.
>       * The value shall be in the range of 0.0 to 1.0, inclusive.
>       * and in multiples of 1.0/4095.
> +     * @deprecated Use three_spline instead
>       */
> +    attribute_deprecated
>      AVRational three_Spline_TH_enable;
>  
>      /**
>       * 3Spline_TH_Delta1 of three Spline.
>       * The value shall be in the range of 0.0 to 0.25, inclusive,
>       * and in multiples of 0.25/1023.
> +     * @deprecated Use three_spline instead
>       */
> +    attribute_deprecated
>      AVRational three_Spline_TH_Delta1;
>  
>      /**
>       * 3Spline_TH_Delta2 of three Spline.
>       * The value shall be in the range of 0.0 to 0.25, inclusive,
>       * and in multiples of 0.25/1023.
> +     * @deprecated Use three_spline instead
>       */
> +    attribute_deprecated
>      AVRational three_Spline_TH_Delta2;
>  
>      /**
>       * 3Spline_enable_Strength of three Spline.
>       * The value shall be in the range of 0.0 to 1.0, inclusive,
>       * and in multiples of 1.0/255.
> +     * @deprecated Use three_spline instead
>       */
> +    attribute_deprecated
>      AVRational three_Spline_enable_Strength;
> +#endif
> +
> +    AVHDRVivid3SplineParams three_spline[2];
>  } AVHDRVividColorToneMappingParams;
>  
>  
> diff --git a/libavutil/version.h b/libavutil/version.h
> index 900b798971..a89a0d406f 100644
> --- a/libavutil/version.h
> +++ b/libavutil/version.h
> @@ -79,7 +79,7 @@
>   */
>  
>  #define LIBAVUTIL_VERSION_MAJOR  58
> -#define LIBAVUTIL_VERSION_MINOR   3
> +#define LIBAVUTIL_VERSION_MINOR   4
>  #define LIBAVUTIL_VERSION_MICRO 100
>  
>  #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
> @@ -113,6 +113,7 @@
>  #define FF_API_PKT_DURATION             (LIBAVUTIL_VERSION_MAJOR < 59)
>  #define FF_API_REORDERED_OPAQUE         (LIBAVUTIL_VERSION_MAJOR < 59)
>  #define FF_API_FRAME_PICTURE_NUMBER     (LIBAVUTIL_VERSION_MAJOR < 59)
> +#define FF_API_HDR_VIVID_THREE_SPLINE   (LIBAVUTIL_VERSION_MAJOR < 59)
>  
>  /**
>   * @}

Will apply the patchset soon if no objections.