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: Zhao Zhili 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;