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 - } + } } }