From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id A6B9A45AB1 for ; Wed, 15 Mar 2023 16:43:58 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A137F68BE16; Wed, 15 Mar 2023 18:43:56 +0200 (EET) Received: from out203-205-221-155.mail.qq.com (out203-205-221-155.mail.qq.com [203.205.221.155]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 94D0C68BC80 for ; Wed, 15 Mar 2023 18:43:47 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1678898623; bh=dFZIBDjw345VG5tBs7LmaN5G0Pl1WLBQOlRgJ+XKx9w=; h=Subject:From:To:Date:In-Reply-To:References; b=UGoJNVAZy1+BJbWjcI0RNwaJrr6sIcCVOzC9hSOS/qoV4dH5KlliWkDkJmk5uCY7G rkVI5oCKO8Qo0zciUFSW5sOGFVB1kpHxR1nfTDXa1wm3LhFgKBKbGCXjxyg5f+nvCZ I02fk/MmIVrVlI/XxewhL8Uh8WWx929RikRUvNYE= Received: from [127.0.0.1] ([113.118.114.71]) by newxmesmtplogicsvrsza10-0.qq.com (NewEsmtp) with SMTP id AEA93A0E; Thu, 16 Mar 2023 00:43:42 +0800 X-QQ-mid: xmsmtpt1678898622t85loq7uv Message-ID: X-QQ-XMAILINFO: OZiGlmjmGvyhROFwzsD1VCeVNAjtyWGN+nLAT/E+ot8OD2oqm4AWuDMmRP8u+w 8AfBtzHOPpl7njk69ohzqstJhoC+wCMAApQpNrFQCJdCkgn7mTjkr0l7qFZIBxW1Z2aE/UW9oxlR Kugh9eXlUYvTA3sR8sWN4yeKzD6YEdQJ9Or1iNFmz4eFjRyqx0Tc5FXTz6SFpgm4LwedTXZf4MNi U6Ma6xwKY5EHbNdFS8kL3OS26bF4ARIbG0Z6ugbxko0H61xmzEZynghL8CAd1bY9hGwd1HNuGuBh 7153RgB9k5YtCwnnzvgrnCnOVBsTrZH8yA4v6tEdJl1jXyRJAU1s2Ty02vDL6kvOlxyJLY9NkSKY b9xV/gtWerHu+Ap+h0jlcnSaZZB7EQouGxopuKrAqEbt1nCWhBDuGO53WZDq8qlqnrV817PbjBzM 0wBV5aHbhZLX3QHF24rAjAqyNr75cM/S1142/GOWLlg/TXtm2calsXhFUuAlm0A39aT14vWx/vEt UEfr6pGOTC2oPHjjnPLQeUHjYUte4+08vANIaFN73RWidLAzVQkQooglJsn1IR0hd9jsPEZQu4ar 9RBnHOEFSL/VGDfow8w4QzDir2u7voUNP5GITVPPgr1k30WNGj8B8OdROpSpBHZJx+MNUhfWOzZY YqOaPOIrnub8TyAPhxDNcyC4fzNUjQ6iFJ91rpJka233/NpDIvaXkYbeSY17p8REjiDkEEVn/sx7 AaGhM9McT2aGz/jQb5AD0m9siYygcgwoUB1eKzzFRfbptfTnLYEBPEQ+I4CRsvnLfn+EH1bIP+2H jOlMldNbN7o5ZA8aJobGNZwdVrp4QR8Ywf+GOy9l46h3+pESzZnZz93DscZq7fNMYjP8CDA62Kw6 /yWPZiWGulXDsE4YIPEuGQYR3Rxw/LmE8rTU3RdL5Kn0nGdgPK+Mkgx5xfADp8Qk2suCsI9aEc0T L1cK9iQhxOczBV3KTI3A== X-OQ-MSGID: From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 Mar 2023 00:43:42 +0800 In-Reply-To: References: User-Agent: Evolution 3.44.4-0ubuntu1 MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH 1/9] libavutil/hdr_dynamic_vivid_metadata: fix three spline params X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Sat, 2023-02-25 at 05:08 +0800, Zhao Zhili wrote: > From: Zhao Zhili > > There are two group of three_Spline params. > > Signed-off-by: Zhao Zhili > --- > 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. _______________________________________________ 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".