From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id CE3BF45875 for ; Fri, 24 Feb 2023 13:10:24 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DC82C68C16B; Fri, 24 Feb 2023 15:10:04 +0200 (EET) 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Zhao Zhili 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 } - } } } -- 2.25.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".