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