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;