From patchwork Thu Feb 2 07:02:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 40208 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp124468pzk; Wed, 1 Feb 2023 23:11:19 -0800 (PST) X-Google-Smtp-Source: AK7set/ahC7kekA96zjK1aXbxawE/wetKwFxIghE6lOlcCwWY/k33AA3tIijoLa9R2AO3ZCKsmfs X-Received: by 2002:a17:906:5450:b0:887:31c8:9794 with SMTP id d16-20020a170906545000b0088731c89794mr5016238ejp.37.1675321878779; Wed, 01 Feb 2023 23:11:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675321878; cv=none; d=google.com; s=arc-20160816; b=mCkhUn9iZ2Iw4myycDZ3OBBL0k8mEmD3RMZWkgzITzWEtoVpKoRpwt5qV//q6t48G4 kR2YSCtgj4GaG7M/gYIc13jOChMHP08navV4SolIXOQk5dlLw4ErM30jz+UZrhBAnArH NuVRvpdE+GtAg3a2imHXAJpLB+ou4bs/1d8AhCh67U9TCQ+1sneES1OBVnIVY7h1mP35 vgTri6jIUIbkK59J5xjQ4D3Lo9syJOn+s/dj/KT3CiuCHl1jftOEkublAO0eUz/Z2oeW YhQ9tjomp3ZVqR7bCpnUQXVt+65SZ0dovueAGyR1ssUMeM5iezp0NMy4tknMzQ4hgL6r AT2w== 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=6Y2CFVXBeZDn5108Xb/mHk7vsbiiK9DDAz3Q0DmnFlg=; b=l15B9UlaZRmwOX5CgvXaPMqvGxckClFbmu3xcp5JiZqmRwAe8TNV+g0t3KSPA1Gpkg uz5stbYDoLIDKEfdaF2xKiLnijIn7IBKWy5DABw3r2r0aPmglpAJIO9P5RuVvm84ItKN YGqRAFIDbP3sNg8KcvGSyhxZVPXuQiu0Du3TRpBWkRqVn/Tomel5ActmgUtnT3c7+hZE lv+AnQtbrnKBmn7jm4B17lPV1Tg8rRJH+8CEXR1kHJGkQnrMJ3Qme9XuN1DhLYUnTfq4 8pQQvu5RQXjLuKfVxUCMnhDjdtt40CM7xc10gcAAAPiJ+GTNsYw8splV6DD7QcBlw8qr E0Fg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=wlV+U5+B; 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 cm17-20020a170907939100b0088b553a6261si9599586ejc.868.2023.02.01.23.11.17; Wed, 01 Feb 2023 23:11: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=wlV+U5+B; 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 A275868BD67; Thu, 2 Feb 2023 09:11:12 +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 156D268BB4D for ; Thu, 2 Feb 2023 09:11:05 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1675321863; bh=O2uS7pdo/TgTqP4T1CUmmTGft8/hlgy/Hf7AzGXs6ew=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=wlV+U5+Bry8PNcdZxdNw2SP0PPOPLmbOCBqRkaIHT/Kx0dWVwFPU9Ix7RNrhDGCDb IMuL7NzPYXchNE+GS6BGsBFrSB+AvkcrYKJsgtNO7hHbyLLDio+9a1+HiioD+JGgST 6nDMelmiGMfA/K50mLaoe7nwmhNLEf7DGmVTVRPs= Received: from localhost.localdomain ([59.37.125.102]) by newxmesmtplogicsvrszb1-0.qq.com (NewEsmtp) with SMTP id 2C0380C4; Thu, 02 Feb 2023 15:11:00 +0800 X-QQ-mid: xmsmtpt1675321862t726iopgv Message-ID: X-QQ-XMAILINFO: MB5+LsFw85NoFVFOhf8Zn6OnsT6JCX/6Ng592RlbhsQsWaeW48POWJQQEi/7kb JxwnSHTYiS4SxtGaMqOjNQkDBgMbBKYfAH0nfljHNEG5ECqvljIaUM3dFmN2ezCYwU9OtJaoKxeB +XPE97zu2b4wcjIAzaBmTbtQdm03wgZLUynq9lJ2dIMx4PtANjBqyjI41GURwY8FpUuIajPvHfXc mfoXUwUIa9UraafoN5v1CYqU1xBi+vMcIVDH+FUSJAIbVmxUmgDwLa1bP2qLmyfuiX+p9yRG7kar 5i/brPR29Ci9/n3XCbCD1P1RV6oJBOdZY1SMxlj3hpBlpW/UfcKjhBbd7YTWjsplCgDJFR1j4cUn 1NjZfNnqwdbpZgVWe0WHCTpfG+EK6oBwPMARplzZ93cfM03gqeVhw+D0sK99rahY7Joi4kjy5UjF XqieUjmV7iMS9CV8kHAYc43SLZsZNW1+74EHBN15LyqKY0kfrOeN+9ESLK4FgAM8y1PsLPVGTYOl RiMZdjAkN7Rt3/1cRnpsICVgOu+VVxtdRMy6qzdbZO+hnYXaCNIEGa0czZy6hY46bbVBnpC211NL O69BY00uIg/ynVVheBFLne3foUImDNNcVDrelV5SKez2gFruVhn84SodpfNfjA/EBvrCDrf4Udcq qZ1sE9hJh7Wuk3gEuv0m2etshAFeDbg1Tn2Fn0PQKDy6utJ4mda+4QX7E/48NQvvfFuA12RDO7JN lkn5Mugn3Uj30E+p9uAuSemenSAJCokZCqXgOHa5F2afKfh3Opo7vyx+D1/tZWdlW5CerzS4iInh XlG3Pi/kZPkLFoogCv494IC9kSwj5qZo9FNebCXVJIXlczSFV2fG5+SXW3vMBelln7krsYxXJfxh kxbKWZhAP43avc5EovTka835C1K+rxpc4rmQcctTJtue/9MQT9YtrDi05A7e8VYQDsWWbDlFTGvd uvmWbp7HqTCxBQKaQJkj1yRVABmw96lCDPEKIynPQ2arwSliMuByjmMUJ+qz7A From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Feb 2023 15:02:05 +0800 X-OQ-MSGID: <20230202070208.1962086-4-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230202070208.1962086-1-quinkblack@foxmail.com> References: <20230128135818.387953-1-leo.izen@gmail.com> <20230202070208.1962086-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH major bump 3/6] 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: 4h42QTzu7X30 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 4bc1cd3c70..a5ac0ce0c4 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;