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 CFD5A4586F for ; Fri, 24 Feb 2023 13:09:25 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1501668C142; Fri, 24 Feb 2023 15:09:05 +0200 (EET) Received: from out203-205-251-27.mail.qq.com (out203-205-251-27.mail.qq.com [203.205.251.27]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 34D1B68C120 for ; Fri, 24 Feb 2023 15:08:55 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1677244131; bh=21wkxu1GK1hVo6Dg3p1YbSByYjR8P5qtsfCaxpKCmQc=; h=From:To:Cc:Subject:Date; b=jwr+uY8BrdcUXDIyDEYZMngfKhJ1dzEi0qaBxLBRvxrvOtf0fJWymLVFNAkccHujA 1K89BOZDGE9dk34htaFl0TQz0W0WG5bOyiRyEXWKT7nIpPywsNU0BXMEw0U51Ra1KU LpOH4n8xM/VrWMpOaPf/vfWTmvTy+TQAxr1UDTvY= Received: from localhost.localdomain ([119.147.10.186]) by newxmesmtplogicsvrszb6-0.qq.com (NewEsmtp) with SMTP id 23287060; Fri, 24 Feb 2023 21:08:50 +0800 X-QQ-mid: xmsmtpt1677244130ty4i4a6k5 Message-ID: X-QQ-XMAILINFO: OdIVOfqOaVcrUI0YuoBW05TsUua81HLOQuwQiM9FFJScf4If72LtxELug321yc Cjw1u24iyOenwuwK7jGztx1ykFAHRXbZzylk9czl9RdOK597UxT9PywW77UswMKtEf9y0lEL+F4E 7RJPtFi8gTfN3gIJR5R3m56UUSPQpkO+yM9B3lxZtJofljX2UBIbHbNS2Be9tNriNZm7v0gHNZAu pfYWtmifGnwwLKoUCM4RETLlvDTkpwMp+jzLVLKwOxkwZE3D3v/OXmnk8K1rw3baBOOyeSKxQMn7 4YKkg80oRTrTtflU96he3mlapgeb03gz3RiBZE7cM9bhdClRJeh4D41TiWYLZ2ROAgo3bxaQ9rtd YZlLlP6A7NdUGxZd3Na8UpFtPsdqYB0uhFHDZ7UDHH5v/Jb7RIl5uJ7lsMAuwdPTws1O64W/fDlf 2zp7gfqXVVKmRRi251k7HbGsxNkg0ffzZipljYIv7Ez2c0dkLp6VpHFrGmdf4I5h5+n4srsxBaCV tWhNtdaRa0jbNTnI6igQPV8yF1G/HH9jKPaQYjZTyLcOzDrqck38k6jJCu/M+dBOL71cSXP99dcz T3EYXloHYeaKetobtD+C93vvsR4SnuZVHrhZWpTS5JC6gPrC14U/VJliHM6FHgVFjbwytYf6JfEi Z+OtZ7ZM7qc6fCidmQgEZdj5NICvwzAZKHnli8ZhRnnV64+1WW2aSukYYN+caxLzFUvCcSNuCHMv izOgqBalNE8XyB/bRGoU4xyDokTpPNUUx3DygzauMXQ14uUnO5v4zzwaXcJ3MdaJWKA+CLJ/31p6 oh9X3iOexvYwDIc2nQ+o3nE3IpOJopAm34ZhFbmHfrGhHjvLYFt77Q9weCDAaVNoZ/yXhLvp+TJd XiaGTepS1LtDzGZRLlfb0r+0fPCKJd2GQA6UswIy6QQxXpw5/tbqb8TJTfZI/zKxylwWriyK897I 8v/Znvu1gZiHgz6FpIKg== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 Feb 2023 05:08:40 +0800 X-OQ-MSGID: <20230224210848.535436-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [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 Cc: Zhao Zhili 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: 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) /** * @} -- 2.25.1 _______________________________________________ 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".