From patchwork Fri Feb 24 15:52:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 40502 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1366687pzk; Fri, 24 Feb 2023 07:52:41 -0800 (PST) X-Google-Smtp-Source: AK7set8Lv1+VDnvIRxE65KvWFbk5HMTvEzYuEtNR9WE4rDrh4/oDSLok/Uq378IQgJanpVDaOC1Q X-Received: by 2002:aa7:c558:0:b0:4af:7dff:7b8d with SMTP id s24-20020aa7c558000000b004af7dff7b8dmr2068384edr.17.1677253961081; Fri, 24 Feb 2023 07:52:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677253961; cv=none; d=google.com; s=arc-20160816; b=rFnM7iPamU6wymlXFVqJfV1Hv+/QrILLwqDwlBDramPgvCi8GSnfx/zAcIWklhlHWd 6lVTmmkbU+epUTzUim1iINCKqbBCa3mohlTvGXiFsO2myHvz/czwD+lUsqTP8Wt8ub6q Yv461ummo7fqtfsq+IhiQDVuYQhS0uBZ2HdQWRZEmQ0DvfO8vNQDNdaX4kUmsqLRhOHd BJc4IPwcBEraKF2cw37XOnKv7fqzSfDe5g9w4GTPqJ015RE93ra0hlqE7Zx8lSl3BnDi inPnBpafzhmJ90GU31J1MQ9uBB42evD3TrpOPKqA7LZn/QzPJBWIvRZMKism/3Jk/u8+ odiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=W99yz5l/M7rTuvDXabSCyD1xH7ygQi6vWj8TNgHunIY=; b=w37p2FbbqnWA0pXdB6++C6znjaOfXGCmOFG3xbgXEipk/S+ldRcU9skvNYjJeCqIDG asXeh1eNPJMC2FNjFeo4q+gP68o96l0mSpFV+EKg4fK9aATH14+PQqnT0TW4TCx15wn2 G+RpAnVBKMfphy+DWh+Bdre57CEgSa0YzIQMucUBOgtsz2pdD0ewBYdzXk6swk2NLqZ4 Wsn4RLPaHBWqQkCAnGlHmmSJKLZ7VmJ7Z0/6womH6PPDvkNWvwMuZK6mKktfHi8M4hfG KqThZBekBOKJtU8ZuYLVR6DlA2VWDAcYarn7czbjn3l0gkCsRTBDlGnxjygXK1hEZRU9 x3hA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=Cj794xtW; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ay22-20020a170907901600b008ded956ef67si11596091ejc.790.2023.02.24.07.52.40; Fri, 24 Feb 2023 07:52:41 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=Cj794xtW; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 29E7E68C13C; Fri, 24 Feb 2023 17:52:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-252.mail.qq.com (out162-62-57-252.mail.qq.com [162.62.57.252]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3EC2A68BFFE for ; Fri, 24 Feb 2023 17:52:29 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1677253946; bh=Ef33RE8mmgWvcTg2ETVgS6JphryPTdqCXOSAGTpu4Tk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Cj794xtWdZAUSGi0KfS80lp7M5kgGj2DsUJvdua1fs0LsmbAm5d0zVtj4FixEvzOy qPJPJgVYV2QhrnNGuz9AKdRUifYV2TTDDi5NdeSGeCogulExcyuZUrwZBq/Qzdicz/ f7fLMY85VVR/TpOm+2LnrgqCBAG6TFHDKbscGwyM= Received: from localhost.localdomain ([113.118.101.228]) by newxmesmtplogicsvrszc2-1.qq.com (NewEsmtp) with SMTP id D19BEA50; Fri, 24 Feb 2023 23:52:25 +0800 X-QQ-mid: xmsmtpt1677253945ts53dvg98 Message-ID: X-QQ-XMAILINFO: NiAdzfE16ND4wQXUaK5jmP7qSBqp+alIhT8tZssA5I124AvNCKfZ3n9KOv7luh 46Ouk6BSgz69/+L/vI2NveNAnETgFP2DjZfZz5bdbQ2YLCa2/lpazIynVCwUMqZ0hNKMtGy1z7QL otqPMjfX4Gw+stR6o0E9kANwwJ5NVCZ+LLZxPUNj4MOslekjLsB1GS7evOHLLx59gPWKd+0971mo wG4UqL/ptHBX9Hq/ZP0lx2gLO+xAKvkVHxu2x5bJ30kAZ0rMxG6eRwteHXpmrR//W0B6FKJ47zqK 1UmgQyBNuxHwjQXCCOILLu4oYrd6p815vdAn1hXY/DiBDUR3OTKmUm6Pmi570YnOvpZLSXkUrmHi 085F7jLBF6OzcljuYn5JufK/bi49NVXbJE5toESx/FD/qsyM4xhtPWWZj+/pHJ3eMfOJ7L5HqJ49 hUpUMekhp/kRductL/gzvoUyWCwjxdgnHFqqNKxeN99Gu7FTRCHxCcQSUmA8rLKhhbuM4NxVWPbR cr4PTmvU41gWEZ8mXnRbhc1uyC2EF+pRscIv1go4nwaVtnBQmvPApd9JpOyKxPyNwvlTC4augrrS RoQcf7ChqDavcdTfQEQ9LSuInRnks+235UfN4Ff3Cqqp4uYcD7ipPbT9NKVGGVbg54WwfJaZ58gO ZeYLdK6YqjvHKTfNEPHVhlW6gMNp0S9PSJaiWdW7xtX9b5xrIxQkbesLiy2Plavc1qE2u8JAl3UP fn70gDW5Ty4aG2AY+2PbGEd9Y7WSHhm2dAfiduu7hItyE9nBpRBxlezLY22Upjh2ZrGPyGo33/iL 7QaVf7zNZW6Y+H+yRnlnKquqvpZGB9CbNM9XqPRArpPlODrLAz2l/WA7XmXGD/jOHzcobC0Tipa1 yCq1LhoaP8A0ZZYpf9YCKS8mNmgXpeuZ7SOnRy8w3vQxGDsTXu5jWZIKcH9D0Yry/3teYhDsJmXl Wm6n7yYmyOk4AtVpi/LbfhVEOppUuvDCw8OVWQ6k5MYs4S6ZH71ykSiELg11pxNEmvtUXyYDI= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Feb 2023 23:52:14 +0800 X-OQ-MSGID: <20230224155222.194400-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <8bf59545-b8a1-bd88-f83c-ba0db7ee6f04@gmail.com> References: <8bf59545-b8a1-bd88-f83c-ba0db7ee6f04@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: +LHFeAVTZ9oz 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) /** * @} From patchwork Fri Feb 24 15:52:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 40505 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1366959pzk; Fri, 24 Feb 2023 07:53:01 -0800 (PST) X-Google-Smtp-Source: AK7set8RlXG7xQ0pNUmZXoE2B648+2PT5e0lWKdAp1wcR8ZvSmSQF8zURWBMC1FuQNhzrJTTvwGL X-Received: by 2002:aa7:dc17:0:b0:4af:6067:9b76 with SMTP id b23-20020aa7dc17000000b004af60679b76mr9264676edu.5.1677253981004; Fri, 24 Feb 2023 07:53:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677253980; cv=none; d=google.com; s=arc-20160816; b=PWCpje07vG9ZQtuU2BzBCmSrEp9GLvjjRYpl+EgKqnEXShkBKvLknJuzBRPZZif8eK n9YLGn+uPrrpHAYsBexHcTTbwNTAgzASj3hwqRgCQaPclGbAm+yRJEcXvg64J81rYhjZ CTcAU/gndXLJ0kF116el+qtVQSzoVQNBAIwBz6twhSdtKKt9GaL+DLgjH4PYlhflhx4F 9j6yY6V733S9PUGcfHQwr+rYHbZdz2AaVeOPk/16zSGuAqgooLt+k1GKTZsEoqJOlvBk UK5UYM+hfhukF9C0P/xi7LEzoqfyuEq5Gs87cOaLxdUyWe2wGd1JIbERkGfSJdKwtJwH Xndw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=bGb+QrAy2NXw912F99CODNkoJJhl2x1uLHK7fDcgGHA=; b=haPeGo+jwClgDewzSz7U4z8e6e8SsLiFp7mD1X86rfQSaMRf8kVJxAtSNhvqR3NYLw F0KKlYgjmSHlu5SqKP6GFmlWM3CKGhsZxLJXe7Z66sCL8JGb0KRUfu1Nd7Wa5w2HZb/T rnkzTRZDRrz2AyAxFsqYnk6kN2Fq2rGYqvIw/JGHQvPQFAiqrpH3sU1GnV9xuFZbpJf0 frj+VQzAbu7R/8omLX7txHRwNnfBztZAMbc0jnQUDglGX4lVtkcYQBol9aa7JBa7yDRX 9MkGnw4zrW0274woHcx8xkW/NZ2fvkDhox3qk2I2K26TfxPshV5zoUpbQ3yujrov1uxc Gn9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b="uh4Z/ije"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l7-20020a170907914700b008cb405fa59csi19054258ejs.73.2023.02.24.07.53.00; Fri, 24 Feb 2023 07:53:00 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b="uh4Z/ije"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7851068C121; Fri, 24 Feb 2023 17:52:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-58-216.mail.qq.com (out162-62-58-216.mail.qq.com [162.62.58.216]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2529068C11F for ; Fri, 24 Feb 2023 17:52:30 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1677253947; bh=FvvHK25Ts1M7C/OulLDzPoMUb2/tIbypKpIW4NNWFvw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=uh4Z/ijeWQHuyiAmo7dFMpVvB2T9DpjzDUfItgfouWsX37Niv4Eqa2AxzknVLwnkR 0++pTTc4KlJ1SiKE6P8scVLcDZFEysvJu08hIbBc9o3lllptCHBjwEovpbJuKon3cx ivgYjSNG55hKa2xWCe+5CFfNAA/klXYvMrWxNsQo= Received: from localhost.localdomain ([113.118.101.228]) by newxmesmtplogicsvrszc2-1.qq.com (NewEsmtp) with SMTP id D19BEA50; Fri, 24 Feb 2023 23:52:25 +0800 X-QQ-mid: xmsmtpt1677253946tjyfr9co2 Message-ID: X-QQ-XMAILINFO: MiE+axgVDEQLRI4mDuZiLCm+/y8Uh7j5gPN9ttMZ1r3WvNaS9A500ue6fU2+dZ KIA99cDeXB1QE/Jl1M1QKOTpX0QKoMae42nez4pBTVFofjzi7J9ZFVSn4J1PwDW+fP5bIv94GZ/N o3Bsg+jy5F09LQJoOv+XBRQHUuocBfThNvbur20S99yYMNKMwO3hytHJw0V8ji+sQi4kiVGH9Trt 7ihp3/c/LYx9pvByXqHCKjg4+nBT7b5h0jTQHD6ZqtpQg50bhpZtTpX91T70MxyaQqWEuoCnJClb 7Fmzt4cxGSpzR1Wci5GAUOTFQ7ZHeaOqe5pc1rxSO12K9lJT5IdRfyhif9LpeMRz6FjlQC8ftcSA EM9I0iRa+wDglgJT+bReshUcBbOfKfKwP1205brknIYNoyl3q6QUsE7u4P2j7MmbtWS7az3go0oD zA6Txy19jnx7TZ85IJkysVJuF0JgIxNOGyUTwjNq7uSFdgQkZPexlV4Tzy6TprZjEwRWCDdEZA7B t5NBjFX+Bl4kwgt8Cm17akCfcqPuilfkaul3hAzx4OaWI5XBV/eskTzCkG1bdmB0fudRUo9TtPMP vJEgLa+HJzXvbnx6lKMv9SkhN09JHnjqUts2KsjeXVx/8ZTut9TCY1+FJ4GrmWRMwxitPFOMBlSR DimNIFOFlMwmDVTkMaX1mVfpLyfFIbtyLXAO3ydOuKm96hJfO/lOzXmk1ukfphB4cXWRiOnTF4ew sAGq/yRCjSGMZW0m5soDY4jZkhHaulcCk7ZxAu90Z8CyZMhPsozEgAgcCpK08aT5Ikt13VqA5jCL jj0NvVtEcfOqgKr1z3/zCvtx40+t6HiGYPrE5GmGMYsUoc9Gq2jMHRNFMHak7Us4EsWC6TIOr69w TZxuC5V7Bx9m/Cegf3zbKtnHKB80+4/xgt3FhANCYA1mUnFAq0l52w/9NI7vzwxs69zwxzpzlqdK R9Kj13HXoDm4Qjh6e/1/eopNn863EA6g5YoVjyAfY5GBnBq69oAamN8HdxXBf9eaI89LZAnDY= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Feb 2023 23:52:15 +0800 X-OQ-MSGID: <20230224155222.194400-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230224155222.194400-1-quinkblack@foxmail.com> References: <8bf59545-b8a1-bd88-f83c-ba0db7ee6f04@gmail.com> <20230224155222.194400-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/9] avcodec/dynamic_hdr_vivid: 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 2TQ8eSUC2ZBv From: Zhao Zhili Signed-off-by: Zhao Zhili --- libavcodec/dynamic_hdr_vivid.c | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/libavcodec/dynamic_hdr_vivid.c b/libavcodec/dynamic_hdr_vivid.c index d689669dec..f2bc0c9059 100644 --- a/libavcodec/dynamic_hdr_vivid.c +++ b/libavcodec/dynamic_hdr_vivid.c @@ -98,26 +98,38 @@ int ff_parse_itu_t_t35_to_dynamic_hdr_vivid(AVDynamicHDRVivid *s, const uint8_t return AVERROR_INVALIDDATA; tm_params->three_Spline_enable_flag = get_bits(gb, 1); if (tm_params->three_Spline_enable_flag) { + AVHDRVivid3SplineParams *three_spline; + if (get_bits_left(gb) < 1 + tm_params->three_Spline_num * (2 + 12 + 28 + 1)) return AVERROR_INVALIDDATA; tm_params->three_Spline_num = get_bits(gb, 1) + 1; + if (tm_params->three_Spline_num > FF_ARRAY_ELEMS(tm_params->three_spline)) + return AVERROR_INVALIDDATA; for (int j = 0; j < tm_params->three_Spline_num; j++) { - tm_params->three_Spline_TH_mode = get_bits(gb, 2); - if (tm_params->three_Spline_TH_mode == 0 || tm_params->three_Spline_TH_mode == 2) { + three_spline = &tm_params->three_spline[j]; + three_spline->th_mode = get_bits(gb, 2); + if (three_spline->th_mode == 0 || three_spline->th_mode == 2) { if (get_bits_left(gb) < 8) return AVERROR_INVALIDDATA; - tm_params->three_Spline_TH_enable_MB = (AVRational){get_bits(gb, 8), 255}; + three_spline->th_enable_mb = (AVRational){get_bits(gb, 8), 255}; } - tm_params->three_Spline_TH_enable = (AVRational){get_bits(gb, 12), 4095}; - tm_params->three_Spline_TH_Delta1 = (AVRational){get_bits(gb, 10), 1023}; - tm_params->three_Spline_TH_Delta2 = (AVRational){get_bits(gb, 10), 1023}; - tm_params->three_Spline_enable_Strength = (AVRational){get_bits(gb, 8), 255}; + three_spline->th_enable = (AVRational){get_bits(gb, 12), 4095}; + three_spline->th_delta1 = (AVRational){get_bits(gb, 10), 1023}; + three_spline->th_delta2 = (AVRational){get_bits(gb, 10), 1023}; + three_spline->enable_strength = (AVRational){get_bits(gb, 8), 255}; } - } else { - tm_params->three_Spline_num = 1; - tm_params->three_Spline_TH_mode = 0; +#if FF_API_HDR_VIVID_THREE_SPLINE + three_spline = &tm_params->three_spline[0]; +FF_DISABLE_DEPRECATION_WARNINGS + tm_params->three_Spline_TH_mode = three_spline->th_mode; + tm_params->three_Spline_TH_enable_MB = three_spline->th_enable_mb; + tm_params->three_Spline_TH_enable = three_spline->th_enable; + tm_params->three_Spline_TH_Delta1 = three_spline->th_delta1; + tm_params->three_Spline_TH_Delta2 = three_spline->th_delta2; + tm_params->three_Spline_enable_Strength = three_spline->enable_strength; +FF_ENABLE_DEPRECATION_WARNINGS +#endif } - } } } From patchwork Fri Feb 24 15:52:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 40506 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1367102pzk; Fri, 24 Feb 2023 07:53:10 -0800 (PST) X-Google-Smtp-Source: AK7set8shx5ToqhMaav05+7f7j1prCCOTRe+lrzJ9EQ2K2o2S8hwHoEsyBHjtvFgxO56NiKzZT4N X-Received: by 2002:a17:906:f0ca:b0:8b2:37b5:cc4 with SMTP id dk10-20020a170906f0ca00b008b237b50cc4mr28051481ejb.7.1677253990714; Fri, 24 Feb 2023 07:53:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677253990; cv=none; d=google.com; s=arc-20160816; b=buTpl0EM6zkYKyr8PXxAjsXmNn249a9KfNY+JucRd6ptDEKRgd2Yqb6CrMna7M4z73 g0YFl8T2Cgy6Uzyc9JReDkKiv1JR8Ph0J1iSgYqz1WAbe/qUVOr6Ba+IebnwPseSX9jV 8BmJwT+rBHngviSltgI5L+0We5HRL2qBVmOt9Kj5yOBTP99p3+HGqnQ/Tlq26Ukm66u8 7eU4JsF4uz2sqh+MY4s4IdYk/qJDg1pHnrzswq9Sx1Nw16k40swZSX535gWgrSOri1jf c5fywyPpJegGMtZHRFpy3WPOaw3Ein31m8O+ruisboeY3z2nZaK51fYV0EU0BhGrUIIa 9JxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=4CGHBR5FMaY4Xi1l3IjWhGE1jh8HribiCks41pTRRN4=; b=QdyUz++Kehzt5Y//5jW9mCyYaQJBWsz3t8hub/+P7R3O4S3/cHHiGNldlST1VxSa0F lfP67veafef4IMZ9v0mGdPIlAolj8zvqmRJrN5vQbuYs2BCvaLelSoEz94RA9A+Mdtru VG99uQTv/plxjhKT5SY/AfbTRPkbelZHF9TxMROccxV4sUR9Gw5GB1eGx3CpGMk1S2PU amweR+Xg3PfKY50JT7ZvHw3sjS4Xxhn/jk01TbkCmbk+OwWigI031UWG0MoJ8bYOGRqy 8xvMRb8bTV/DVyyTYYgV3WBgrOFrWA54lroOt0bp8jGg1fIrCymgPmgMPCcDXKmFgYDD Qeyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=EhP6Ve8O; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n26-20020a17090673da00b008da51485083si18117585ejl.518.2023.02.24.07.53.10; Fri, 24 Feb 2023 07:53:10 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=EhP6Ve8O; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7A7FE68C159; Fri, 24 Feb 2023 17:52:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-58-211.mail.qq.com (out162-62-58-211.mail.qq.com [162.62.58.211]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 32CA968C121 for ; Fri, 24 Feb 2023 17:52:30 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1677253947; bh=F66MXVT2J4LgP9NNfDbddzrrGZWGz0o+WYso9lSwPq8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=EhP6Ve8O8GCclandhT0wnq+81GZNKhjtwsmtUCtg48gagRpHb5hnOUEBCTNgjHOwc y/Ej7naY6ph7+AIDK06mBjJmmNdsAD+S6y66Jw8j9ia7ArDXJIIIGEB0Go+fubmjCV 50GE1VkSexfePPysVQcbU4XVwyIPR52o0aZbeBhY= Received: from localhost.localdomain ([113.118.101.228]) by newxmesmtplogicsvrszc2-1.qq.com (NewEsmtp) with SMTP id D19BEA50; Fri, 24 Feb 2023 23:52:25 +0800 X-QQ-mid: xmsmtpt1677253947t0cuh581a Message-ID: X-QQ-XMAILINFO: OIRGbLfEqjt/BMowLpRYbG5AJbjhaSy31u0WHItPkfARlbyq5IH1oN7w1uqbia IAa8iSrWBpod3V0/t1MFZ7TuKJpDqwCBKPeNNhG2ZrVX3hmmhJUeH0s6bDUmRNocH+5C/HastEt7 CLEuDgRk7Sh+VcBavtvguhRbsEX6s6y8rhTkK6pv6zVNuE4EjPriivy8ZAiV4UVaDWbDYbYfP/mW 6OtlMyrVOAznIq25SZrtCn4mZsUyAumy4fCBimBAsmdm9ztJuqPKsmyUmsCjUTuJg4tA1t+YeMQJ B8j9h8saoVkFbVLvnwe54OAd/rWfZzQ0EvHpvlOLV4nkVaaGcQ82QzRHgRX5x++1+ZGl+Om+GjYx NKpn1umt4pN4tdqwsGL/vvwawMtvA2X12HW5aMBqtBLdz3TPclVYZdcbo69C+Gz3WB+8euanE6xg nhn5kcOqdHq3dtSi2pcmD+2V80Isrm039SwTXn7mIN9VILY4AaGTzTeBU64+nXnH7col9jZuioX3 tLVECDahl9tCLLfQrjv0mcXndMPfrqzfs0Sq5iyU8E9oAxr0tjzxjJyU+UuXuVUm+BixyGOpy2oy Gg8sWnEJAJwO05Pfj0+5xZSADv+/W3J0KfVG6bm69irP41uRFa/XxPK7EoHOaUQVGG+XDraALyr4 VNQgas94A8NBAuQduAWzYFPn6IH7McC86CdUC1CP6wvln8dAUGn/3iE9KEHheG3gq/Ub7pBeEaa7 TGdOmRpQS/Cqz8/8MzIssXjH5khOCwGV8JeBQgPrMRefBE5AutCp9wDzr/l1P5Vrxv6RVRMJZ+/p plBj7Ggt1VvEMY7jsO8kRl7FCWtnSZ74rVBiu8wuiY8XEAHP2KLN7eNtZoueop4nrg7gn3n5x6gN PYBklylZCVnDzLlJzzlUT50RUv8Tmyskr+lOgJIkkJ6V1a2jbqqWmV5hJGGNoB78pjYOc9VcyoRt 2lbLQRL3/045XbwWbeVyB2xLydBJ91SiGju4sKiG8= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Feb 2023 23:52:16 +0800 X-OQ-MSGID: <20230224155222.194400-3-quinkblack@foxmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230224155222.194400-1-quinkblack@foxmail.com> References: <8bf59545-b8a1-bd88-f83c-ba0db7ee6f04@gmail.com> <20230224155222.194400-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 3/9] avfilter/vf_showinfo: fix HDR vivid info 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: tGeBgCByBofg From: Zhao Zhili Signed-off-by: Zhao Zhili --- libavfilter/vf_showinfo.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c index e55625b338..7cf71fe40c 100644 --- a/libavfilter/vf_showinfo.c +++ b/libavfilter/vf_showinfo.c @@ -354,19 +354,21 @@ static void dump_dynamic_hdr_vivid(AVFilterContext *ctx, AVFrameSideData *sd) av_log(ctx, AV_LOG_INFO, "3Spline_enable_flag[%d][%d]: %d, ", w, i, tm_params->three_Spline_enable_flag); if (tm_params->three_Spline_enable_flag) { - av_log(ctx, AV_LOG_INFO, "3Spline_TH_mode[%d][%d]: %d, ", w, i, tm_params->three_Spline_TH_mode); - for (int j = 0; j < tm_params->three_Spline_num; j++) { - av_log(ctx, AV_LOG_INFO, "3Spline_TH_enable_MB[%d][%d][%d]: %.4f, ", - w, i, j, av_q2d(tm_params->three_Spline_TH_enable_MB)); + const AVHDRVivid3SplineParams *three_spline = &tm_params->three_spline[j]; + av_log(ctx, AV_LOG_INFO, "3Spline_TH_mode[%d][%d]: %d, ", w, i, three_spline->th_mode); + if (three_spline->th_mode == 0 || three_spline->th_mode == 2) { + av_log(ctx, AV_LOG_INFO, "3Spline_TH_enable_MB[%d][%d][%d]: %.4f, ", + w, i, j, av_q2d(three_spline->th_enable_mb)); + } av_log(ctx, AV_LOG_INFO, "3Spline_TH_enable[%d][%d][%d]: %.4f, ", - w, i, j, av_q2d(tm_params->three_Spline_TH_enable)); + w, i, j, av_q2d(three_spline->th_enable)); av_log(ctx, AV_LOG_INFO, "3Spline_TH_Delta1[%d][%d][%d]: %.4f, ", - w, i, j, av_q2d(tm_params->three_Spline_TH_Delta1)); + w, i, j, av_q2d(three_spline->th_delta1)); av_log(ctx, AV_LOG_INFO, "3Spline_TH_Delta2[%d][%d][%d]: %.4f, ", - w, i, j, av_q2d(tm_params->three_Spline_TH_Delta2)); + w, i, j, av_q2d(three_spline->th_delta2)); av_log(ctx, AV_LOG_INFO, "3Spline_enable_Strength[%d][%d][%d]: %.4f, ", - w, i, j, av_q2d(tm_params->three_Spline_enable_Strength)); + w, i, j, av_q2d(three_spline->enable_strength)); } } } From patchwork Fri Feb 24 15:52:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 40504 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1366828pzk; Fri, 24 Feb 2023 07:52:51 -0800 (PST) X-Google-Smtp-Source: AK7set/es5So7videpbRR1T54YtRoTr36JjIUuaB3dCi9evADJ+hd1LfBK3L6lxuhyHCzhYcfHWj X-Received: by 2002:a17:907:98d2:b0:8b2:3eb6:8661 with SMTP id kd18-20020a17090798d200b008b23eb68661mr27302984ejc.8.1677253971505; Fri, 24 Feb 2023 07:52:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677253971; cv=none; d=google.com; s=arc-20160816; b=yysECbPB/o/fxACl81pGX/mhPqY33rO8yvnOp+3RnIhwg7dT9QGYqKdhgKmm7o7MBS jhXkfMTtMtfgFd1ZUILeS9k4bwvcKAsHTBAEg+lPhuzlOn/kJ89HxVNHlFiWGQ4/0qbL Xlno8gF31LOQfMYvhOaCHyOI0F12G9Rlez2zU4rmB5EAjcGQDmUb9iAou9fMCKE+ihpH Vc5rd9Od5FMnyyYb4szBakRBhaHD5kdmxxwSRzsVLYEC4nUJ+1j8kR6+X4zrfcN52zFW lwlAmMLDJMtcZMBjrMat617I7Ky0n071nbCuKMYbQrXIbEBNWBnG9ZP1ScnjwIEr8md3 kbIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=+uBJxaqXk85laRRZ5npwRZ0p54KmvGBtwA5UsnxCbtc=; b=GJ2WsQoqAcp83V+v0m44yTyha8AAXhgy9x1r686eB7+YyJF4iTwDi39dYXLDt+Av4E Y68YB7d/ub4gAueNQHwmz9M+roodgUo3RY3pXXE+V25GDvHF0tE4jY8CMd/klnhv9CC6 +emAQKAu32GFFitoOdmXPV/YVG8QDEHGXvEWomi2f70/BHNjPuldB48xtV8UxwlQkTt9 diSdqsKNcjxRokAGPdcCuAtNBEsfaCXFMTvGiUq999NF0GR6sq/7nWrg7NMNy4Xin+Hb z37OBl6GLBHq0RH/8yU5jEEbcXD3eLbVYiDa5PkD3QO2srVU9khTQKRvWIJt6E6ojwgi PCtw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=dH1CzikK; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z16-20020a17090674d000b008c64d11f496si23238352ejl.809.2023.02.24.07.52.51; Fri, 24 Feb 2023 07:52:51 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=dH1CzikK; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 72B0568C156; Fri, 24 Feb 2023 17:52:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-58-216.mail.qq.com (out162-62-58-216.mail.qq.com [162.62.58.216]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1E30768BFFE for ; Fri, 24 Feb 2023 17:52:30 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1677253948; bh=zznSZI8BAZyRwF8M8e55WPN9r9n1QsOnb3NLp/jjNiE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dH1CzikKnoXZ952CktrP+0bvpFIMIJVD2B6IEEIzFVSkxldlydYbGhuY7McMoPJ1h /k73oOwsqHbgT+zo5/u3kZTeCa0pVflyTUCAhLa4I3SawX0bUwq+477VVleLyV5Jl0 HirYhZJ9ubZcuCPvizwg0B1seKrNnwQnFkLXzLsc= Received: from localhost.localdomain ([113.118.101.228]) by newxmesmtplogicsvrszc2-1.qq.com (NewEsmtp) with SMTP id D19BEA50; Fri, 24 Feb 2023 23:52:25 +0800 X-QQ-mid: xmsmtpt1677253947tyd2gn7vq Message-ID: X-QQ-XMAILINFO: Md8NwmqZYy3fTYjsOTF5zgiuP8OSWequGWOu+kITcZrklSKC9TwA09zVrJq3+G 6Gzm07c/7FOglF85wxnKfvhVPyR3HGo+98RHQEq5MV2AmZJzOy6tJuERVT1ZOA89ONNst6IUZow7 YESFum0SLB/SAeKPguVT6vx9w6Srl1+fLbOzu4Ojk9r6VUi3yWlt9B36finh0mWZPa6ABMqcvEVH jBxAK8YVxPu8DlMuH3ISHEW0Q9cq/OkWPIFNQ6imVntUVCmqDJNUhwmCuQbdtjvKAfLWXMhEx3xD 0eBPRUvNErzZmgNManqqOsHIvLKA7Cs3veVY3sfK576TQH9w6EpVU8mvKozau6V6g/dcrG1I+3jA mN10ag3WsQypVbplCm80YmoaHtl2xy3SHcJCZZF/mOtqsPfFvFlAbrv5mwlnNiTsuMFdy2e45Bw+ Htfpq0ga3TRysk9Z248CX/cU/9ydEgEGgUJkpb2h/LJM2jECGJSKG2TvoM2vjEZYcF0dbQoMxpbz 4z+PpOMwhfLzAaUzSI7xnDLg9Xt/cobt4ds/9cVzUumHjtLClm+qIZJGskyWmEW8JOkLgic7b+kN LGyp0DNKHX2Jng1ISQ2L+kkJ4IS5c08ZI5TBIpUFKMha1eiebZ8YuND8K5Vtt+vb6FwSP2Jfpgze R/qkmH3JKgLpnMKFeVg5ivht40vu7E73Rbupag+H2K60sioEUrpTkfQ/nXX6rubEVxhcba9W94LI PsEPra4WJ3xZq14ZeaekxUOZ7j/+azxIct5qy/DhMIhSQVQL3baUvoUfoEZ5EitumTQs5nc6UeSG IfeyfxbLOPJ6jvEuS3Zvo4zUGj2JvV2IqprNEy2qijsgys3z5q6w9KC01FFKKxIsoQp405kvZVWP zPsDQDXCOuS+CGH5nSKP1FobCcDxEtbtGitC9wcwrT8o1VFk0J0WhdGDSHpDeCSH9iyHJ1Uwjz9E RVTmkojOmffXEA1TMGsESeiFTRe0Gx1Fp5Pt+mmUI= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Feb 2023 23:52:17 +0800 X-OQ-MSGID: <20230224155222.194400-4-quinkblack@foxmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230224155222.194400-1-quinkblack@foxmail.com> References: <8bf59545-b8a1-bd88-f83c-ba0db7ee6f04@gmail.com> <20230224155222.194400-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 4/9] fftools/ffprobe: fix HDR vivid info 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ChjoQTYUoWBz From: Zhao Zhili Signed-off-by: Zhao Zhili --- fftools/ffprobe.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index af927cb084..64883321be 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -2246,14 +2246,17 @@ static void print_dynamic_hdr_vivid(WriterContext *w, const AVDynamicHDRVivid *m print_int("3Spline_enable_flag", tm_params->three_Spline_enable_flag); if (tm_params->three_Spline_enable_flag) { print_int("3Spline_num", tm_params->three_Spline_num); - print_int("3Spline_TH_mode", tm_params->three_Spline_TH_mode); for (int j = 0; j < tm_params->three_Spline_num; j++) { - print_q("3Spline_TH_enable_MB", tm_params->three_Spline_TH_enable_MB, '/'); - print_q("3Spline_TH_enable", tm_params->three_Spline_TH_enable, '/'); - print_q("3Spline_TH_Delta1", tm_params->three_Spline_TH_Delta1, '/'); - print_q("3Spline_TH_Delta2", tm_params->three_Spline_TH_Delta2, '/'); - print_q("3Spline_enable_Strength", tm_params->three_Spline_enable_Strength, '/'); + const AVHDRVivid3SplineParams *three_spline = &tm_params->three_spline[j]; + print_int("3Spline_TH_mode", three_spline->th_mode); + if (three_spline->th_mode == 0 || three_spline->th_mode == 2) { + print_q("3Spline_TH_enable_MB", three_spline->th_enable_mb, '/'); + } + print_q("3Spline_TH_enable", three_spline->th_enable, '/'); + print_q("3Spline_TH_Delta1", three_spline->th_delta1, '/'); + print_q("3Spline_TH_Delta2", three_spline->th_delta2, '/'); + print_q("3Spline_enable_Strength", three_spline->enable_strength, '/'); } } } From patchwork Fri Feb 24 15:52:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 40507 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1367209pzk; Fri, 24 Feb 2023 07:53:21 -0800 (PST) X-Google-Smtp-Source: AK7set8J+BKt9YYwi1xZqK+zaPJx5puHhwa19ff86zl5u6W8tnGepNUUMd/zdLpfDQoW0H2VNe+S X-Received: by 2002:a17:907:f99:b0:8b1:3b96:3fe8 with SMTP id kb25-20020a1709070f9900b008b13b963fe8mr23270523ejc.52.1677254000778; Fri, 24 Feb 2023 07:53:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677254000; cv=none; d=google.com; s=arc-20160816; b=DfiHwQDOT8g3FxLLZhH1ReHcbgfkag8YgVLSkUPPUhVJrprxc8AiCBfGEB3ncyqKGQ 4ZtPR+EUEULt4zKayn5N01n/lJMPrCkWDPsSULYUEZbAzrOJbR/PqoS3q/hELbgSpOIs GP+Xaivlp9edh2UTCL3g1Obqfyw4T/hXdfxxX8UvwZMK99RV2wj7LrXtW7QhmCcuUSAT pfSKfAN4dXpNGhppVh+6uIUT3uJCHsE2EVueRnqh8ucoN+X06zjhyYY2UOueJYD63ehx TqaKh5cVgBOrtvDF3xbzTDt7Q6nfqN837wFzCRjKmUZZxTyA9iKTlERx7xvcfSXYe+9Z YHhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=Poc12WXP5LWWoZ+CecNQ8MpfT+YMs/tpU/iP6mchLQM=; b=by6MB/sLDMLJm8NYxGiw7SltRqkkRjf7eIqMcsmgVRfyFsFGe5CISvcy9adcqHSVqM BkjMYsC6BhM5WpKwcZ1zKP32kqrAnAlzztlJQTPHYvufuC2hcGkRNq3Z8Ly2MvThOXKR mkROgu/28ygYqHSrEvLBQlsBeD4+KBKglC1rTqP73bHx8VZoGUE/FJ48MWdzPb/+4mab 5SsztDiWy5ATN1ZaVDQv9UASkdKSKjrQphaxueVVElSjgJWjTX6P1QAevib8zssQsvA0 YfDpz29nJiFkhKPVdDTA/LawiyLLDMrUfEbKSkwsSDl0Bp+XOVNWuI0dqeHIWpptfQOd 9lvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=NxcYYMpM; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d10-20020a17090692ca00b008c85af719f9si18481869ejx.102.2023.02.24.07.53.20; Fri, 24 Feb 2023 07:53:20 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=NxcYYMpM; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7735868C15D; Fri, 24 Feb 2023 17:52:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-252.mail.qq.com (out162-62-57-252.mail.qq.com [162.62.57.252]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3DC1368C129 for ; Fri, 24 Feb 2023 17:52:31 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1677253949; bh=rts7sI+p/Zu1Al3Hv14HL6UtSeq/fW+rhQ/2t4SavO0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=NxcYYMpM1yVN0noxgd8KAqd5VhPLSiLOyPvNQ5aGITD44Y9vGVEpysBbGXNBjUVYb 6ShP+9rEmgRgm0n5kDfcmhReKJ/zY+XAbANvfT5Q5gYzoXTMOUhAnZangYkc60cg4R s+L/94oE21HtkmeH2Qwg0HPZ1UT/3K1glkmarZ+w= Received: from localhost.localdomain ([113.118.101.228]) by newxmesmtplogicsvrszc2-1.qq.com (NewEsmtp) with SMTP id D19BEA50; Fri, 24 Feb 2023 23:52:25 +0800 X-QQ-mid: xmsmtpt1677253948tagosd9ju Message-ID: X-QQ-XMAILINFO: NioaTWkRhWwaG0oqNE1ZjglP0isWnu8abN3ISqMNSRXqJDoTChIT9EB4mnwidd W+RDyOqxedqCFMIeZOnsZDQAF9EUUkvvVic+qrkM0L7pRxcE9RXqGzfytp3rOeOtWSsiACo1KoiM 0EWIju/CIbhFn8g35CvNTb0TOV58jvrsx914UG8Bc4ZQx6a/TT0dixYQKAcD+sAopa7BlxKgJJim oNPRvNeW6jjEfr12Wc/iEoQ5mvkO8F9spuL1eqTDHB3WH+XOP4P2PZYXiXTJWGn1k3EaHdEYty5c ZKWl/HD21am8ztkfI3KRGdMN2xYoINZz0gdKwaCPS0+MdNT7m0YHmn2l8RHHkz+ffdK12pTBtikr Tc34mfE9U2icqzEBRmzwW3PKiQRTGoVWOghaKoxURTf2ToPpkUa/T27ZR7ePjV3gdTpWUt9vNH2T cbzG7D4PYoagwEO+OzwekRDc/CptHVNyfjKlNPVya6Dap0eOFa2mLerHu5J42aNWdvbKiGvNwOqJ WHimlLKtlmkkw3ruBHs7c+DzKDMcQ9VBeh4ycuCe7rjx2/9gWp+535zfhYm7uUoZha/u6ndO0NjQ RC9AeirSZEDSByueTaXcEUmTPPdrDGDA8JvFNvs2deNfZ0KGPn09BWwmGyKFxeW09aBkcB/ZSUeF k3wTmXiZfkGnBMef/V0UzQoz9RdgtELSijC9Mwq8Gm4l1Tgw5CzxvTDsiMOp8ZgSY/AH20s1dAcB K0ejVInFEpzq52rvnQcPn47R4RtjDXndpOTKIuTcCXTuclmqSJdwHYbmly+q7k54wP040whg3Ggl eO/4ioWJPbW+ghPgDOySgwv7/67DVK5XLdMwADSRlXP+wwOAwNG3UpVqAcoNuTM3vjdv7fGjA/mF yssvSkwRL7TZccIhCFwe8N1r1CrVmbCREAbIXNxJHoigC9baFPeeMhkcs2vt4mrM228rYIoONfL0 rvjye972Po2+XuGrVJC//DNtdXhFr7Q644aHNWQyhPmmVrKtN12FHtAXb2TcFPcf0kCH64fGE= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Feb 2023 23:52:18 +0800 X-OQ-MSGID: <20230224155222.194400-5-quinkblack@foxmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230224155222.194400-1-quinkblack@foxmail.com> References: <8bf59545-b8a1-bd88-f83c-ba0db7ee6f04@gmail.com> <20230224155222.194400-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 5/9] libavcodec/dynamic_hdr_vivid: fix start code check 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: +3oG0CSwf6kT From: Zhao Zhili Signed-off-by: Zhao Zhili --- libavcodec/dynamic_hdr_vivid.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/dynamic_hdr_vivid.c b/libavcodec/dynamic_hdr_vivid.c index f2bc0c9059..9847b88e61 100644 --- a/libavcodec/dynamic_hdr_vivid.c +++ b/libavcodec/dynamic_hdr_vivid.c @@ -46,7 +46,8 @@ int ff_parse_itu_t_t35_to_dynamic_hdr_vivid(AVDynamicHDRVivid *s, const uint8_t return AVERROR_INVALIDDATA; s->system_start_code = get_bits(gb, 8); - if (s->system_start_code == 0x01) { + // T/UWA 005.1-2022, table 11 + if (s->system_start_code >= 0x01 && s->system_start_code <= 0x07) { s->num_windows = 1; if (get_bits_left(gb) < 12 * 4 * s->num_windows) From patchwork Fri Feb 24 15:52:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 40508 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1367313pzk; Fri, 24 Feb 2023 07:53:30 -0800 (PST) X-Google-Smtp-Source: AK7set8q9ER5jNGtR3a3g8d9cOHlDJl8st8dq6ovthWpsQ/aWQZaxYIqh3iTYuAOiGzf3fpsdM+r X-Received: by 2002:a17:906:304e:b0:8aa:be1a:c4bf with SMTP id d14-20020a170906304e00b008aabe1ac4bfmr21707023ejd.16.1677254010111; Fri, 24 Feb 2023 07:53:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677254010; cv=none; d=google.com; s=arc-20160816; b=yYGIgcktV1hlkaSssSs9et1mS91YbtCXUDrKhH411YgE42X0SAGs4YiS52Ex3ENZAp NNmBQmgZhDqt/xWEseyb0ozB/fdCZhPXyOHbI0tnyt4RFn8YCHF0UMxHC8vhBzkJYnp6 bA2H24enLClDlqUGnQnE++F/u7DPk6WvLOxfQQK0iUenvMZewvvjB4GnxhuJZ0G0yBar OlGC6f/ApRQ1NkNV6WLZLO8rOWkOdmQn5V/P/2VwYh0DNTckFtK7MNZPu1nXTj6EwUiO 83qOKLebksTOr6YhrsYdU8hvMlRwyKJo47omG7GOciQdlg5Yi9+IeuqYCU2LOxQ6umN/ Rsdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=MCVNqvWSxcWcfUG5lCsc9JYTWkmF8P2adSMT9FA5mhY=; b=CMDZq4bAZlModGHgwdnHd/VL07Vz4aZv+2Sg0oV7Gm91RuGvVCaS93mzl5zj6+XC+X NxQPDK3mL42/r1oXldjFC3G9WFQ0HBnCyPtNXvSjG+atd/eQJAuEkUEcRawJl6750Pto Xa1x7wlDIngmjOa4nwqAMlR/sQrvFUKSDjJToUFBrwN7AJ0rrhmkLVKLr833jRbRY9jX HalRxSF9b2EhRp5CL4KIIZya0XTjDwte5Fmzpj0yZ8sFY/OpCFNl0YXambRlaeyPYeEe g7RqHVOBDbtzo2SdioLaXS4Ur2EbvMIqTwXKYH4alDfzd/D+6BARqgmQGztQcHSWcAnF czwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=FqdCYA0u; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id wj7-20020a170907050700b008c882f28493si18536747ejb.596.2023.02.24.07.53.29; Fri, 24 Feb 2023 07:53:30 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=FqdCYA0u; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6E31768C17B; Fri, 24 Feb 2023 17:52:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-58-211.mail.qq.com (out162-62-58-211.mail.qq.com [162.62.58.211]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3F4C868C13D for ; Fri, 24 Feb 2023 17:52:32 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1677253949; bh=toqn4ZVTznKTHSSXn1kfNLMQFGM/CVovAqoic6U4fAI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=FqdCYA0ugAPL7pH0Oruf59NHakGLvU3w3D/01JA0k3LXJoShWlWlvPGqQ3nWDywL5 VWCjVl6bxcNUysQSMBu56MzOM37pjvHWoG9WG8QYils/KgtI/2p3tWAv2c9mwApuwi adctZp7uRy8WvlTMUP7PFGT8RDQrok2YkKR/K17g= Received: from localhost.localdomain ([113.118.101.228]) by newxmesmtplogicsvrszc2-1.qq.com (NewEsmtp) with SMTP id D19BEA50; Fri, 24 Feb 2023 23:52:25 +0800 X-QQ-mid: xmsmtpt1677253948tkwevrzma Message-ID: X-QQ-XMAILINFO: NKK3GzmX/bja8o1kvOS8wIyF8oA3wxsVuFyXnT7T5YYeQkrWSlnVsRNqW+/0sM uj1VaGKO9UwNbwmV7asvcLx9HZnXAeEK69/7vuOEQ9bkKcB8e5lDb2vtJ9XGyDGoIHsxbxZL4W6t 8gyX+dAbuLyAwYUUw0KnT+2xxbS7j4jFwO1O1uYAFAoXkLXi+HnIOQL9zWOlwzy4HrzT37o1Co/K HLuVDf7PR70S+SGPzhYfDQUTnpiL5Vx815c9gi8zgfKGVskAdfCb7SQejWiIVnP1T1pJzzKticsK gvS31THpOVdsmrsMDxrXxWhygsSEKhiFzrdjjv7B8jA95tisP62TKjjoRakvqTd7rz2cnyYzH6rS hzXA+cOhlVbFOzJry4AY77iLOrmlXJ9/3AN5d79l+lA3mQDRmA3Hz120kH9AnZ/zkid78dg1oGhU oNxhTnOx42IGNfvGRSSTEb4tT+KKAz5ZlPqqBfzQzStGeLhl1lW0g+SkrzxmYWzj/LoOWcfDloAT P7uo7T+NP03yWN/MhxU/7+8QSIhyzdkiVTONFy+VT4PBafDuuY6TMhectymxPP79FTdgSVZ1Z9d/ OgfQVzX19BPIwwlv0VySb9afrEu36u1pGGy8r5EeCDmPNM7LD5JWhBaXaOvi8caRrZKUPlwF+BeZ 7vcJXdPxyOpOsU1e7SLO25IMDmcwj4LjJOqW0/f14Vi95vqmy/sDq7yLpDus+v8lTAGfY6ihXtbU ScuOnUlQaY57moOSKuPZp9fw+1mTFM0Z+0IfCUvjRm328rDBF9mDWACEovwpLDysWnoEyR7gLQU2 9VV41DOA0m80sXBmaCGDgeAGSJ34RNl2xheKYOa98VTQVIZVPzo6e6ZaunSnxqlbILyUcjXWHWqX ZfJtvC2aO6pHYqFVs/VamZX73yFNFyVpok7FPOAXrnMOJ1pZs9bGkB5cDkmS9yNab0uOdmGCk6TG Qr3uMCZOdPHMZYAmwyX3In7WnqUbDPavm8uHFGFpbxSrWOwlsgysM0JRXYi3zVykw9QMhPUIcXsy p78JQv/Q== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Feb 2023 23:52:19 +0800 X-OQ-MSGID: <20230224155222.194400-6-quinkblack@foxmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230224155222.194400-1-quinkblack@foxmail.com> References: <8bf59545-b8a1-bd88-f83c-ba0db7ee6f04@gmail.com> <20230224155222.194400-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 6/9] avcodec/dynamic_hdr_vivid: fix base_param_Delta 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 1rOx1kboSSH2 From: Zhao Zhili It conflicts the comments. The operation based on Delta_enable_mode can be applied by user during tone mapping. Signed-off-by: Zhao Zhili --- libavcodec/dynamic_hdr_vivid.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libavcodec/dynamic_hdr_vivid.c b/libavcodec/dynamic_hdr_vivid.c index 9847b88e61..30f7dfc71f 100644 --- a/libavcodec/dynamic_hdr_vivid.c +++ b/libavcodec/dynamic_hdr_vivid.c @@ -90,10 +90,7 @@ int ff_parse_itu_t_t35_to_dynamic_hdr_vivid(AVDynamicHDRVivid *s, const uint8_t tm_params->base_param_k2 = get_bits(gb, 2); tm_params->base_param_k3 = get_bits(gb, 4); tm_params->base_param_Delta_enable_mode = get_bits(gb, 3); - if (tm_params->base_param_Delta_enable_mode == 2 || tm_params->base_param_Delta_enable_mode == 6) - tm_params->base_param_Delta = (AVRational){get_bits(gb, 7) * -1, base_param_Delta_den}; - else - tm_params->base_param_Delta = (AVRational){get_bits(gb, 7), base_param_Delta_den}; + tm_params->base_param_Delta = (AVRational){get_bits(gb, 7), base_param_Delta_den}; if (get_bits_left(gb) < 1) return AVERROR_INVALIDDATA; From patchwork Fri Feb 24 15:52:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 40509 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1367448pzk; Fri, 24 Feb 2023 07:53:40 -0800 (PST) X-Google-Smtp-Source: AK7set830rkg5fjatp6EEq5F9ceMwEeAeHx5jrp5fZ8FoqrI2W43ExUm5RFv0BtD8i2tIc4DXBYH X-Received: by 2002:a05:6402:1653:b0:4ae:eab6:9ff8 with SMTP id s19-20020a056402165300b004aeeab69ff8mr22406467edx.13.1677254019887; Fri, 24 Feb 2023 07:53:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677254019; cv=none; d=google.com; s=arc-20160816; b=0lipzZIXtg4dwdC8xWdEJjgNBKkZ6DeUsEYe9HeCHpX19z/zWTRU9OcGullcA9Ryq2 lMdZye6F0/NOPGG7UZ5DIWaeDfXcb3CrDKwHslW/DXUyx6RIRY82fCQPx7A5OO7I8202 NteTfGsCEz6wR8JaRh99B28zIcvUwQZlQ1pNRlsCZCmuTYeYZTPevI/p/4DgUTVa2f2l w5r2ib384WtYgy2WDEKwPY3mKoJXO7/2ymkgz9sMON/jJEQtIdn1qvkArSwAopU0OpTf PUh+N12C07SwemE8Hb0xLvwUSWBjQDWrkJ+osLPwFmKafBTzNVAzoqEwqYSWpF1fwGAo knEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=m7pr+dIn9KsZesVFxetX12h6O3ll9Ejmva0JKeLpigc=; b=FbLNd2/c7Dr1seRBNlvqTw6w4qXjozg8SQCuk29xYjFVG/Qrmd50D5z9LFZlYNi0QU 3KT/F0oy4O8wJHFgxQSPSrKFCFvNiTpqw1B2ySjyqJCfdtUq7InFoZ1U5P1w2fdVnP/y 1cYhVBh58QVJ0GMbhOOiPg9KqZvAD420RL0TIDTg9SN6PVn+pJyaORxITVO78zWr53yl IdaU0jKcYvcri/NEGHuAtgluM8bdNVwYT00jS/mwqApHXw1P1EMwecw/be7Mf1uP3+bG HL8qPZcGf3p0POnqL+uhldXMvYWc7uxcis64EF3Yvu+z/89CXIveH/L/J2rSLwqrdv2f fvLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=tjP4iNzw; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r13-20020aa7d14d000000b0045fca739593si11604481edo.188.2023.02.24.07.53.39; Fri, 24 Feb 2023 07:53:39 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=tjP4iNzw; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 539B468C11F; Fri, 24 Feb 2023 17:52:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-252.mail.qq.com (out162-62-57-252.mail.qq.com [162.62.57.252]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7811268C13E for ; Fri, 24 Feb 2023 17:52:32 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1677253950; bh=hyYgrcJk59vVWdVpG/1grWw/zNNrW1J8Fs5+l4I3qwg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=tjP4iNzwm4UDdrFG4yQyhQ6paTQzMr7ByTlGBSfHlfIbOVKsmpRoorKqvOa7fLHQ2 HI6gvoGvX44IYd8DIXCopoa1MgRV8Gb268lvmRyYas4ceya+hEw4TlVnld6zQQWzTM USXAt0iUO0hjvmAtm0ry6W3EsoV5Mcn1ZnfbzJ28= Received: from localhost.localdomain ([113.118.101.228]) by newxmesmtplogicsvrszc2-1.qq.com (NewEsmtp) with SMTP id D19BEA50; Fri, 24 Feb 2023 23:52:25 +0800 X-QQ-mid: xmsmtpt1677253949t5a92hvvx Message-ID: X-QQ-XMAILINFO: NJ/+omVLhVga9RafuMQBISHuZ2lXVXXTOziyTwa4pC6a2lRYte8/gYu+iVjIp0 MrbD5o5I4JKdrLohPZc+6H3Wpm9BXelEKCqIo+XD5pDQDC0WkVy+iXnbzAGzxnpucag+yp6ErW1t C6d7iFdP5fiEE3vxRnNpb9kPjR+CrcxyKQdvclthqwV0VOnBKjTVkmdZe4d1mShexb88ql6vvllx Hn6EuMSvv4zQHW0ZEqjhS52x0DhromKKEGlv0adPXqmgOd7VaRi3xL5RKjTYpc5R5irN5pJEmHWd tbSopc86UtT3z9WBvxLf4utgXizs0r/WR3UqjBtEs2Wtf4TzxS9OwcVsYw4fT24W533sqGANtEIO rhPGqj/gLAwm+673b1jXh0Ibl3ctELbmvmd5EGOIOuw6WsDRA+TDWWya7UidkLC3tGNOfU5xNRUS mW/X58cdBXEvGqsrTsbv3lvus88cojudk1oKtZHMMV/TDLCNUiThkKG5Pj4ieAf7luwD/AAMeXKi iASG7ajaJ7QjKhT4eW5lL3C6jqB4GG+7GcJt62rW5MHcf4XTMJ1/BxvVmc4RJW6HH49ho9KvihMv 99VLZrEdCaonhyb3rpqELs4MZ52PukutNivgU3rlyobbjFBQnOCVaOzSH56HJjxv2Of/v/mj8c4/ zh5lJgiKk3zHRepkXKoNz5dAbCbPcQO33DlfbX94Z01P4aAZqjyYxGfNQFPxAu61uxnSWaEitbhZ SBbtTnSpefDgHykYV/qPpS4GSJD6al6LpHz3ckT1MFE0Yn2q6E3ySasNBFCrZhraVElwriCMt0Rl e9M+2cjEialRyIvp5kNrt3cI8FjQqCyer9PUns5L1L7l2HKqn8Ti6itz4BaKU4ukexVXJ/Cpm6XY FepYK2k7nT50mrYhHe9ukgyCxqpSDjHQQ7NFm08SmT483krXrKJTU2tpLi/BsR0IULdHPTlcMUvS nx0fEatEMquaw2hXsif2IqI0hXhXgZT6OT9x5VuQNiF8cBUwq/Hb9bUayozlKEQq1NBjsGu5oztC 9bbnV3/xiHYZjPQtbv0IvN1ibMRU4= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Feb 2023 23:52:20 +0800 X-OQ-MSGID: <20230224155222.194400-7-quinkblack@foxmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230224155222.194400-1-quinkblack@foxmail.com> References: <8bf59545-b8a1-bd88-f83c-ba0db7ee6f04@gmail.com> <20230224155222.194400-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 7/9] avcodec/dynamic_hdr_vivid: fix base_enable_flag control 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 54H0z5YDOjmQ From: Zhao Zhili The base_enable_flag is parallel to three_Spline_enable_flag. The typesetting of the specification is very misleading. Signed-off-by: Zhao Zhili --- libavcodec/dynamic_hdr_vivid.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/dynamic_hdr_vivid.c b/libavcodec/dynamic_hdr_vivid.c index 30f7dfc71f..7cb13cbf32 100644 --- a/libavcodec/dynamic_hdr_vivid.c +++ b/libavcodec/dynamic_hdr_vivid.c @@ -91,7 +91,7 @@ int ff_parse_itu_t_t35_to_dynamic_hdr_vivid(AVDynamicHDRVivid *s, const uint8_t tm_params->base_param_k3 = get_bits(gb, 4); tm_params->base_param_Delta_enable_mode = get_bits(gb, 3); tm_params->base_param_Delta = (AVRational){get_bits(gb, 7), base_param_Delta_den}; - + } if (get_bits_left(gb) < 1) return AVERROR_INVALIDDATA; tm_params->three_Spline_enable_flag = get_bits(gb, 1); @@ -128,7 +128,6 @@ FF_DISABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS #endif } - } } } From patchwork Fri Feb 24 15:52:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 40510 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1367700pzk; Fri, 24 Feb 2023 07:53:58 -0800 (PST) X-Google-Smtp-Source: AK7set/igvTqk5xelUS0oWfz6zItULZP5y+LchXtzh7faIlOl3Jh3UEEGE03OR7HbCpeg8cPPUL8 X-Received: by 2002:a17:907:105b:b0:885:8f79:d6d7 with SMTP id oy27-20020a170907105b00b008858f79d6d7mr24501056ejb.61.1677254038604; Fri, 24 Feb 2023 07:53:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677254038; cv=none; d=google.com; s=arc-20160816; b=Pc0+WpAx9Fuoixq9AUBR9H2O9pchT10imivEo6VaeO0aBY+Bko8JjrQbarSQresi2G jMVAceyEKemy1Y0w7X3sHzNsRlKT9pijotZO5JeAckDk1jNJtje1m79LMBOUa/36hI8E zZ/qNMAVYzKX4PY0pFyDRsQOdxhmjsaT3VQ7XsezyKXkawXcvXxcXkzr5YgKvMTEoPvr +w+6ta92PC5sacZK//Dan9I1MhmZg+gM23O678sqW6mSeSM/MFz3j39htGABUQE3sq1c uCWWZhC9Y2oE8UMfxOrquX/Bqadn12GJt8StSycMIXrKl4PcnuARf2CGbqSVlBB9m2ot VLhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=t1vwsLfwORtJRWo5PN0cmOzsoVusv9SyMljpP5QaLnc=; b=YRPnmNP0w9jhFF7QpCagE9SVePIzsnimTt35n8E9aASOjry4FE/cR6o000u4PKCyQL OTvFp64BMT5kJydDwEydFDon+NMLFoYWENKKGi7dxjTL9DgQuc4eCGbMdwsZqNMN4JC8 NDJuQZftzxmwvIvjcZjZX4R5oQ+/JWz9OgjJmr9DPGYakHfKCwq5FkKaRprbAye9g9uA pwY2mtgOsGx+5wJZVzYtLjnr3nZSUKvPY72hRG2be3ogmfMRP7eauHOWIxuev/7MJTLD 80jRbLeR/vkW16G2aswBLPCnX/i1UQkWdKz+RTZM49urn6qaHgGU9FGzOAQmVNr6+7HL V40w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=ar4qJE+V; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id om10-20020a170907a18a00b008c92fd90d58si18688848ejc.303.2023.02.24.07.53.58; Fri, 24 Feb 2023 07:53:58 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=ar4qJE+V; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3E60B68C187; Fri, 24 Feb 2023 17:52:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-49.mail.qq.com (out162-62-57-49.mail.qq.com [162.62.57.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AAB3068C159 for ; Fri, 24 Feb 2023 17:52:34 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1677253951; bh=3niLG1BOwsm2qMmMmRBiBkl2YuCFgjuSFa2eC6hgpj4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ar4qJE+VOK1rfGNBUPeoOI7uJm0HfNhOPUjm6XVtyNWLkO8kZN2shOfJ8W+Bcq25q sdlj1Jrn1fldvR0XjSJKf0u2jbRM/w8GNJOWWNCuUpsir91aTYo8cSlXurl8YnlWOX KBtZJ7gqOsf4Efewn98sJoP7R5Xiop5IrD6AszXM= Received: from localhost.localdomain ([113.118.101.228]) by newxmesmtplogicsvrszc2-1.qq.com (NewEsmtp) with SMTP id D19BEA50; Fri, 24 Feb 2023 23:52:25 +0800 X-QQ-mid: xmsmtpt1677253950t54d9cjui Message-ID: X-QQ-XMAILINFO: MR/iVh5QLeiev2U1jGoLf90bnUWAwF4zOBwqZ9j4/cVWOOZsDMTZ5SH7Queobl CPvP8JZNwnKN2CynUMs9VCKbeEh7uBGcAPzLDFPQ6h3lh/6HaGQYJA5sVukvSn4M5QjoVJqV++jK jZ0t0J6P+mIwDbvDyxhmIOeOkYgi2ERzzulqWRGaQ0byuIYxQ5xO9COix9WE5RmddPO71rktg8i9 qzltTpyAryvA3nAjgC1CBj5lg6S0bxfqnAGNhAqIltM5Vo3SOmPsYr0SDHfckkez5fNlQ2IGTjQe 4u9OCvtn18lIXdHwpmiOJQdGYoaLozSNgic/8/jtYoUAEmKvgHVqmIagax3J8XO7CMPVQkfRhc2r PmC5vt1Fq9R3gJ0rR+IAf+WtzWyhH1uhr4Dul8GAlAx3HR2eTJlYdMqNgxQnDPwQfw+coIRQn1eE HMn1fJwu9fyJxlYH2BsxjJxbgS+JjsMMqvfI7aEk2KHPj/EBQ8pCr9qWkunlrpX0xO0ByCskyLoj sMu2vp8mlO3ztNCCVT3JBgo3+kFxO5t5r+2GfaK9r/7/WDuRUtCUjabbnrp97xfu8m+L+TJzQkNM sTJPJpzU1z9r0zxGXghmD5zAXKkBBmd+wGTbgYV/AFdKEwqAwnEkPf8b6ZAb+8lCBDHjpjzrw1m0 Yj+Jwm3cq+lACR6kuCdrhk1grcJW45p8SAHXIEI0Fc9n1eQ2vCRWGfyUgHMd87HhqI9ynB9wbSRE DC9qYlpYw9ZqNBh3kB3k2zdfdo3O6AiftLzYlGwz+I2Qt5P72bwvzhzkLLrzThTXhctGq73hnUPu z2ZgeauDNFEDFcQTxqMuSGDCTEPgyTaJ7yIlW9GbyOekpn/4wBuI3OGvqpyNoSFqRIua8ues3MBn fuASjbAVUCjg1/rO6b6ybp3L4whRHZUlPTNBG8gujHyz7Zrz7+ciVoshs1Yh/x9SNug+85Yj6aPh VQJKbh1VcPCimNUmw7yxz1qz7u2ZrzTXC8EdVRfdfDXltXE/mZpFAXLFdXdKzo28ycZ+ND4TFODF BJIW9LW6xP85P22bne From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Feb 2023 23:52:21 +0800 X-OQ-MSGID: <20230224155222.194400-8-quinkblack@foxmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230224155222.194400-1-quinkblack@foxmail.com> References: <8bf59545-b8a1-bd88-f83c-ba0db7ee6f04@gmail.com> <20230224155222.194400-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 8/9] avcodec/dynamic_hdr_vivid: reindent after the previous commit 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: SziUZ/SDL6rE From: Zhao Zhili Signed-off-by: Zhao Zhili --- libavcodec/dynamic_hdr_vivid.c | 60 +++++++++++++++++----------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/libavcodec/dynamic_hdr_vivid.c b/libavcodec/dynamic_hdr_vivid.c index 7cb13cbf32..a9b6910798 100644 --- a/libavcodec/dynamic_hdr_vivid.c +++ b/libavcodec/dynamic_hdr_vivid.c @@ -92,42 +92,42 @@ int ff_parse_itu_t_t35_to_dynamic_hdr_vivid(AVDynamicHDRVivid *s, const uint8_t tm_params->base_param_Delta_enable_mode = get_bits(gb, 3); tm_params->base_param_Delta = (AVRational){get_bits(gb, 7), base_param_Delta_den}; } - if (get_bits_left(gb) < 1) + if (get_bits_left(gb) < 1) + return AVERROR_INVALIDDATA; + tm_params->three_Spline_enable_flag = get_bits(gb, 1); + if (tm_params->three_Spline_enable_flag) { + AVHDRVivid3SplineParams *three_spline; + + if (get_bits_left(gb) < 1 + tm_params->three_Spline_num * (2 + 12 + 28 + 1)) + return AVERROR_INVALIDDATA; + tm_params->three_Spline_num = get_bits(gb, 1) + 1; + if (tm_params->three_Spline_num > FF_ARRAY_ELEMS(tm_params->three_spline)) return AVERROR_INVALIDDATA; - tm_params->three_Spline_enable_flag = get_bits(gb, 1); - if (tm_params->three_Spline_enable_flag) { - AVHDRVivid3SplineParams *three_spline; - - if (get_bits_left(gb) < 1 + tm_params->three_Spline_num * (2 + 12 + 28 + 1)) - return AVERROR_INVALIDDATA; - tm_params->three_Spline_num = get_bits(gb, 1) + 1; - if (tm_params->three_Spline_num > FF_ARRAY_ELEMS(tm_params->three_spline)) - return AVERROR_INVALIDDATA; - for (int j = 0; j < tm_params->three_Spline_num; j++) { - three_spline = &tm_params->three_spline[j]; - three_spline->th_mode = get_bits(gb, 2); - if (three_spline->th_mode == 0 || three_spline->th_mode == 2) { - if (get_bits_left(gb) < 8) - return AVERROR_INVALIDDATA; - three_spline->th_enable_mb = (AVRational){get_bits(gb, 8), 255}; - } - three_spline->th_enable = (AVRational){get_bits(gb, 12), 4095}; - three_spline->th_delta1 = (AVRational){get_bits(gb, 10), 1023}; - three_spline->th_delta2 = (AVRational){get_bits(gb, 10), 1023}; - three_spline->enable_strength = (AVRational){get_bits(gb, 8), 255}; + for (int j = 0; j < tm_params->three_Spline_num; j++) { + three_spline = &tm_params->three_spline[j]; + three_spline->th_mode = get_bits(gb, 2); + if (three_spline->th_mode == 0 || three_spline->th_mode == 2) { + if (get_bits_left(gb) < 8) + return AVERROR_INVALIDDATA; + three_spline->th_enable_mb = (AVRational){get_bits(gb, 8), 255}; } + three_spline->th_enable = (AVRational){get_bits(gb, 12), 4095}; + three_spline->th_delta1 = (AVRational){get_bits(gb, 10), 1023}; + three_spline->th_delta2 = (AVRational){get_bits(gb, 10), 1023}; + three_spline->enable_strength = (AVRational){get_bits(gb, 8), 255}; + } #if FF_API_HDR_VIVID_THREE_SPLINE - three_spline = &tm_params->three_spline[0]; + three_spline = &tm_params->three_spline[0]; FF_DISABLE_DEPRECATION_WARNINGS - tm_params->three_Spline_TH_mode = three_spline->th_mode; - tm_params->three_Spline_TH_enable_MB = three_spline->th_enable_mb; - tm_params->three_Spline_TH_enable = three_spline->th_enable; - tm_params->three_Spline_TH_Delta1 = three_spline->th_delta1; - tm_params->three_Spline_TH_Delta2 = three_spline->th_delta2; - tm_params->three_Spline_enable_Strength = three_spline->enable_strength; + tm_params->three_Spline_TH_mode = three_spline->th_mode; + tm_params->three_Spline_TH_enable_MB = three_spline->th_enable_mb; + tm_params->three_Spline_TH_enable = three_spline->th_enable; + tm_params->three_Spline_TH_Delta1 = three_spline->th_delta1; + tm_params->three_Spline_TH_Delta2 = three_spline->th_delta2; + tm_params->three_Spline_enable_Strength = three_spline->enable_strength; FF_ENABLE_DEPRECATION_WARNINGS #endif - } + } } } From patchwork Fri Feb 24 15:52:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 40503 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1367567pzk; Fri, 24 Feb 2023 07:53:49 -0800 (PST) X-Google-Smtp-Source: AK7set9B2764BOvo8V4SR6W2i0dM7g1BVcIi+b0CkB6lFPEqkHpL0VDaE8/XLbANuCbByAnYev3u X-Received: by 2002:a17:906:d99:b0:8b2:2141:6de8 with SMTP id m25-20020a1709060d9900b008b221416de8mr25302336eji.73.1677254028902; Fri, 24 Feb 2023 07:53:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677254028; cv=none; d=google.com; s=arc-20160816; b=tqEBzhHiLdQFXpHRMaJOSa7FHdxL8I5tk1i1aQylRb1yjYlztor68h9D+OYmNXemoL xgr21I9Y+Vhpwe98Eu4JAcJaBwxu7DeqRMGIGwZvvKL29AolhhiYQgOelNyCRJjWUCt7 gkC18Q3ikp1kGqzr7JnnBo47xexMfZ7LJyBQm1TOm2IP2s87YvRP9a1DUQWdYhGHLFdn LGJtt7xmH4hfSwFbVEQW0+xlhBlsEzfZ+mxdcSrXy5QXiSPP/z0lA/4bSfFv6Zv4aiVc RXIOoc8cYSB1LwHi04FtysYdBjdGu1qrBPTuzaF52dnzAbXHqa1StBfZkAssybuNcsJQ ksNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=MdnimfrgezbUR9EOEEgQssjbaD1S4nrivPF5K3HszZc=; b=y+0pn0BHQ2vWE3E7VSRZJ6MHreTbyAvxqp8bMM4py8eW5MyCtRoxckzCtwu2MDYRZD 0LWt5J36c9TiFpK9YR+MKSwFhDOj/9Rj22vs/A+7FaUAy9Zu3MFR70Pdnnl/lelLnDGj F7qN1TDy7RE5FXn2KnjvyFtLSJEq2tEAuMnM8X6QXCTMmsftq05THGawQ1dUQG4BDSl6 9e0+8EFG9xeGdSLFX46/229I/HU4a+aejzyQZIxdG8Etxy7H2MxN5CLTYC24HEZzgZd5 VcbSw43jZFNWYe5x7RzzBKW1HXMDWH7Hr8S9Uz6nnSCia2m89TgYOGClBrqR5MSv9BrX oANw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=LDIlsOWa; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p23-20020a170907911700b008b17b53c86esi23434751ejq.362.2023.02.24.07.53.48; Fri, 24 Feb 2023 07:53:48 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=LDIlsOWa; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4334668C183; Fri, 24 Feb 2023 17:52:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-252.mail.qq.com (out162-62-57-252.mail.qq.com [162.62.57.252]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C9B6F68C159 for ; Fri, 24 Feb 2023 17:52:33 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1677253951; bh=QGuGOaTa+NIp4RKRrXoWk+sUv1c1fJBJYKqgljFbbDA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=LDIlsOWaxZaGgbhnU0iAn5Q+QsJ8au2CNA65hM0hIzDeUBQmzz2jGVpp+HJeP9qpX 9YXLzMFoPhfHPLj+Ll9+59zN16H/9TFuFvAHnNZTtAd3rALih7eSkRKCfkQCwnV5rb 1KCJFNMJPgxzfWoQtcYE/KUr2s6n7fMJemvzU3RE= Received: from localhost.localdomain ([113.118.101.228]) by newxmesmtplogicsvrszc2-1.qq.com (NewEsmtp) with SMTP id D19BEA50; Fri, 24 Feb 2023 23:52:25 +0800 X-QQ-mid: xmsmtpt1677253950tuj810r2n Message-ID: X-QQ-XMAILINFO: M0msBj/q2J/mW1M+2s19mDBleaDoUFhpL53okgLGa9Ibo1icYWhcKu+WKmZxvq P3gnTjjY6PlhRLzj8uiPiqO+bD/E01jeikMkQ9VOLRzrNnY86DXurcMQtTmCeCRF3tw6K1GTH2u+ 7KN+cKxzjsY+1/kub/yeLC+83ikHvt5wnW4/SNu3UdenSHO1C2cff6XV08/81MgBHwqlw6FluvN3 KAQyP4ai2sK3EN4dUiIQlgWCp5tv67edqXHHgCyYufcNEvCbIFkXdXovvQVVanpgIch+YxxykiKt C4Xi1LVNYTpQyJhdIZpL53lzZ1pH22YSAt7QNtoUhZRnp9UHssS+wJDUsTZkMp0w2ulwZ28jfBjQ 9y40YFIFvN4QnHXiUnqlnf7GKqb5YBghEbu+VLOLF7Shuo2eqUKWLJYjWR5Omob8ZJ3WTt9XrrVN Uj+e3vnpg99dD06MJ01pHgxMS55usN/6r0UgCoHG5O/jEwte0+iU6hVrHbll1PZUO0M1vY1ayAM0 IFm7OcuaMoPHNZjUDVMAFGDS/ANLIXOlRZ6mJzxWO+EwggDbg3m1Qvjx/73C/DrEaVnX8qWdpYhR 8zu1IgTj277izAsSJzKBD3IEFH3Dy9YMxP7o2/mYCQ7QpENMotzSlvAYyrxd4t1yTwEaOHesin6C WoC+k62L7s2MtEooFh4YAJOHjAazzXRApZ+fvibIkg624s+AFk7yGrVzhcgUne2BHFcyXc8jn2hD en3au5RGjep9uFRUM04os5S0xMFzUlZBUsL6HaSUgPIAEkvlUiqxmatymqX+LchFT0bpA7rO8zsz YgRC7iC4yBfjkd/kIa7mzw2Cw6cxHzSTCc81qDGMjoK1VRgCaDiJ2cXsJh9NUuX+1cm2jsjVduhO lzKhbPJ0Q2QYHeFy05/RmoJWCRiYnsNe+osOiASrFoc5u09c4FDcpIkDyvZuk1ESEye0W/7OXwLe r0S9y2bb/J6UauF2zUzLMm+SvWcAfO3Dra1j+Yb31gFIFgMtockqPq8lUcbTbM2FEdFwrB3Inm6f mWEjGsGQ== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Feb 2023 23:52:22 +0800 X-OQ-MSGID: <20230224155222.194400-9-quinkblack@foxmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230224155222.194400-1-quinkblack@foxmail.com> References: <8bf59545-b8a1-bd88-f83c-ba0db7ee6f04@gmail.com> <20230224155222.194400-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 9/9] fftools/ffprobe: fix print_dynamic_hdr_vivid 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 4C+7HmOLInKw From: Zhao Zhili Don't print tone_mapping_param_num if tone_mapping_mode_flag is disabled. Signed-off-by: Zhao Zhili --- fftools/ffprobe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 64883321be..fa3e4db6fd 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -2221,8 +2221,8 @@ static void print_dynamic_hdr_vivid(WriterContext *w, const AVDynamicHDRVivid *m const AVHDRVividColorTransformParams *params = &metadata->params[n]; print_int("tone_mapping_mode_flag", params->tone_mapping_mode_flag); - print_int("tone_mapping_param_num", params->tone_mapping_param_num); if (params->tone_mapping_mode_flag) { + print_int("tone_mapping_param_num", params->tone_mapping_param_num); for (int i = 0; i < params->tone_mapping_param_num; i++) { const AVHDRVividColorToneMappingParams *tm_params = ¶ms->tm_params[i];