From patchwork Fri Feb 24 21:08:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 40495 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1232550pzk; Fri, 24 Feb 2023 05:09:28 -0800 (PST) X-Google-Smtp-Source: AK7set9h6BxkVV+EgNfwRJSEHS4PrIyE7DKn+AlbdNAIxdLdNcIlagdzWmND8IKSR0jSOc+5rgS/ X-Received: by 2002:a17:906:9f19:b0:879:ec1a:4ac with SMTP id fy25-20020a1709069f1900b00879ec1a04acmr30620132ejc.76.1677244168528; Fri, 24 Feb 2023 05:09:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677244168; cv=none; d=google.com; s=arc-20160816; b=bZn8QrFwwPjhYhuO2voScASS7RL3o4oCoeUO0mOHZENNTdYflUqCzQDeDBg4f9WqdS 3byX0hOi2f6XUcTdPiSbFYDtQER6QE4bWNHENqhRGZKSmjwheNEWd7LyYFa+VsdDC4Do OdkhjcAKLD9w/0KD0/BPC6456dHc4FDC52jPDsdz1aEdNuk9Ur1Rpg3mE3U0BY04uMfB WwHMbosh2df0wlYEIzMJ0Om7QbotNurNtIXDS7L+w8qjYI0N87hO/vOEmQXV+L7ZWvRu O8BjWbphZWuiRaU4T/jFcv/Q+wV1M/Wpp2LYBP+9nQKtTeBkd63tnwjjGFQ93Fjx7Czv 9SHw== 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:date:to:from:message-id :dkim-signature:delivered-to; bh=RaGXapeAa8hqo/tyPXAqrXKCi25+Ado8Ud98Tad6+6s=; b=AQ56xOndi0xxvv312EPlmE2A/4YBTEcjfjuqE5oj+tlQR6U1O2rv4fMWllHDF5ZTKB lW5i1uO5gH7c8ePf4VStmmVmwTjvvNz/iKZ3nzKjXaUVBU5iuc/vbMtdb62MWJvpzO6I lSWOWSFIAThrjfe3l+rgccKbGJiTPtO6cQWkWnbP63gl3SL+extxpGj0CCD42x2z29gO qbwIXp1PeXsKryz2KwsESKo6hvvzV5AsU86AVOzTQJ1Oc7w8qhAAmodx82nhW0pDhxcn f3UTNhIgvEnsA4l7XcALJ/bDt5bpsO1jIJqw4UMWpQMxecXdqPKEhyYqhuL74QZAreWU Zc4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=jwr+uY8B; 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 mq21-20020a170907831500b008d873aa0211si14935502ejc.275.2023.02.24.05.09.28; Fri, 24 Feb 2023 05:09:28 -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=jwr+uY8B; 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 4163968C13A; Fri, 24 Feb 2023 15:09:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 2whUeHFVGO/D 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 21:08:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 40500 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1233508pzk; Fri, 24 Feb 2023 05:10:27 -0800 (PST) X-Google-Smtp-Source: AK7set/9fMlNLaCn7mn7k0eQwu2Z+pRU9OigBOU/T2RfoLoHR7ZqDQZCJiTz34aG6RBm2O8oPZ77 X-Received: by 2002:a17:907:3f0d:b0:8ae:6b88:e52d with SMTP id hq13-20020a1709073f0d00b008ae6b88e52dmr23588410ejc.7.1677244227731; Fri, 24 Feb 2023 05:10:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677244227; cv=none; d=google.com; s=arc-20160816; b=A41ipxq1mum57BXM5vQPZ2A0ZhY1wlUMeOStGag+0mlD3cK4iubl/oIS6kRI7zu2XN 06jhlzFqjO7KngGZGnF6Pn8k2/zfoHSIfEkR9AdNF1JvXs3fWpPM+rR/uyZyq0E6cemw Gq/dmJE0/JBChNky8tqCHwZj6TVyZw1/E8sVT/ol3Iii1w+jLyvigYdUgX+Bsp9zSsem GzbeGiicay1U9MaAtiQU2OBQ3ggMNQsYZ0rGdDg00+pYCcWs9V0kzJ9ja8K1UzxiLOmv 3eKjgzn7Hfq5vn19VzEHQAoMvYlLWwDBq3mHUF/4c6NMQm97zp0oxWRkKFs9DnmIL4/4 QcmQ== 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=BVabfXVcMaPmOU0SwFCZfXcMrm8oDVkmP+1IigRqpHg=; b=GLF5NaKpJJ8xgXTluKpEE5uhYTgaq4KNtGDKBs3eIMOVowsC1/Vs4a+qeFuYguH1PK ZQnvmEFsGvS2PynrhzGB8BbQF7fYNboFrqJN6X21xXIFJOJaJxLmaijeHRQZ6XhSmnU/ 479JRktjYSRocIMbxp5CHnI79KsI5Z4BSALUeW69ainjyEB1dV4EbqwywGZ/z7RIBGyA ytKvZ2gKvBNXd6EGQfDNbtH1pWuP163WHUEGrljwQdob+dh+bYExFVV4ZRL2nF4+fRnZ lZ5hkJGPXpO0GnMxKvK9D4w4gweBqHZEwGaqToquUS8xKZn5JmzBtbKxoK/dkkY1tmfD uvdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=J54OoHSB; 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 w15-20020a056402128f00b004acce6608c7si6434828edv.451.2023.02.24.05.10.27; Fri, 24 Feb 2023 05:10:27 -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=J54OoHSB; 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 17AE868C16C; Fri, 24 Feb 2023 15:10:05 +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 B9AC368C159 for ; Fri, 24 Feb 2023 15:10:03 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1677244201; bh=4AjkpTVaSYX4t+RedhCZLcOpDWsJk+Pxa5gyKjMjzSk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=J54OoHSB8LS+bsIUO3qkG+14+SlMKnszJ2VWvISVHD1zGR5YtEwlmXxE7J6j7cCXu ogJkf1sfUWMHJI1TdNMcq3pMF53uucL64Vv8S8Ih4Y1FhMR6xQyugkXFt/v/5HsXUh OPo/yT4zr/jKvFHTooVMu2l7vhMaWbJuMJG+Kdj0= 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: xmsmtpt1677244131ti901br3i Message-ID: X-QQ-XMAILINFO: OQhZ3T0tjf0aBz0Zjjs62e+jHWXoZXLZJKeUg5o9qZ5YAYTM1Atgyarzy8LMWk rKT6xzkup8RrxqvQcR/D1/LPLUm9rn/GMwdvz5p6OmC3ivRw9j6ZOJ7BoFGm0VfviZjHsM9XdUPl EJMHabPwWpFR33cjeVFfXgECBCsqOpwt1rtE2gVnNBkPnOTb+Nch2LsSte7H8FisdrIRINYgklmB 1ySr5Aq/TyS8QNnIimpjLcD83oFTkD/xSVHjIsoGDBG+lpfHSpW6/oI4l8DTmUQzXDmcMACdpzWC oGHqXIdk6KaPuyXsoQV0V0TBJVwdDlcpiSBuq9RBa4WYXMpjkJq7oM8lnOhE9cZ/evmgTykqi/JP 2c3Fc5SzZcL50X7WSDBE2SocL2g14IzFwvpBMqQRHJDUZ2r0+nw2Dgj9pGhKO6k/bIppXbL5eLE0 dsR+hlM8iHgmWY1Zcx9H58VDybhgIiGSi0gjVA5YoolShOQ52vNT40E6MM/VK0IYj5aSHNf9eoGs WG0K4hUKDhsr7bW3hNIm0EXIZxuXelNNyZ44+lkpvZ7t5O1mDgnjJU9yQ6BFihrvS1/jEGzvtyMY wNqWOnlUYS1ga2r7BJzxPse7uq0OueKAeUsaG7XZuMU9Kgcqi8loTiin2cU/XKRGKb9brz5GaNV9 MKoLNZ1omHEfXzTRfwBLlICBA6i9D54OOpmyHLlNJwuBQLNNcXHcIwoKQcqCiNKnIia2ZcT1ltpx /a6pRirMzNrm8obdqyXGVmqTL1yivZpZWp2MfIBIXg8v+BWk0L1rUF907M3wO0PkhW0IgL0Em5v2 Dfc8nvOd/GA+AWEtDOxtXVskOghkNqsfAQk92oSfaka71yljF3kvlj3ifBrzVqmRuIgKSqZKngdK YO1eZbvTUFz9OnesDudvZtCggXgdpluHgU6fJHzpiWR/pZznfSUiggithJ7/PcdK404uqqyLZc5h LwVzcosxTmZa/Iordjlw== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 Feb 2023 05:08:41 +0800 X-OQ-MSGID: <20230224210848.535436-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230224210848.535436-1-quinkblack@foxmail.com> References: <20230224210848.535436-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: Bi06nPb4UsZM 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..35be6f5e2b 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; + AV_NOWARN_DEPRECATED( + 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; + ) +#endif } - } } } From patchwork Fri Feb 24 21:08:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 40494 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1232363pzk; Fri, 24 Feb 2023 05:09:19 -0800 (PST) X-Google-Smtp-Source: AK7set8+JuVlIEY0pb4o770Dexj4u4VpB/DcFRY67FAVyAczeROud+E7GFflZRMDzSZoL+9UiRi4 X-Received: by 2002:a17:906:a2d0:b0:8e4:96c4:8a4 with SMTP id by16-20020a170906a2d000b008e496c408a4mr10826645ejb.62.1677244158827; Fri, 24 Feb 2023 05:09:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677244158; cv=none; d=google.com; s=arc-20160816; b=GHv5ideO8YgNpFg65eC+PVaEcuJz3yPYX15EazVDrxn3+F8PSygiFBtnY0pYTCW93X hngTJX4jFTddAgoo1YQD1ymbtP0VyJaUZKsCP5cxJ++pYULQ71JvggtbVydU9OSl7wB/ LfuLL3GV2H1NrHPRlbvEOYw/bKYealwgKAg4XDQ/EnfEy2J6IXugrEPqzrvHyorxk2zk jWfOJxvHMURrhXfpXuRj8GOiRGZS7ys17mYlINt4tlb2SQzAYEEUpK7FsQ3SWlEnmJda xjFVBrEnQlvA8YfCX+MxlqL7fifSXDIMdtxNvkAIvNSYIAOprlS+X3Q00vIV7M/zpc84 burg== 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=XSa9w9hpX0d2cR4YDf7CqS5TpTQip59+0gav3MvbS7o=; b=Jr00Rwk9c/ucYr0Q1anSols9DsEkKuAol0xapEkYwnGwqB2TKsG6SQEaB0zf5HPlB8 Umc8Zkv1prosRb6Xsf1lPSf/yqIB8GwUZ2jLNf/WytnBFMS/tNRsswrJ0rhym/xhOxWY 9p1xJ6//uyeUdONpzuzRWTMtXbZ0XpNVeRwEmS/abjRd5JcLH+fCBN5RN4PYNKnOAkTa SUevsNjMy3Jh3JZ/hp/aDb9ztSIW8kDh6+Ci3Hy0EH5vBKA0D2LNS9PWy8MvOinUGpi/ j6yqEEzrx5tVpY7hZs5svYElUDyJv6rIf2rZmb0ZX9Q76ctXgPn8HRbaX/ve7Bkp9dfS /5/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=fVqGM05v; 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 uo41-20020a170907cc2900b008dc609af643si12300740ejc.401.2023.02.24.05.09.18; Fri, 24 Feb 2023 05:09:18 -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=fVqGM05v; 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 4E3A168C13E; Fri, 24 Feb 2023 15:09:04 +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 2EE1868BF1A 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=1677244132; bh=RSrEjz2nutTj5YZZXIV7Mk0M4uhr+/nJu8laV1jTF9Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fVqGM05vFcTiXPHfSg+aEJteWKgG91s6FsDz8VpX8fbBl19382Eg/6CQ3ssK4Rctf RT3wwwXQjcT8LbUwMWFWhu2vU+Hi2tnAUkF0X1/eExeQ1gUIhZ9Tf+y7lHCutKAzJS N3LACXcZhyaiNt3x6jWkUgYl1rk8D7DuckXAlKDc= 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: xmsmtpt1677244132tzyjirqmh Message-ID: X-QQ-XMAILINFO: MIAHdi1iQo+z7taA8tx3jA2ZJx3KtPrq3dYMNVBHdEvy2jdUoWPT4TsiBxNpNo gbZCBWaXkuSS6zZbrlsCdbaOnSe/PndmhjKWAD1HbKD0gcwH2iLcEFaCrsqERpqFz7iGqUI0CD61 kXxqTR3uO8Vd1/CUP3hXmsEvp/o6aU/K0S6/dTzWkX2sQOAq4/RUz7eHS1QXXlZjZvds8mQZSuWy o5sP9UVVUpUYmCNto7ItMEMNyXNxIdf2BKZ0cUZ1mR9Co27mR9ItaEk6P2F0eJ8fGvU1zIOKokXF ByPwTMNRzXBfx5hP1lYnlASZTfgZhZP51fXAQmGS/phX/JnHRoVSYa489bt0YPFl70C2kT5ObvQn zw+RZXsfiNn1J95s1HfRGiS+5W34tPYSJHb1OjL9tZRRvFpsFcqy0jewllzZsIqrbt+xhJ0Q+y9z nY9X0RCDTHCKsmMDnIXvwft849joHiSkR9OivQBzBMc4u7K7zGIA2vr07H0PWpnkFWqRX82f1nBQ 5YEGg2JwFB9ad27hYPLpqZ6DABYJhLR9jVTqEVVds/leTefdFiFIQZKu5jrd+zfNryXVc7XKe5F3 ByZVodhLGEasgu2Cg8ph+JihwUeObI3eLLFER0n26yUvWd4AsWU91kspsRSvplzTAKO3c80Js6yn xP8ZOZmcfQnLcKlmc/J91CPwlexbaJ2GLrgXqy1m1WMpe1Z+Y0ibgbAm6icEpZ4gqQqmz2WFqldx tZcDBZqTq8H8fkOl1WOqWgIIIf+doGpuDvchZPHpHCTBQOn0gWyoaOJxMsY2ntfG0zQ0Myk7Jks2 6xU21dxwBtizmcub3h/vwC+JFuGsgl2G+VwAHl7Jyy/q8f2QelDlcHs3bCh0AtTThsvfJRPhnU9X +vhme4Zx0HuG8YriWhul7fVyhUI3XQm0+gcs31raTSSk1NyvBuYIyJxRVxfln9qC1W0ID58SunGU CEwlQ7YMralpm7uQzpxg== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 Feb 2023 05:08:42 +0800 X-OQ-MSGID: <20230224210848.535436-3-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230224210848.535436-1-quinkblack@foxmail.com> References: <20230224210848.535436-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: AhLEG0G9WqwO From: 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..74d57e75e7 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 21:08:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 40493 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1232148pzk; Fri, 24 Feb 2023 05:09:08 -0800 (PST) X-Google-Smtp-Source: AK7set+8vhw1ucHhNxSrpiz5sEWj4mlm4ujCNsJs+DpSzT/YzNC+Pj+wJbJIGyeMIs0hvigL2M6j X-Received: by 2002:a17:907:8a0a:b0:8b1:3158:2bd3 with SMTP id sc10-20020a1709078a0a00b008b131582bd3mr22378832ejc.32.1677244148428; Fri, 24 Feb 2023 05:09:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677244148; cv=none; d=google.com; s=arc-20160816; b=SnTxWgtcM69sPUQC4Arb9kiTB5Fd1PfvURBR3JcsYB54agOaUNeoCVNRtcAWZmVC6E BjC2NZC/TkgK/851MfDRDT/VSEu737eUfahufKVPZaTxTSBAJlnnJV+H4l9zqg1sHGvX jTHV1YLZbcYjVu+P5FXn5br/uQ1M+04KI7OI5cLRmzofkAa7DPUE9ghyHimoBs0gdtNa PgFuREXvkASqRDCP9EkiEzudGlxpylG4c0jCbe24k+gpvFGgIZa8aMiPCMdegh5r7P5Y o+fMxNGPHHc5MzzLOFV/97CtkXDoSIMZv6OURftJVeUtSWTNlxU81GLmmt6l+km+sF0X UiJQ== 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=a55FCqoIU4+6Jag84FLNyl/SYhyL1U7omsPZgE4DozY=; b=B9dVNehT9JIfrCrjzT5s1p3q5HuphttovNnr0DyRYTNRXB6xsYyoNFrhIg8gt/93Cn Bh4ofnmT5aJ7cGl/P7IOIbmyrgb8UywZMwhjabcvvvAlbSA1haio4yU3zLdEuHRwiH53 awyTcFCp9yaalujYX7LaRtr55jcDE6j3KNQi+Nuy+LgfYgw7Xn9/CnqpEG3UZ+1dYpNv kyPew63g29Kim4Y5ZkwCpdjlLqWj+AJHQM1/JbpH1LRHXSTBQD/mzoK8YTRXdydi9kTf /bHWNvulV/FeOL0FdQHhASXxvBRYBFgtl/LvvTjiy5/ZlOBP2zVSwADRkFB8C7vkFQKN qzhg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=zhCtHYN4; 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 n17-20020a17090673d100b008b2972b5cf7si27444542ejl.257.2023.02.24.05.09.07; Fri, 24 Feb 2023 05:09:08 -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=zhCtHYN4; 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 7512A68C136; Fri, 24 Feb 2023 15:09:03 +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 30E6D68C113 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=1677244133; bh=pl0SIUTh5TjqTOuMSsZeeCQBRLoqsVsE2TKxyMJrxVw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=zhCtHYN4tMkZb/y6kE9s35NPMELnmvFj5AxIyTs2BeFMzMzGx+uCfsV5LXPtVmrn0 nTBa15fRGakw0az7MWadmy+DhVuwDWjwy7B6WN5VIXssFduK0xc7C4ESSwUksHad6Y qL7TbCkyMXTWxyAlzwfodtZvJEFnb9NVD3tUxi0o= 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: xmsmtpt1677244132t0162l02e Message-ID: X-QQ-XMAILINFO: MDW54n2qYPazLKZR/FEB20B33ITrpfbLm/xSotzV2B7uS8BvbV+Yn61cc7/bQs tyxGqVlJ9rXcOhUnVAIRmwIzSniF7Dqm8Y89lui/yeUR6tiCabUOLf5JnQKn3p6r1TnEOOXmn1Ts eTp1AzPeRnNA+0s7jRt7pFdWppWsDAsszMFv1iaj4SSNBM0AewVx13U+NTH2TmwJsAKcS2Av9b9F jV4Ga7T6MqHrGIPQKDu+FBAopjJlA0OFHQ/D/EROVYReWQKJzg/jVrqJvYVEgXOcTY28RULfmy2M XUsVpSX2/yA2g+UtLNd89x72R3RS9kqyoxuwmYTyjlnBsKu1TtSzgfm+/zNwGC3jcfZQ5K5A6ASZ x9YhLnD/SdYhz7NvtaJgFSQDUAwWQZWJD486Lsc6Ga/XI6MaFpZcNxmDoqCD2bUO9noVXMLkCIZO +jz923PU5b7Wh+pMBW9Iqcz35ubLjoVUn95KKtVfoDhpe3qsYzBoThYMNA+8ay/ZjAH7nl76Xt4l brryTpgX5oBC3mVYrr8COQZ4mJRUXGvaoTL4JaPq76+/JQHT9B4pk9iBLPMAh8VI1J3mh85CecgX VE6KNiH+29a+I0tYOBYd4EZTz/0e+Z4Tq3jBgTh0z65EKPCetbYlOw6XkqtyHTcLvJv0CWvbB2pY hIuRlwAvVT9NaQ9ITu/FFfmvuZlEfxtH/HRLvHxGNBgxFJy6G35mgEutz6waFi8Bz3u1GPbBzQc2 GPzBRj7AmvUbfK7YlcoxxtdCPyaT93kRJm+qXdI5otI0Q2nQvjoMnvTMYPq8jK9XDOnaxzY19WQb VyUP1WGCmfJoidbPaWxeY1uNUzb91eY2H6EVVROsv6p77iAr3c/eVjKG8yA6S+uYxRsVJaYYEl2e aCKD7OKTGSmARObyOQi4sOXiOorU+MtHO/AfqwRecE+nP+nh98PU4hr+W8WO+Yvdx4n2w15FVxgC a3LlpbdTUSrisMfyLXtA== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 Feb 2023 05:08:43 +0800 X-OQ-MSGID: <20230224210848.535436-4-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230224210848.535436-1-quinkblack@foxmail.com> References: <20230224210848.535436-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: HIK8ny75r+lh From: 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..1d051a5545 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 21:08:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 40496 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1232761pzk; Fri, 24 Feb 2023 05:09:38 -0800 (PST) X-Google-Smtp-Source: AK7set+BXI4y6YnB9rA/zqib0pD8c7Ds6PeI2upZtRkXW7tSM73WTTt0lERcpu3qDK8nt5m88Apd X-Received: by 2002:a17:906:f14b:b0:8b2:7150:dcff with SMTP id gw11-20020a170906f14b00b008b27150dcffmr24103611ejb.23.1677244178627; Fri, 24 Feb 2023 05:09:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677244178; cv=none; d=google.com; s=arc-20160816; b=ww28CwfaHYTChNxVIEIuWJrh6awx2GFMgWaz9nmjI0Zs+1JZGznlrCXZeCwrZ7ZSDn 6KPEgrftay5Bso18sEsBFHX0VeY71Dgvx2WsJgVQ0UJm3LqdwO0iWgwUpwKLg/NCix41 TYIbqtMT6wG0No0MM25D3sbFU3M3fRlITENrDvENbgh2lLWGvRFIaKvQKv9SSo9c5xgH p9/aohZ35SV2RMFmbtQ8kzH4scaukBmX3Oao2e4zaZe/z9Pr+KbAIDfDKVLIxVkLCtP4 q4RU4LzKvySZI8t6GvvaWhPEZ3Si0tmjbRjuQuFHt4y9vlC7qFBYu9At2UA5QF5RyGKg ppYQ== 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=lN9MG0FdjcYxNB8sc/pRzEBHT2k/A/mVMblOjZSuIP0=; b=B5TDnODnUOAnr8dKRoLBrM01mr/VMoXw3UDf3Rjq8mxpkrvqZWRBLn7Urtl9U+IzKX XO7agkFE9/gadV920RrASlVqxAPbAWF3PyXSE/bWhj0m74FkBFi15QxPbETnSQyaR+wV QiH4bQOkFu9Ssr9Kvbf9Ezoy1ptNw+dzAvbP+c3D0VvBcR+efjriPE5onGiftrVj6Fz+ CTOFBGyB5UFx1FNFGvRsHsM0NegdWd8ckgIvNuxmo2ws9a4GwzBBROqPlIQRd7ON/Re2 GIV1+7Er4KT/wVfmrXkHoiT1ExUSSGkD6yTyvSro16bhI2W4PgVVkdQsKQk5FY1piWsd JWMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=lWB0VdYg; 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 fp2-20020a1709069e0200b008b2756c623dsi24141871ejc.175.2023.02.24.05.09.38; Fri, 24 Feb 2023 05:09:38 -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=lWB0VdYg; 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 39D2C68C120; Fri, 24 Feb 2023 15:09:06 +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 AAD7E68C128 for ; Fri, 24 Feb 2023 15:08:56 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1677244133; bh=7pxF2PaSn6uXJAhok7m0lVHUDz8hT9WT7jzgkYpVSsE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=lWB0VdYgr2oLUCEaa2Gm0fev8rJz7RriXtuNv4Z397fMn4u4ogfE3vCz9Kp/cSuon oG19LXrct3kgZUMiChyrf/tI8fglrsv5/e19gzC9KQv08aeoHRRXAoRrcuGNID7Iyp BOAFBXFWdaRHxK1cJQsQBPpWfMyPgXsmojRF1FgI= 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: xmsmtpt1677244133tmpwagy4g Message-ID: X-QQ-XMAILINFO: N4KH/PyO63QvmhweFlYbGSopO6x336uaGZp7oYAHY31OYRQ5jirC4zkExoM2Dc ILFX0WHYi+Is9DeDDgf7O7SCcDdPGRtHE1m7aAfODJYar3qAqUTlZSwOZyjrrix5cOsYLCg5urDS Wb1KHXRAT/DAojbNyQZTe8xq9FhXvRCeSbFf2F9wcEc+gMSMoHkxDJWkiwUW2H3thLwAbjZ876P7 lO7wJ0gPHwifiZv7ftHaRNC+bzmcLwIA+FXYn9uO+vb7/Kcv/7li36GWIBR5FGW3RLn2oFWRSs85 Au/PY8JBjWDm7hy32Qy2Hf493viu54t2ewsI9aSohwj4IasHdDeulCz9vith/MNL71k3I+Evis3v qE6Ca9jNAUvNLJQV7YVH1aGzwr/Vmr3kOePtLnlcuWQ0UM5f0nBQ5+qXsZJ2XnXxrWmwasHmuqmj Vb9RwfWhIzLXWVPN0tn6Rw0022tQ+Wvt5UrQHR09S9MJS2myAJehpvJqtcoLa+homWywG/HS+KQ4 J/AW8NftGinqFFEegzl89GN2VPaVMo1QnuM079i3e7MyH6Bq9bVX5Utz+DXjIp7lH5wIiY/2ZVTu gB8LoEvbj1LH7DAHNlDXfsTjnf0igySqbohksomi2AOmPntSH+Ly1gFkzzrhu2WqtU9Inyi+xjmX fE5UHrMFtdwmPefzP/bU90w4rFovolZgycIL1sJ7PQDx3CTPZ7/obcXuhJNMUsn245YBDg0FN2OL veeYFBpP/B+7pfnBKE3wjSAdFKWo7T7iL7E1HTcNQL8uGy25reF8/9myaELAoG5qFydQ5c8685zb SIuA5OwXVskPjBm5hhH2ABr7dBuyhv1xuPllqem0SbnR0jqpG6CYhPti/++kB9cNKUH7errYaWLZ 5UIa+Ytcama7OaPmEeR/vP14VAIWEJuNrGDyIEEhKyj3M0We2GpvVGQL05jYNRd0LWLV166qYqn+ u4D8qdudiFPLFPlTSDSpFB7lIgwoB+wPINuXyEkMzrS5i5slBTq+CsblbYyxyl From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 Feb 2023 05:08:44 +0800 X-OQ-MSGID: <20230224210848.535436-5-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230224210848.535436-1-quinkblack@foxmail.com> References: <20230224210848.535436-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: V4h7SHwLmidn 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 35be6f5e2b..091963146e 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 21:08:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 40497 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1232959pzk; Fri, 24 Feb 2023 05:09:49 -0800 (PST) X-Google-Smtp-Source: AK7set87qA0XsMv+lIQFNnwIW1tK3ivckPUmeNOkl72bXi1VzImEo3NhCecCQ+q/LLZnAWrhTt0o X-Received: by 2002:a50:fc0c:0:b0:4aa:ca81:a528 with SMTP id i12-20020a50fc0c000000b004aaca81a528mr14801757edr.40.1677244188766; Fri, 24 Feb 2023 05:09:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677244188; cv=none; d=google.com; s=arc-20160816; b=vPSVGcCVkMOWdbA7LJ2StSdyRcis77VCKlMSjhsAZ/Uyzic9y3My+yeCn20dIQX1Gm 5qWJ2V4FyQKChIsV7rF9v3SSCva1aO0YEgL7o32895BYvlFoV5C8do+1CO1Z5o4SonGa 4bMClXGZst/54Tfyw2nA5EoFagW34HZeEcmm3yHy8mX3oBuBDfsakSFrCXxGdQrmg1jf AZiAiIqOd/fwv+LxiJHZPm9+sSvoInqsRlsWwEIKJPrxjAA45QLe1bmiYDe/OVSBmb96 /eNWabaYTzJJtNnaUEo4If0IhNRevwYq++ssAsTFv9GyXfnAkfrb9F60mlFh6cSke+Ta bn2Q== 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=7kuviekoR54S8CE8L4NS7LUJmzqXOzhbwT453i4Ypnw=; b=id6RCEkqNPsDKvB8mb9bLiREPrdXe7CWtS8Zq+MpJJSeZVKou4GkREsrQesAoo0Hfk qtwgEAKvQA+/OMGF7XJxoCXAYUCH0IP2vnIPLMfALvFekh8cxJEZDgSh8Ki2bD+KMVO6 cV4O3nmFhCfmxZnoL5xOgGnTO6XnlZXi7NpIl3P7Q2O1MIn9wzhSkiR2Pm+ehDtDuTKl V/7qOyL20yWLdqbZAyE+TEIylaU3ysQRhmkjLcTFLUJLfI4GWcW6wvy0qPANKjCxs4+y 3nFRpyO37LAddDM9gH7hleduND6iFOtelp01wHkb47Owtda1CnGDgxLEHbMW3ricWVPH yJtA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=vnMH6ZEf; 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 v23-20020a17090610d700b008c5cdeef470si22098514ejv.560.2023.02.24.05.09.48; Fri, 24 Feb 2023 05:09: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=vnMH6ZEf; 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 1B1A068C14D; Fri, 24 Feb 2023 15:09:07 +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 5ABDB68C113 for ; Fri, 24 Feb 2023 15:08:57 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1677244134; bh=gAacCElGWnCXRC9XV5I53oH7HVVuXD4PW7l/ErDkLok=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=vnMH6ZEfWNh4B2POYm9iRjw9jm2UYfmsK5Ji+UXLemn+1tbL/+/gZuRW+Gm7R2a23 cW+0w0tvxHGyoJgiuCupCHfTqbjykgolGS+HRlF85V8RzKoIL162mhiIsthGZh4G5I MD7Fzj9yAddhj/BeU0sFEA7ZDpXlEHNQi5z5c/z8= 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: xmsmtpt1677244133te89onm9k Message-ID: X-QQ-XMAILINFO: MLoWTg4HHssGDKQUklv0puY7MsgBFvs/fC5pWXqyFPbiMXwBk2s0s+N5pffXiI zLvV0QQTAfT9xUgm1g7iV8OlD/F10beskfqHK0NM5Itze8jq1goRAGSeVoH2V7N1l+TzgG282kwQ 7n+OVO5woAebi6Ub47qZwikEn2nxygNe+XuPCdSZs9rldaHT5xds7uGKdJiwwVH+N9VSmhz295AM I7K4WGGYX+dPl1wO/saaUFRkZACleJNhrGZVoVaIXac/9ihk+N+sv8acJNYAbU59I//Vj0cC2Gbe xqM5wAoO72OmAWqWiR+0q92ZfMLr8PiEchJa1YZF0SVZIVbhJWNhnRA0vSKj5F8J99MswXjIw6+F Fij25QhyhjWCWXnYESyv7KOoC/agPrb+nGm9f1G0CWhP10fpWrL0WJavfLR0nRd+aN6p9gWdNNxf +Ce2b2q1osoEJRwuWP0gK95b6bNMV3tA3kzSZLVxtAVp6YuiGbiA7Bag4Q1UUAheWyTKMuwMhtwP UD5qs1vnCnYQD0NkKUcMEFlaL9pfcFDXCa/JjJ+arL1gm2w6rHNIP3S4SFxQ1TEVGbIYEgeNXDSi O1Es6HWYZ8mOnVIKT8S2YDS2UuadlPwoNDc5Nn6mqJKJO9UIyWNozekBTGR5ArgsfjwDLL779H4J hSqngvTdB/Qloku7LFcxVwea0BaA/ucFh/qNrNPlz59N2jsYyuZA2pIdDnJ83f45DMJXzJdyjy0j 2YH3h4qRRgmBjFQlVwqidf5iuEz4uJ+ruxp24AR0IzUe73UNzO6kRnJIn9rG+tAu4RfEMw5Nfavh +fuA9Q04NQ1x1f3Q5GDT/NN1FrGIOQKK0lnuzr9XdTlm0JB8v5dRtK+jbe+1hoALY+GrqT2se3iH 8ke4g/ovcH6NlsELwxP0qtCFOlNVkSRTZv3PSjVocVvsiIoC48/sZMjYz8nBBDkVFiBolEWFY3rx o7Jw2A/9kXFvm2Xe15+YW/EYu4R2QjZiVoFkBeIYIL3OfIFxiP4w== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 Feb 2023 05:08:45 +0800 X-OQ-MSGID: <20230224210848.535436-6-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230224210848.535436-1-quinkblack@foxmail.com> References: <20230224210848.535436-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: rMGJNsP0+WTJ 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 091963146e..f0580c498a 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 21:08:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 40499 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1233254pzk; Fri, 24 Feb 2023 05:10:08 -0800 (PST) X-Google-Smtp-Source: AK7set99u0Jenxd8PbKIF6hpsKS2NYqoiJM9c21qI4eRd53dHaAZdzyCi9516gb02f+aFdQXBfba X-Received: by 2002:a17:906:304e:b0:8aa:be1a:c4bf with SMTP id d14-20020a170906304e00b008aabe1ac4bfmr21206132ejd.16.1677244208689; Fri, 24 Feb 2023 05:10:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677244208; cv=none; d=google.com; s=arc-20160816; b=FltatDCQ9igzWFnTL1QrHZnmHPDxqrPWwUpqbUQxm6sXyH4uJsHGNDAVq6ra+zBhwy CyxJmAu25/AuL2jsKlzlY6LsApCmwihDjH9ft4zNiM6vMA1RuEGg43H8XzmjrpJujhKu U8iuzzF7O2TBixw3BVM7mSgPq4JO2AmqeA+ghSM1bcFOH2fZif0VaPlNYwRXK2xGmuSc lIj2F0STrvf/HH1lAZXYbNO8iHQywBDAGvYJp5XvPpnKnXCGUNHIEN84XD3XcVT3b/ja WdF1FC7KLpWZDhLM8OfUYQ5RcX9ofgAWKnfgrNFpubdwAylCyjZMmjVxmxSLZ4s9KZ52 4MHQ== 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=xq+14r3cpT67VqOv12u/epJBQ3m6mfOaDRJPa5RWIjk=; b=Q9p/wBcgnMTMiAGD3TwMIBaQS78Hp0/ADA+T3I1TGOeXNF0Wtm9cjzMCfYuuXABamW 7VkaUwCcqgSdvi0n75UIFXJDSfo12cmKhUIlSWKHUleZqXXpu5UBghipiCsRV95IWUrw TQsQsxqJqZ8qLHqx25ACOKo2z8V2RZZWMKTPOI8aOAtZy3sqVnxg8RAUzOGVioAHwVj8 gWSOdWPKwlq3S70XXcp5DwJ8G2OdYq1NMoEs305R4Opi6WfSFpt8VP/sEBt24brDGW3N W+8ZaMblV9AROrLYVtmiakJR4NUz3zRzfURculgj6O9EAl7Fk/MzeCU/jkrdemjE/9PJ Cygw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b="q/V4EJuG"; 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 ay7-20020a170907900700b008cbb481fc84si16973493ejc.20.2023.02.24.05.10.08; Fri, 24 Feb 2023 05:10:08 -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="q/V4EJuG"; 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 15DDC68C155; Fri, 24 Feb 2023 15:09:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 7F96F68C139 for ; Fri, 24 Feb 2023 15:08:58 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1677244134; bh=UbBOvssQJVCCcqlAn8kHXKPk6nBcW848bOfk2kLw+RM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=q/V4EJuG3A8IUoRbwn5rx1Xxlq3Pa+Yn1nIynhYQOM91Bj61ujVbiTk/6LDRS43l1 elYRJePoYqgDN3DPNaVvSv7hVqMcioW7xBO9We06ykBcFh1j3/y+rHV3RWoSbXax4x GjaEtzJ2/ygwtyT7R8MlGWYA2Vnlt5gVtDlysZ40= 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: xmsmtpt1677244134tpr4zr6np Message-ID: X-QQ-XMAILINFO: NvxNySBpH0QlLKhvykOXVWNgkrO6hVr5JRV2cY+OHTZeKRkltMeJWdy5BzWtsI rJ3bhKkVmlbBoAS6t25pIj+8lbsgkd/8in0wqhSJExDb+HR3YnZejS4Xtl7hH61qLj+auB+oOUH7 XCkkQQABrOG9Nc0sdsQThUi0ROX0feJprmYRCFTHh04HBPkskiVCETNndolUB9b+f3dBOyyVkA+F w6I+qkxL1Zwlrf4VvC5paACB90MjdKJ1+Rs72KYe33EsbTExSNQMsrBhez0z+nY5OkXtpiS7BL4F hOT2hENWMnNSKyyGOYDKYnWTkB7Z0uskED4DyrbVG/CPdoEAKCOROaq4MbVXeWaEkbmi/XbLLMl5 +jqyjxGgE+W9+6JIa6I9x9K7yqPHI2IPfsxXuRrDy/ufT1rMduzooGPFY29AOsqA5oAbL+gaAAWc 6erKqae2JP+5jO5zSmVxxxK18kT9ryCyIOj6Z9jIl0DFXQWUJO91mj3FcPGcrfoes/r9S0F9HL4r CI2AwAOy+SXefaTyGZLWmJLinE6MEzyWwVlQTVMtb/dlhxMovPMBWFdDwih0umcPnY6pC3jxe3e8 QAPqY/GTMwvKBh64fNbLpvcV4ShjVb3kHXklS1ZGrklONDNdnl67P9B6+lHZmk1uszpAQ1CdSPmy QCQOv/hwiOJD6w8RdWeS2+DyKCy1PefxN2YefhyudXB7LYY3gXmwKmzdFCN53RbATRbDR0ue9afq h39erwoMjaKrlON1vTBl5gYyD8c0xtoLyQRss9uxLLxV6/L2Am9WANEqWAJltj/TaBRfXx/u/+50 agIu5Y+j+Zg/2LF0LixzOw3K1ApXSfOEE7og3HdfB120R7y4YM7w4+CSiV96FDyy7zzY/gNvHUc9 bMic2K1WJ2wskhhRZCog5goWdaEDRuZK1ePlpTnS5VhudJIpYYBt5CKOdtxbXgHHr5MjWkduZC9M VT5tq4tuUQcBUuaZTGql641Ngjiq+jJ32ft5OfctwS2NnTIqzYIv71IdSJn1yQ From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 Feb 2023 05:08:46 +0800 X-OQ-MSGID: <20230224210848.535436-7-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230224210848.535436-1-quinkblack@foxmail.com> References: <20230224210848.535436-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: RMZRJ9WzRHYu 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 f0580c498a..8fa69d87b5 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 @@ int ff_parse_itu_t_t35_to_dynamic_hdr_vivid(AVDynamicHDRVivid *s, const uint8_t ) #endif } - } } } From patchwork Fri Feb 24 21:08:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 40498 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1233109pzk; Fri, 24 Feb 2023 05:09:59 -0800 (PST) X-Google-Smtp-Source: AK7set8En3x783lA3tJwVvnI568R7eu8b+rne+iT0FrvJE0p6o0WNePdzDTc0A2KfxYAExUr20Rf X-Received: by 2002:a17:907:8a0a:b0:87b:6bbb:11ac with SMTP id sc10-20020a1709078a0a00b0087b6bbb11acmr30370096ejc.60.1677244198886; Fri, 24 Feb 2023 05:09:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677244198; cv=none; d=google.com; s=arc-20160816; b=SGbB1XqBF2REGUpfQ0LV3BS9q6GsYU57bljy1OFRGCmcmYwYt2a9S9P48tOB8zKIgS mM19gy+bju6GAGSIhQZSF063mfnsO2omefTGeSMHTKbgdeGzbBsELx56iQvFuotjEigh soeR7fhoyeEjc5JrwQZncO5kQUVLRFShuuUzZoulzqBmmtslk/dMw7fwp0DArpocnQFo jvLMaZqfpSbgAtaRyjqdxP4B1ek2Ie3AEVqXaQ9Iq26OqOnO65a52IA+StRNaMBtKUHl LCt6pKpQj1ojVAVd7keDyEFzegKcILpGkbW9gz7MrtnklUJ2czUSAqXB9v6aRDnRO+d0 NbaA== 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=oXBgKMM35M4PXWP2n7Y/dDDzzGEVTxHubYE9+Rrwmuc=; b=B6RhdaKS9fGD/7c8XFZH5k469EZwCnxIHI49Ikz9T5CW6QsSpdpeb+8nqFX/8MAUA7 exzqIwBqDId1r9Tbjl3I4L3o64LyDMwl1ozE1FfXGvJekTZw3PxvpxyHacabNPc4piFB 2u5+1R15XhUbeiD2manQ7xn8MraMFg3zEmRh2DG4ZnkTisfSV322irXGy0VcbhRVgESe nwOf/bkKdEBxR00TtNfTv67GzIY1znYuHpcvRZ+2+Jl82TcYKjM7slYtR/x/jExCDy5Q YHei90bYOdjEMhbCPDRwobhDlcxNcQMWlBbqkZSYX01PKsgKft3rmLCFh4hwB/fCsjrC ivUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=GnmfhlQW; 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 et19-20020a170907295300b008e41fc88f2bsi8539583ejc.981.2023.02.24.05.09.58; Fri, 24 Feb 2023 05:09: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=GnmfhlQW; 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 0AFB468C150; Fri, 24 Feb 2023 15:09:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-239.mail.qq.com (out203-205-221-239.mail.qq.com [203.205.221.239]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 823E268BF58 for ; Fri, 24 Feb 2023 15:08:58 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1677244135; bh=uqGo6IBsLuHHuv6wOInyiTZqsjHcWqXoS58s/heD8Z4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=GnmfhlQWjcTJCN2YaCd9ZO9urHWFaB03XZIP3jTWF97xeNUfUCcIt2zmPJCzst9SY Ug34mvffi4hjdPhce+amQefDLEYsq2C1t9NK5kD785XaQ4mCaUBGHC7rcJaGzw3jjI 6VyeuJzM5znipyErqeqiuDTZbkAZvOfBgL6SawGk= 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: xmsmtpt1677244134tio3genqu Message-ID: X-QQ-XMAILINFO: MW5hkHoBpWXyZhp3gs+tYADYoUtAIw36AcLRZ8hNpmWXZjE/hXnIszVmjVCQBO x411ZUlQbw8KV//w8nXvX6463m23KEsEjy2CyPEaV4my+4qORTATXZbhAdJhj0Xx8ozbHfiF5sNy 0nML9dO5TufBbzgCjCcWchPFYNZYHzQbeXmzn9IJ7g6nYNg5J4PoV5oiCVqAqMOKJvgukKdz+Tm9 2p/WHUcmrtXFwQRZxt5pFc7lCKxsWnI23DZOLWt2OvuIEQzawYZ2Olv7ikgbRHnyXCVoe1OCY+18 GmOCqY5pKGy4eTNSvueaAqC/ywm43lvf1eLjXwo52iM1Q2Tu2xDCBFYu/0I5bUlXClnlDHk7q0Yg 5S7Y7aheSieTFmBTBojUC+S0bSOby10h+j6qd9WEcGJg4mNqC+G0K+y/h4kvLhQ7f8Nxefe1DKUW w5UFAX3l2f528pCCYCZ6OLXdjwEjmGdRIP9pEmUeL66RZIuPcU1tTuCXZneJrzf61uxjtDUGEj4K UkuOHZQj1+XuKi5PN192Zjc50otCuVYJfLskQhmc9V8k1dEhMlcrROVvWqKU29jXHwdZs5XMbp/M tk2xaJUtkzb/LqxVka+3Tp7N7Jkj+LnG3LwnGOCZQPhc1ksxr3aUQyEOXZ7tqOeE2VRMpaFqW/Tv ziDZtuzxhS2bhIgi+rf6AVnN8VQUTpYMbFzqNkLmsyAZKs7W7UleSYAW1mqBn5pj9zbvkdnMNwZc YtWQNLPLGndDccTrnQFlLeRBFNKzlJZouFkNQvAmHsKjwTw6VX3peKgU/VmA6weHvWC6yrjAKPac q0fcID74wBDEQnZqeZifE8HRy/WsUVD23g0Tk4Xbb9oy5/W2TWGbGvD7a69ekcBsFi3S8/Da5tUJ uqNtgMTrJRNAhWBtcbpOfIyNv0hQQGNb1ks0+/T/LoNv/p1qAsy4XsWu1+crCnkjQHuCq/R8lxmQ PgqQmQDcyyae5dEUqEeceeaLau61t1801Vef6/ETipz1MB5+8p4g== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 Feb 2023 05:08:47 +0800 X-OQ-MSGID: <20230224210848.535436-8-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230224210848.535436-1-quinkblack@foxmail.com> References: <20230224210848.535436-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: 5Hj0+A+CwQMB From: Zhao Zhili Signed-off-by: Zhao Zhili --- libavcodec/dynamic_hdr_vivid.c | 64 +++++++++++++++++----------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/libavcodec/dynamic_hdr_vivid.c b/libavcodec/dynamic_hdr_vivid.c index 8fa69d87b5..8b5105ea12 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; - AV_NOWARN_DEPRECATED( - 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; - ) + three_spline = tm_params->three_spline; + AV_NOWARN_DEPRECATED( + 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; + ) #endif - } + } } } From patchwork Fri Feb 24 21:08:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 40501 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp1233678pzk; Fri, 24 Feb 2023 05:10:37 -0800 (PST) X-Google-Smtp-Source: AK7set9rjL4Do/PUwJONtOznGM4kAVvlPHmlhs5nHx/1DqTU4a+ALgFV6bkI5DDCmppyz1+l3USO X-Received: by 2002:a17:907:6d99:b0:8d7:153:1486 with SMTP id sb25-20020a1709076d9900b008d701531486mr16578536ejc.20.1677244237512; Fri, 24 Feb 2023 05:10:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677244237; cv=none; d=google.com; s=arc-20160816; b=Xlv4yJ3R99DlwHF1kPaUI8Z0oM5OnI8tHpDsnJsT8x02lvjgfiGhw1slcadlChT/TZ BLJ2+nq4wNNRWVuE+3FvzCsZqOoIslN4bJJdYmhcaPvU5fXxSX6byOYXcT98Th4Gb2yg b9kEO7iMwSjBbjxyzjtzj0jTa1/gzpCjKIuIjaQ+/fYHtEOSG1Cw4X7lBIBLQ2qcxdlE 0BN27m3PC89ojXh4GxerD2UKa89RpS3KTUpihErPscdcrEBK/gQVbJfRMMEbGcpfH4OU GPzs0IYNOR6m/GxGT2EMgVzsXveeim1AaKkCe4qAEs9O2uj+husTHw1RVJ/w4yjvJMk/ DAGw== 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=8vTSRre9GDKPuwL/BD/V9fGU8jp/okGPRLnesttoYRo=; b=CcNdxeu40JL1ccYd41kX1Sl0TgWB+42wmyDwX5ImkbdV+04kNqE/wonM0ogspjs7IB XkOL/pRHEzgMQZmJTCrzcnZhZ/hiXh2Rkq42VGOb1aHmtA0Mx1uHJQjYr3DaCCfOyryD w8CU4g7bfv1ZyiWyoHSOJRmM2oiUIPvJ7nR8PbAiPCpeim08DNCh+yR05ZIdvMvG6RXh oMFxUOC8cIvpC83Wktrlwx9ZKqiyZPUf86x7uEi/2duD88K8glzzklzd8nVSGXmv2yFE hjbCz+eqOWQ8c5hX3+QUIGV89vwjr9Q0PpipnxTjF+FEXJgA5V3Na6LYQ0+FmuWlckUK su/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=zPqtYTRe; 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 kb3-20020a170907924300b008b97df5bd54si20157471ejb.961.2023.02.24.05.10.37; Fri, 24 Feb 2023 05:10:37 -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=zPqtYTRe; 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 0B17868C173; Fri, 24 Feb 2023 15:10:10 +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 CEA2368C13D for ; Fri, 24 Feb 2023 15:10:07 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1677244205; bh=IgCz30brd1C6/hirc5EHe94bqmoq5TTeqziZzbPyhzw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=zPqtYTReZHwAImuIbBvuoDDPrBAS2z+aubD11AC5Dea3++NhOGYAc0Xtt2xnLj4+6 fjauOMyODMbBfXrZJnKDSrEPn0lsHRxAxV9CxrC2DtxEiNoxwzvPeUeNM3rjnQsraI JEVr2VdrerUpxFsNyLVaw7tmWPd425kg/CM72WQ8= 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: xmsmtpt1677244135thm65rc6j Message-ID: X-QQ-XMAILINFO: N/7E26DnGOeaMJKyFO4NR47gYpM6G44UoYR4+dIhEUB8EuxuNWorestk1dFS+z wMwNeqShWx1LNtHkJXvcbB25wW/nxA3d3SbEni6Dv0u6omW4Hr7qrIZjp59ezcguga44pNifZAoP SrVkJt9XpUoRHqcOGsVTdZIecljxOSvEG0dn+Z4lCc8MT2E6317BNP6nBSRO4Hkr0GqOQksZAdcC NIVvVVpWNYrTLyw84E5mqDqNMSR5u7sGEvZ8402GauS5L0U/YwZCzVOMt2XYgMdxHR9JOfe4C+/6 ws9LHtURCtPJsUl0O23eAaBHzczgLonTXb2qRBUOZ86Tofl4hTtafNHOiCtaVxwTNj9yFCGc1wCJ xjtUfnz91qK+XJjIf1J5+B1lld+tLstSfdmmzYc+FHQoVukuosL7DvcDxHozlBeU4F5XbIQUqjNt 58Fw34jeDbCk+eXGP+6eD7dFUhpSxsBeE1csu57XRQXjOkzWLBwedHCYHGTo549cwrs3W6TksH/n lAmbOCFcGLbVdHNCZeXocSG5IUc4QZ7j8G+K4FmZzC5KqNF7/vsfulXq1E9k0o2gt8qGbKgFmCH3 pd4l6GqiODmY8D01GNhESDRJlSnRknkO/U3h8fWMvxjYiIxD9USdiP0HsFOq6XAra2doRAN+0Siz ME6vytfRLAA6R4lA15UMgQZ49CgGo7t2FBeO10Z0oWGWnhX11k2OGCGnXFw4A/EaiJ13rNb4rfo2 8Ia/HR7bN8pGZrq/+5lEWTVYf57oEscZLvBhHPkGXLj+KEydS6j5uLS1gBWl7R2Zq4FZgUiwTErU Y8NCA4RFcLetl8ECp2fvlvp+rUsnspiyONQEMhLKk8KTuWlKWidzUoJvnGJ9RyCEIvCDR3rnSjGm ZfhKW7Q5+bHrDbXga396tn74QQBObHR0cb0Fu3o2k9+64s+jFAF7XVQmJBwS3LrXWS/cewsHsjml oHUNqO4uOgC+/C61tq9DnBTYR5VGtn4jr9HGPH7jLo8NGn8nJa5Q== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 Feb 2023 05:08:48 +0800 X-OQ-MSGID: <20230224210848.535436-9-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230224210848.535436-1-quinkblack@foxmail.com> References: <20230224210848.535436-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: +2P7BtWciAPY 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 1d051a5545..df463a0ed3 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];