From patchwork Thu Feb 2 07:02:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?emhpbGl6aGFvKOi1teW/l+eriyk=?= X-Patchwork-Id: 40212 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp124862pzk; Wed, 1 Feb 2023 23:12:05 -0800 (PST) X-Google-Smtp-Source: AK7set/B9NEMzf5+fwifVmr1+fveMfMADsjkUu/7/BToo14YsdMopeOIovAN3D2ixepNo4qMPSKF X-Received: by 2002:aa7:cd4e:0:b0:4a2:331e:85f2 with SMTP id v14-20020aa7cd4e000000b004a2331e85f2mr4804388edw.26.1675321925356; Wed, 01 Feb 2023 23:12:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675321925; cv=none; d=google.com; s=arc-20160816; b=aF4Kd65MIRsxaZAjSdIk95zxlyR4LTIRcwCQ9dp0aFS853YdQKNHS5D/ouvOoZomDm QBBuEViQPsYf2e5DDLsjXSTvoNOLKH3CXBP5MsiFXsoNuViGbfNei1YiMSyPeEsFkey8 PSm6GPIOCRzcs3OY6Vp02GkeRx5bYLDPXIbI2NVbWJC7/87oLQKE2gaUDFoa6BvSiZ+A JDeChhXGv/7N4pLIdAf/yhqWVk6Ubuk8mHI4kBwmRbuodzy+sxrffsqfGVKEva5QMoUE McA08jloxK+lw4gsTaQGy+wB8wlYS4BulZGkqQEwfhBMOpGJvhc4hikwujU0AUMKTu+X nFzg== 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=sATKlPQ/UGMymG4JBJG5tJWxP5DNU1bNYWMFSL0TslE=; b=cRqyjLMZ3kU48e1ARaPPRDOH+ezuHMhga0H96YV51HYWmMANb3TIkXOt800q7rmwDc EEM9f//+RNZ3eo5FJvkF1qfrCYm4TZWOjBZ6UuefUMNI3E6exxTdqy/Qbj7ZO/0fhHTu 8TavPRPlk8XOXspXkvDhjGT6QK/e05v77LiwdlSzZw2FUvivEY7BESi+pWYBLUuYlI3f EVWaPiOhCezdPVpSHhxszA24iu/UNHziewTcSj7PsOuH9wGjeo+ePnBU2Y6bUcFTrI45 SSK8r02MfMC1kRWdjiuzdlUq/v26tH7s/ey90JuHW/CqoYqYz/xl60r3iJX/mdF9ugjN LPsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=RW6g4IBr; 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 a22-20020aa7cf16000000b0049defeaec6dsi1950802edy.530.2023.02.01.23.12.04; Wed, 01 Feb 2023 23:12:05 -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=RW6g4IBr; 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 2876368BDD2; Thu, 2 Feb 2023 09:11:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-73.mail.qq.com (out203-205-251-73.mail.qq.com [203.205.251.73]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BEF7268BD14 for ; Thu, 2 Feb 2023 09:11:06 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1675321862; bh=l5Fr80S4ch6zsQwe2dqykjDDIE/WFfVRLKaZAmdEgFU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=RW6g4IBrl8IDuGq/iu/h3FwqVbIT/hD4gb2FPlvxd5pWDvnl0QYqVpwVYREkwFy8L Pozwlyte89X4uif5x0Y9bR5U6CUFKXID/oR3wxBEcv0gDegJJkoqez8inpN/aqwZBp klFSkTLjBAbbMkNhxWHtvCe8IfFO+N3k5t6ltty4= 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: xmsmtpt1675321861t5zziyzjn Message-ID: X-QQ-XMAILINFO: MmuCfgcSBfHxuLmpi+H9XR7fOqA6ByzNQlmPnlOvkENY51fOq3uCsQgNUeT9l7 Mzujo3wdZcOYUHO5C/87Og/O0dqUmyHn9+tytiz4LyGMjSFfPI4BCVPewIYYfjDJYzsaSj10Rj5M 2z9osSjFudNR6V/f5BoJXaQ7gme5AqT2xWLneXQdZjFapO79/ECgvOqU1iqgk4LF+WZndysOZ+nL 61L4jWLI6kGLJXQhKt3Szr/oRufAPQeNPSfcuJ7B5wwFeUcainiyXEKWhGpJVTyQhfwhSHmi3Mt0 HeMW7V7JuTcx3Cgc4dxDVOvcwxB3+FUjP66Vmb5tey5Rm73VxyoWHOVX/C2czHFSDzuVCqBx7IJ9 GCvLNNOk3bVe/ve+YJ+33jtf65uifT1nQSZT/tkWV4lDgHGgsH3lxhA0dBI7EPFqR/9FXaFunpmd kE+QY9jEugOnh57/0fh1FF3zl06xqn8XyzEDRyHgIitKq10aeZLMIjke2AIXkomikSSXk4I2M9sf m4UBHJ+NmcGWaD8PHZ++4otuTSTIjIBFjVLEFy7z68t9E15Oo5syD8eQbLbmsGMIB1Zm8DjuSQxs xxOZOrVXWSkT7uZ8BeMprlxn36NIHQSx0I7Vv7UcsrB0XypP5nR86RPO7YgWxVZV3i1uJqdaIOJr MIqrVZrneMBXp621klSkQ2n+UK7VANBxtXu3dl3zA16wqri6i31r88abR62S8qh1YCRqttldzRBJ oaN1NSIeJVeIn9gCpdRH42rErXiZaEPwpNpqrb9jgcrR98Q1vl9VXwVBALETDUacqbqXdgvKh5cP R3BWhBBJ6/t0k2S4ymcGtOw8bki8la/8ABkSOHnTHi4iv66x55ak2Mjo8DsCJnb9SdE8NWyCo9vj 2VjZU3Tzsa5gpkc0VrJdizsL0CwyXx3ebPXIUKDWAp64nAO7+Quo6SmHLBzSGl/SPaY8pfhDidSY h5UhmbsyV+72RzaBMzOKnmaKsix5EMBDOmBUjnXkQ= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Feb 2023 15:02:03 +0800 X-OQ-MSGID: <20230202070208.1962086-2-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 1/6] libavutil/hdr_dynamic_vivid_metadata: fix AVHDRVividColorToneMappingParams 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: mdtriIm8HdjL From: Zhao Zhili There are two group of three_Spline params. Fix the struct definition and usecases inside libavcodec, libavfilter and ffprobe. Co-Author: Houxiang ZHU Signed-off-by: Zhao Zhili --- fftools/ffprobe.c | 14 ++++++++------ libavcodec/dynamic_hdr_vivid.c | 20 +++++++++----------- libavfilter/vf_showinfo.c | 17 +++++++++-------- libavutil/hdr_dynamic_vivid_metadata.h | 12 ++++++------ 4 files changed, 32 insertions(+), 31 deletions(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index dfa7ff1b24..a853c70f56 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -2246,14 +2246,16 @@ 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, '/'); + print_int("3Spline_TH_mode", tm_params->three_Spline_TH_mode[j]); + if (tm_params->three_Spline_TH_mode[j] == 0 || tm_params->three_Spline_TH_mode[j] == 2) { + print_q("3Spline_TH_enable_MB", tm_params->three_Spline_TH_enable_MB[j], '/'); + } + print_q("3Spline_TH_enable", tm_params->three_Spline_TH_enable[j], '/'); + print_q("3Spline_TH_Delta1", tm_params->three_Spline_TH_Delta1[j], '/'); + print_q("3Spline_TH_Delta2", tm_params->three_Spline_TH_Delta2[j], '/'); + print_q("3Spline_enable_Strength", tm_params->three_Spline_enable_Strength[j], '/'); } } } diff --git a/libavcodec/dynamic_hdr_vivid.c b/libavcodec/dynamic_hdr_vivid.c index d689669dec..f7a41ed2d5 100644 --- a/libavcodec/dynamic_hdr_vivid.c +++ b/libavcodec/dynamic_hdr_vivid.c @@ -101,23 +101,21 @@ int ff_parse_itu_t_t35_to_dynamic_hdr_vivid(AVDynamicHDRVivid *s, const uint8_t 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_TH_mode)) + 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) { + tm_params->three_Spline_TH_mode[j] = get_bits(gb, 2); + if (tm_params->three_Spline_TH_mode[j] == 0 || tm_params->three_Spline_TH_mode[j] == 2) { if (get_bits_left(gb) < 8) return AVERROR_INVALIDDATA; - tm_params->three_Spline_TH_enable_MB = (AVRational){get_bits(gb, 8), 255}; + tm_params->three_Spline_TH_enable_MB[j] = (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}; + tm_params->three_Spline_TH_enable[j] = (AVRational){get_bits(gb, 12), 4095}; + tm_params->three_Spline_TH_Delta1[j] = (AVRational){get_bits(gb, 10), 1023}; + tm_params->three_Spline_TH_Delta2[j] = (AVRational){get_bits(gb, 10), 1023}; + tm_params->three_Spline_enable_Strength[j] = (AVRational){get_bits(gb, 8), 255}; } - } else { - tm_params->three_Spline_num = 1; - tm_params->three_Spline_TH_mode = 0; } - } } } diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c index e55625b338..05829289a5 100644 --- a/libavfilter/vf_showinfo.c +++ b/libavfilter/vf_showinfo.c @@ -354,19 +354,20 @@ 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)); + av_log(ctx, AV_LOG_INFO, "3Spline_TH_mode[%d][%d]: %d, ", w, i, tm_params->three_Spline_TH_mode[j]); + if (tm_params->three_Spline_TH_mode[j] == 0 || tm_params->three_Spline_TH_mode[j] == 2) { + 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[j])); + } 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(tm_params->three_Spline_TH_enable[j])); 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(tm_params->three_Spline_TH_Delta1[j])); 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(tm_params->three_Spline_TH_Delta2[j])); 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(tm_params->three_Spline_enable_Strength[j])); } } } diff --git a/libavutil/hdr_dynamic_vivid_metadata.h b/libavutil/hdr_dynamic_vivid_metadata.h index a34f83072c..4ceddc539d 100644 --- a/libavutil/hdr_dynamic_vivid_metadata.h +++ b/libavutil/hdr_dynamic_vivid_metadata.h @@ -126,42 +126,42 @@ typedef struct AVHDRVividColorToneMappingParams { * The mode of three Spline. the value shall be in the range * of 0 to 3, inclusive. */ - int three_Spline_TH_mode; + int three_Spline_TH_mode[2]; /** * three_Spline_TH_enable_MB is in the range of 0.0 to 1.0, inclusive * and in multiples of 1.0/255. * */ - AVRational three_Spline_TH_enable_MB; + AVRational three_Spline_TH_enable_MB[2]; /** * 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 three_Spline_TH_enable; + AVRational three_Spline_TH_enable[2]; /** * 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 three_Spline_TH_Delta1; + AVRational three_Spline_TH_Delta1[2]; /** * 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 three_Spline_TH_Delta2; + AVRational three_Spline_TH_Delta2[2]; /** * 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 three_Spline_enable_Strength; + AVRational three_Spline_enable_Strength[2]; } AVHDRVividColorToneMappingParams; From patchwork Thu Feb 2 07:02:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?emhpbGl6aGFvKOi1teW/l+eriyk=?= X-Patchwork-Id: 40213 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp124917pzk; Wed, 1 Feb 2023 23:12:14 -0800 (PST) X-Google-Smtp-Source: AK7set++BZ8BNgh5ph0aPUjiwdvoXJKjFNhlVl38Mt7R72JYqPJcobytLeS1dSf9v1b6YTvSw5KN X-Received: by 2002:a05:6402:4508:b0:49f:bf08:b60c with SMTP id ez8-20020a056402450800b0049fbf08b60cmr5029676edb.26.1675321933840; Wed, 01 Feb 2023 23:12:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675321933; cv=none; d=google.com; s=arc-20160816; b=BBE1muCSm+CiVJOYA5ZtYOr6REzva0JLilFsxl2PP1IeEKPa6JYtN9S/ABequ2LJny egeLh9vKxoAvdczW8PH9TNc3kGaNkfrhC8U6sScl6vQ8m3zSTiEI8SVw5i2AJxxGo0bh mKGduiq5nr+OiCdCgbHfMTB7oBsQrnaGjeCQhkSaW5jvW+hF0afs4B7IN5fl6prg1kps vaMGsjsN2IPWROzWRz/woEVqWthKJVqu4nGtqQSU6STIiCIW4h8sBEqFMNrcyYn5OpR2 RAn77zlVmgaCzunsW7nCknwCGZ8nPS4NlJP5TCsMZmh2zDWE36FOH2JMG5C9o96BI9g4 YYLA== 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=p7C4VEnJtbvRKwAFVIQNNeTXiv3j9Jx4qlbOdTD6Pzs=; b=q9CgxJ1P7RniW6sP7gpi3xYlRy2SqD/fJbU0lidrwok9epxxKDpcMrtlSJJwCqqi/S kkyNlSPZOXIVk370KQcJeacFdqUVWnYxnkLM4bDVWRQKT8OjFsi+5UKwlVHtDzn/F5X9 27k9q8JI+9Xn1lmRWT3J6lqHguDDNhrC6JfvKZk6yjv4l9tTd87P7GAWhxrQigjMD7sg bZsrvSRzxOWXKihvNu9sQ41oDjZ6kPXYxYh7XJ/LWQxGe30L8sTBAHpZ9epWDdpoa1Se fFsGxVUgTwJGAkZn1xWpIBNq95cwZGH9YbCVjZTpZTpWBsMjYob/B4yspbbz6X6y6LtY Rn6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=ywm76QMw; 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 fp16-20020a1709069e1000b008785e08cd3fsi7000114ejc.468.2023.02.01.23.12.13; Wed, 01 Feb 2023 23:12:13 -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=ywm76QMw; 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 3CA9468BDF0; Thu, 2 Feb 2023 09:11:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-72.mail.qq.com (out203-205-251-72.mail.qq.com [203.205.251.72]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D66DF68BB4D for ; Thu, 2 Feb 2023 09:11:06 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1675321862; bh=xKUuTTtTDCJZ3BMm1eGLB3BKRGGMK4FLt+fuMzLRNAA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ywm76QMwwElQjm6i/ocie63dH7HhJRO6svcLh6KwkPYQqtnsJdliFd8XlgLpb19sO sqgNbCowTL+qcR2sb7GR4Al4vqOzPXOODwLC5A8d7DKlmA+yfkXlBtCT0tB9r4auIi oudsR4dlTA+nKrOM9QbmPvdOUK/Q/hdBuRg7RSAY= 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: xmsmtpt1675321861ti0nl4kre Message-ID: X-QQ-XMAILINFO: OaoBA5NOFC/jZ/U8iOl/xTUa0zB68Mb22bj3kREl3GiJUYKtJhS0KjiBwmch66 UAr6MtHdXaJ8CIeKn4fFYGodf4E7Y6eGzdAKwHazq/SYedGZc7WXcgMEK7fjSPDMhnIph47UXYOd 5J4oY8aGnnqq8NXFSYGD4BYAzGpnRfiDTCeKXTt2a4BAUFzxMD86zY6rGCjVJiuofqtQSVl4OLBZ B8ev3iRq1gO/dr+8j7S1tAkOUgsck17dCO40amwLwnlPV6orWG7UFEhtfo8Vc0OToYLT9b2wiODs LbG9+iqkm0XnF/9y1JyXV/tY/i6Xa9BR4lvay7+u/7ZmAM8BxYPzBXMHzCGGNSiKdJh3l+ITqctC Igu+yixpyA7Xjzl45TSymbLgVru4AUlZeTJIxjbw8kEbeXUAakeyPDnThfXmkocVGuel2ZrIoAOp PM95h5d2osbbouDFFqIYWbYt1ut3R/pcZJQbjIDKxy3SygmKUfhBRghBkk54z9tzC4hPKCrbyVQ1 XPyghJAhjxNj8wtTeGkKAhKBLYJRMkrOiqH9iH4SZMah1vsy1zzD3r7XmH482TqBuXbl5LJ6BoTX FiIw6MEJY91bmRqtOqLGLirJpLEx/wpxTuejLcrZFJ3bHSy/mVQmsAl5NVpio68TEun+84ckePWl cpuu3PNv8mQ6avciHOLzU0eZGA9elcHRMpwQRjkMoDTXSNwS7fCajt9EIGGeDwopapWEBX8bkZLd Yr6DSnqx8p/TGM7x47zk9EWQvHAhDNJTqKiGAgocidMmSj21ELTVDEF6g4VdiJamnNEaYM28RkrW ypDzy3HoucjfVKArWGnJym5P+xoq+jOdHTBDflb+LmG//3Xda0Q0raU/BtaJaGdFmI8uankq57XA jc9Qmv/7UiPyWY0ZsT28wlVKfhrae9Vs9jmkAp2eDsxNSu/69593YUmSpVBeDexNhvhwlv0IrDTT Q38kGwFcJQlWqmkvZMnOiHCoD2eHGx/UFpvE06iwslx29jQKF9BQ== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Feb 2023 15:02:04 +0800 X-OQ-MSGID: <20230202070208.1962086-3-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 2/6] 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: uiJ08aKvMkV7 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 f7a41ed2d5..4bc1cd3c70 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 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: =?utf-8?b?emhpbGl6aGFvKOi1teW/l+eriyk=?= 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; From patchwork Thu Feb 2 07:02:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?emhpbGl6aGFvKOi1teW/l+eriyk=?= X-Patchwork-Id: 40211 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp124715pzk; Wed, 1 Feb 2023 23:11:47 -0800 (PST) X-Google-Smtp-Source: AK7set9Sc+YBgdJTp1klr1RoOt6h7Oej4dTgMXjD5mv5H9StxdC5OvQUxosexkc9s+xGAqQE3SFb X-Received: by 2002:a17:907:3e82:b0:878:6755:9089 with SMTP id hs2-20020a1709073e8200b0087867559089mr7424407ejc.39.1675321907210; Wed, 01 Feb 2023 23:11:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675321907; cv=none; d=google.com; s=arc-20160816; b=BR9nxUsymX2GjM3K99hfsDBjdn1y1RAvXw3HeV2brFB7apX1IhDafmNpJ/W0yx/bcZ tZ21psMQ06XlbO72kKjqWbsrmdPWWaCjDndic8Q6vYuBR7agSsfLlgtoOntoo2Ku+Od1 fBj4HIycl7L1r1wTt7Dkcm6WfnqJgzNswtdHasW1FmNdQAoawKauWQ5h5iSbb0X5CYo/ UhHKwRAl6aiUJEQVgKmrafkDLLFEs4Sj6rZjy9c+XMz90Ib+69BxFpZAFautZRpn7SbG SQK8ciVihM75EDrn06/t5Rqnlt8D49AUrFP1Ra6r0328PuEcMcyFBHW05fG80OyV8TcK U6gQ== 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=ByGJ6X2ZdJA0+L5k7+6G0GTDQwznx08g7Pb6LPeNvfE=; b=QBdjYf6oe9vL1ugZJFGIhiQgL8/wIr8oZqEUzvIbwTranG7Q4cl4ABw3FJPWCCKoqE sa/1+qRoRC28w2WUgPJ/Sa9N5OC0yFbNUk9PvQJxD4vw0h8ZGAggc9wtI/CVKtRVjwIG m/dkZQHwF/oxDxa8BFmyc0Z6ZblwbQfGJvIOAf9OtVGl6M6Fh0PAIUg65i69c87zMFg4 RT8GN94I9SNyEUe2O2F34TQgchtzQJheiNIEywqdbBBbd0RwM9ld/usfbtjuppgl/y9d F5UTgotoXmwYJNA3243XPasbgosONB9qGtl2fjuYQhkPTUZqj87H/mN4vStGJMjV149m vhDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=Xzc8PUhh; 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 vf23-20020a170907239700b00889d43c89easi2296667ejb.313.2023.02.01.23.11.46; Wed, 01 Feb 2023 23:11:47 -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=Xzc8PUhh; 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 122EA68BDB7; Thu, 2 Feb 2023 09:11:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-137.mail.qq.com (out162-62-57-137.mail.qq.com [162.62.57.137]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 91A8F68BCF8 for ; Thu, 2 Feb 2023 09:11:06 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1675321863; bh=3jRAR9/jVixjm5VJlY5PuU8ZOGdH7u1s+Y+Dytvru5U=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Xzc8PUhhtewignzCHvUtyRx9oBIuFKUwY7t2tkN8m35K6IdqSEybg4gd7WnuICWCz huM5MyyfnR1+2xJAjg2sPeW3xv4lgzgOGcJLqv88lnlNgLzNjmuo+FX3Tbx2abkNz2 iyewfFffkJCO5gwcC9PhFxTokbCsBokm7DofVmtM= 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: xmsmtpt1675321862tm0293lu1 Message-ID: X-QQ-XMAILINFO: Nfm/+M6ONQ57yBMJe0TKvz9qAYp+qu4IHY2VVVkRz0pgbWZHeOtZJg3Vg0NvDI Sgj/ZVF6rNwpfeJ3k2LGZ4JwcHhn7ySC+IUWnFxCfEiHqJ2P+AnKRsXMfRrAQeRZq9ZganfOWsPr sQFjYivZi7votED7YcqC7P87lW9tZZhLCNka1VDMUqWluf30WVRbdp8H5Kw6w6qB0v+NYMJNjnyD GErzZk1zw1mI+51Bmjis8K1Wb/bQ7iXb5udMS6r66UgsBtY+3PqfjigSFf/EsBuakr7dh342mvKT ixnueO8byzgudkMHAHogqIjADiv1iMLgnurm0YjRLb37/zW/QKxWp1a3OGjLmsRSKIkKZ17rKnfU dT/V4z0dsmne10oTdQcND5DKLbyxyX8lY5OwR/eUpXnGY3Bpzq6D26Crh/weswbB0/IRBUGJcWaM +EpWUtaGJVVbRY9xa1irv4IDybF1FqWND2jbR6KzFuQqsl1jWb7O+nSdGixPsJNug0WVMZCi9SAL EFQwyxGDXBfxyfwm1r+SledFUA/doztQBzLrQSqh0Tom2RH/GzAmKhvYK3ZeWbOKh5KVUYkecKoK y9hkLcg09QfCdAGIzrfBOIPa+DV5gENPb3rd52KFU5zRO822dqd9FpOQU+8Eyhm3ai9BT4el50TO aVYUpUxlAtuFQGp3/yba/ZyvWbfkXckfId54bkLhocuDJLybqYBk2hnDD5SGuqg7AzOpGv0ZBY0t TLoNaOWw0Av1TLIhhJ0InhB1EZQ0jg4/3XHaUhuK6TGSuYPJYqIfIkgLqc/1rwul6nM6IDHyRms2 2H+GKqqmlDZNza2bwXyuR5f5RWW16oZEHQnIsRG6EjVAwM3tOU0H3hppqrnWBKFnA+JyxsJGohXo XGl1QxwHSa7ZQd4VxdjVaatTk5QFPHm33VT43WTFwNerdA9jM1vHbkPtcaH+PJPo4zv9zzkhtIzu DqLWiYK8MgcnOkZWRkPmAhu1MSVGS7 From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Feb 2023 15:02:06 +0800 X-OQ-MSGID: <20230202070208.1962086-5-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 4/6] 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: rXiSG05mOCZZ 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 a5ac0ce0c4..4ebcc3f4c1 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); @@ -114,7 +114,6 @@ int ff_parse_itu_t_t35_to_dynamic_hdr_vivid(AVDynamicHDRVivid *s, const uint8_t tm_params->three_Spline_enable_Strength[j] = (AVRational){get_bits(gb, 8), 255}; } } - } } } From patchwork Thu Feb 2 07:02:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?emhpbGl6aGFvKOi1teW/l+eriyk=?= X-Patchwork-Id: 40209 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp124558pzk; Wed, 1 Feb 2023 23:11:29 -0800 (PST) X-Google-Smtp-Source: AK7set8zCfWus47icTedcj0tIMkXLb9zgEcPbmxCsD/PR0PQejEULiB5qCAqITgcp4GBXn8xYQis X-Received: by 2002:a17:906:f190:b0:888:6ae0:d12e with SMTP id gs16-20020a170906f19000b008886ae0d12emr5327823ejb.36.1675321889132; Wed, 01 Feb 2023 23:11:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675321889; cv=none; d=google.com; s=arc-20160816; b=Mfg2s08DRvGXDDGZmn/1GsfPHpTBDSU6F0WTWsSd10ecQDILtuMplNdXu61rYQWJWA 1jzkAfa/vl2tMjqD0ZRfApOKqcxnSFlu4pagEqltpq4LVB3AldbmdD51dPQGGzkEZaku iQFyiVHeZAF76JQ8MIDfQB6UvsKJJ3V0RERziS3BrbHcgVXeN+jEb6kse1g/m7zD2/ts S+/74L9gQoP/43sxhnSLSMxvLNMtwsdjbfnwjbH+UjrqNj+O28XoQoM2FzTWtvoEr+GM o3uxCuwchFyW6T3i2gFCuI8nZk5oduEdCSZpRscGNBWU5uvCTyKofe/QpN7wYBpuQdqK xl0w== 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=fZGgfkDDO03Qsj65Gv50LqtCA3zUGfpe49XscKcf89c=; b=nceEJ3DkfZoPk71CYxrDFEsbtQiG9X1n6XNtTrDWgXFHY5+bUL4AYVPnhqREt5Mefo m9LzZ7k9WFNwa1GyAX1GxQyM5vGhlpUfUSa4NqIERMW6FgNR80gAla5d+jGIheyaatQT MAxOvubkevZ/5Tq7BtygeX+hgE8bBUSWARo5jq3XxgV+nCba+/puj0xhnDQ0/C72s2oI PI9sSqxt9YV5xfqUW6cjit/VtHZcpOpspPIAM8meHCizAAthF0LRZtXcrCT7EAuI3jbC nx/lsa+XSico7lrvzdLUeN2Nvxn26B2z7d6NSeop50i5zeIoaPt4pU07pWQwSfhvIIxv oBrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=HynW6aHP; 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 gk5-20020a17090790c500b00880ba18d878si17678880ejb.113.2023.02.01.23.11.28; Wed, 01 Feb 2023 23:11:29 -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=HynW6aHP; 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 B138C68BDA0; Thu, 2 Feb 2023 09:11:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-64.mail.qq.com (out162-62-57-64.mail.qq.com [162.62.57.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 70E2C68BC6C for ; Thu, 2 Feb 2023 09:11:06 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1675321864; bh=qrTt0KgJ7zvhUUIDsOkrebqlUS4tGr6nhZTzjrW3vWU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=HynW6aHPeskt+60QItQHrmiL9gE4+Mr8I8xmIH/ZdkCEi7jhCtM8v1PXrX5IVk1dc Y/Q5QJNjBcx/3W543bpkgoD9C+aSd08t7nS74TBdf+w+1HnKIce0oe5+QwQIcPgbyM CK7OzSFFCF3eu5EMJbKRF2vBsBNde4St9roovSu4= 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: xmsmtpt1675321863tsi22qcbe Message-ID: X-QQ-XMAILINFO: NT7rUiK9Nffhwij0HQUUZdHU8Rh++CvZrg9Es/qR06hC0FiOe+hyRYIpOvfade 68fa8wGqa+guG3zcCglYFe36Ev5yhn52d7GIJS8RcF8fsZ8qYl3C1mRSdpfK5N9VGU3pJY/BET4c AmrGJpIJEfJyOT1MoaY0uQfQ3tLTnhSMSfR4RhG5sJCXu2Ft3xHZxRzsXe1ffCwAPaiivb7kRcs4 ry1qGjPwXaW/U7stQnlqU/nrpBdZ1k3TWUNSSziMj8wkOSoiL719Oo5lrw7V3k4gBzTbIExVE4Q9 9Y6Gyq+njZqjCOFebknGgN8GXWB1VuN/4I9niq0XJmc0y5OZcvihrZ8CVtb8xSt6KWOHe/Jf4Crs QTKANzOYQ8oXeAVYrp22q1071xibv7gKmroQVhF7AsTr34mJ0gTQvP7uXyIglfYMT0Ee9hRgVuzS jhg6mR+Bd8EvfiJ82yP2MPQpn0o9wowhpwcCYSMnFcJdcXF0KSkU1HUPq+E4M/fIzDlPcilHWDco FCP/GKgxcqFOAjjrD9D/M4pyrSv642INIL+pZ7BcCXhmigo8JtMGmbBxxmBVtUm+/5iEDf/gzJKc B+Ys2iNqhtwdOcOTcgnTfd0AfwXNnsgH9B/BC1ISrvs+dE6UNFbjV8oXceAbEAfQx80Oj6vG6al6 MOSwYYjKtNQbuSJRq79hHLKfeteKxtXxnTLSHWZgrsH1ywtWV0k90aFTuGKMQOWna+PBLVZST3Nd PsNpUizouDjrVLzVnO+We4OONOZ5JlizPlKHskO2guvmySwTTeaobGhVysJLkPt9Jjo9F2U/MCmk huIl6HXW3td7iA/RMK+scZHNCaZqbtJX6vl2XhyxTT9EsEoaFvMLS7c5j9OqFNldE1mm9Ebmw3tb MsUcMPwDbx0cjaJ3FymKlK//435ahu7bu+d6NkGocG62/OJ3hDWPG79TkmOMHjrSKuSNyCvZpN7N sY9rOHhkipOuMYDGP/ZzYD7fCB9+kSKRo8RtdmTqpMkYXolyDYPA== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Feb 2023 15:02:07 +0800 X-OQ-MSGID: <20230202070208.1962086-6-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 5/6] 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: rFaD+OgYR8rz From: Zhao Zhili --- libavcodec/dynamic_hdr_vivid.c | 38 +++++++++++++++++----------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/libavcodec/dynamic_hdr_vivid.c b/libavcodec/dynamic_hdr_vivid.c index 4ebcc3f4c1..710f9dd9c6 100644 --- a/libavcodec/dynamic_hdr_vivid.c +++ b/libavcodec/dynamic_hdr_vivid.c @@ -92,28 +92,28 @@ 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) { + 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_TH_mode)) return AVERROR_INVALIDDATA; - tm_params->three_Spline_enable_flag = get_bits(gb, 1); - if (tm_params->three_Spline_enable_flag) { - 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_TH_mode)) - return AVERROR_INVALIDDATA; - for (int j = 0; j < tm_params->three_Spline_num; j++) { - tm_params->three_Spline_TH_mode[j] = get_bits(gb, 2); - if (tm_params->three_Spline_TH_mode[j] == 0 || tm_params->three_Spline_TH_mode[j] == 2) { - if (get_bits_left(gb) < 8) - return AVERROR_INVALIDDATA; - tm_params->three_Spline_TH_enable_MB[j] = (AVRational){get_bits(gb, 8), 255}; - } - tm_params->three_Spline_TH_enable[j] = (AVRational){get_bits(gb, 12), 4095}; - tm_params->three_Spline_TH_Delta1[j] = (AVRational){get_bits(gb, 10), 1023}; - tm_params->three_Spline_TH_Delta2[j] = (AVRational){get_bits(gb, 10), 1023}; - tm_params->three_Spline_enable_Strength[j] = (AVRational){get_bits(gb, 8), 255}; + for (int j = 0; j < tm_params->three_Spline_num; j++) { + tm_params->three_Spline_TH_mode[j] = get_bits(gb, 2); + if (tm_params->three_Spline_TH_mode[j] == 0 || tm_params->three_Spline_TH_mode[j] == 2) { + if (get_bits_left(gb) < 8) + return AVERROR_INVALIDDATA; + tm_params->three_Spline_TH_enable_MB[j] = (AVRational){get_bits(gb, 8), 255}; } + tm_params->three_Spline_TH_enable[j] = (AVRational){get_bits(gb, 12), 4095}; + tm_params->three_Spline_TH_Delta1[j] = (AVRational){get_bits(gb, 10), 1023}; + tm_params->three_Spline_TH_Delta2[j] = (AVRational){get_bits(gb, 10), 1023}; + tm_params->three_Spline_enable_Strength[j] = (AVRational){get_bits(gb, 8), 255}; } + } } } From patchwork Thu Feb 2 07:02:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?emhpbGl6aGFvKOi1teW/l+eriyk=?= X-Patchwork-Id: 40210 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp124646pzk; Wed, 1 Feb 2023 23:11:38 -0800 (PST) X-Google-Smtp-Source: AK7set+DwMFZq+Ov6t6BpU2bKoQMz0Ubue9vS68jms3qlB0ylgsIx/PU3S5/muL+dXHg33z6ULOZ X-Received: by 2002:a05:6402:1bc6:b0:499:bcd7:a968 with SMTP id ch6-20020a0564021bc600b00499bcd7a968mr4912319edb.22.1675321898261; Wed, 01 Feb 2023 23:11:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675321898; cv=none; d=google.com; s=arc-20160816; b=SbtWdNkM/FiRFhI49uB9xsbk+0yDXESx+jUZe1vT8di9a0WccdSjzqZWs2psjfa+iz 801YVcP84XJGfw07IMUxwMG6HIfY9U4gYUlxtVeHbRHbrxh9SMCFPam7gIFCSElkkbhz v5hBaT3KN5QO2YoftDBjDup6nRfA0qX89Y4bpdX/B61hW0cSBO644bfXPWunRXpji6vL OZKnRaCyCGX6JrxCRhWqgDcswz26iJdbgy1qbJiWgnQj+fATLrlkf1LI70Mk8X9l3xuN H7kda23Z4HEAwKLSrLoLDGiTwOTdNc8jwy0r+/Q4DyIIyxrxHvncDdeJ9/4zsCNg3L6p UjsQ== 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=GXVtOuWwze9WRFggpM7uy4USk6maAA/3xXz4cCq/mEE=; b=prmBdAzn1EfhPTRvL19FrPyB2rpbRTGVqc6OJotJDAJ3EdKZF+MQRIdeJz9TJR1Uk+ /Aio0zMkVFW4WDQiXw2gYkaVGrcJ57feTz3Bybtw2u/ok6zySPstsoTGEGCD5x49uK+b 1eyxohSj2KTp+ZXPWfFaBSPxxfUOOCm2kExUNYgrvyPpIdUIp1/9MsOVdT64Ys43zlZY fWXZ0EKGu9tcisKBwxdfQO7mbOREM2e+P4qyLwpuj7Hk2MRtu0zZcKK0ZL6e5Om6JRxI xtKvZyqKXV0TE5kR5F21PQh1cclsSG7lkN/2JLXtnKqS0GHrRFRDOlKPnsYjNyox+nGx uHsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=ZuyqI385; 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 f5-20020aa7d845000000b004a0ada3435esi14246967eds.414.2023.02.01.23.11.37; Wed, 01 Feb 2023 23:11: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=ZuyqI385; 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 DCFE868A558; Thu, 2 Feb 2023 09:11:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-137.mail.qq.com (out162-62-57-137.mail.qq.com [162.62.57.137]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BA7CD68BCFC for ; Thu, 2 Feb 2023 09:11:06 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1675321864; bh=A7s4WbyNfyFggSuWvstmxXnd6PrxEIzizSsC0NlqS8A=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ZuyqI385D+pwk4hOthka3OgWKf+hPsdAOzDerrgIiQ5B2Ie73wLzcgv2JHE3pP+fp P9UEYIt7snbDtt6JZuDxK4grHI+I2mIk4v785H2R3qj9e5XeETmyd8qjMz4M3nlxES 652ngOwZQz5OvxRULoOLovTXTmf3iG96Pt8RVkdQ= 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: xmsmtpt1675321863tiglbe8s3 Message-ID: X-QQ-XMAILINFO: OC8ISZqMH3qFxvZZyEs2FGkPctllPIuc0pHfiAZ/lHKujWNWJO0BropZPJ5RO/ pCqifWy9m4pilQPX8XAbzkyhv0Xs5MZzM6Xi4qiOvDeQb4LTOA1tRmkD7XJxwVh0LXSgkZ1j7eAD KwHoCEbUfcEewr4IEht9kfiS+vEwwMmZKZLNl2BoGYan/kmxCPHPnFgMG/3WTh6bVcz6n2UrJOsF aS3LyeoN1SqNcV4kvNItkiyesXVp3fZd0Vvmw22d+5UwyLMQ7/i0fdX8MXULQ0Jogf62CLM5eBGd 69IFT0qpuDjOUpK8posyXbki7fb+bX3ImQxU/F73oWzgjoM2vcGduc1/U9wbQ3HqoJ0Djt7cHdRv pQtTBWGKX5tezQFIiiG2jxqSljwa/Uwkq17+0i2FpMOBWBf1LI55d08rJ7DWsN5qN5EN4oTiLbol P6D2r5/Ygi9QNqpG+E+ti22eIzdDYvdDiLs8jBy7JUU4+IzcCSeZMKlFdBM3DDO0CjytOa1RGV1c dkoPPInZMy/PxY7wRG4YuysnzW7zBlhHKfdW67FHH8RO4Bm6ERYFMaYUUJlW/s/fwFAx004eOtS+ tHN/ZBM3WQDp5Un88HLVjPBUcQzr64IXTL9c9+uAuKYe4+/MkW2vfnw613gIBFlH8wnjWtPOHdhM RvGFUAtLRub4HpBJFnelkq5rqrBPw/wz8VYFd3Pr9eTiqRezKjnROBJs4QvJRKecCfWMg6JaGdNw royakke8B5yrUbJjeirsL0PJtTlcOyPXunSnWoPdBtnqqFRG8ANQwz3j03RtfyD0/RQeOHo2aaEZ pbczQSkwdrOdbCI30cCgAcTv2/UQ8Zi0sHat53lG2ZAeI24MMZVI0+CNsSwhSbajwXAdYpNjBMrT h9T14aDCFUcP51mPlMwnxfprdL6XjA1RYEueRUxTmfzL73r3QWMYIKH9j+w0Z405TGpNc9kJtsZv vMODjQ1P+KEunNCQjrS8nZAOueKGpTVGtc4B6ba3A= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Feb 2023 15:02:08 +0800 X-OQ-MSGID: <20230202070208.1962086-7-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 6/6] 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: O0HHsnxCsG2s 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 a853c70f56..65e1db5b68 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];