From patchwork Thu Oct 14 13:08:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 31109 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp7144932ioa; Thu, 14 Oct 2021 06:09:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw8AIUJfovVCTGroa2qOxm2TSIZ+eTfPg8Y0nvHEI8YBDxE5AasqqEDlm68f1YqpbM0B9Fq X-Received: by 2002:a17:907:2bdf:: with SMTP id gv31mr3618967ejc.521.1634216972008; Thu, 14 Oct 2021 06:09:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634216972; cv=none; d=google.com; s=arc-20160816; b=DVJOnLkx/saOz09emfznQgGev4hqG6ElrZWyZxxxGrHJhJTPdqLnxoUTSgzM0rixqs usAX+a1TzKcVojN8CK7tPuYDAThLWtRAHN9w8ADZ/QhC+Py8PRvVVe9xmxfTPJW+0U8/ QPekx8EcHjn1rtqe3r5UMWKDR5aHp57IogvnblUQTLfnFzv3EgikcJ+nEhXnXK0jg4HM /wyezLE8teXN+Ni0BvhqRsAv62Ej1eFuswQl+nde7fAre7uN/nHAotzFAOeybV40CInH X0aVrewcNFIO9TViXHMO/o0Q8+aPO9eOPYK58rIfwfAPEmpL5eDk84nbIodfESveXQfd exoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=aSeX7E/5eDZfF8dzWz4Y34w9B5etwU5r93BL4RtXHxg=; b=0SAGuOFYKs67LLbcybIhKp6KK6rSlprbRRfF+oZBPA4VgeEpQ+xQevcH8hswIpLKJ8 xB9dTUWiaukYrQqDDbtZtHANEo3DqGYREcGlQQMfNyaZnQqs6vYGDEXPyJXuBPvV1Isv cCD/s60Df0+QECy0Eq345g7+CYq/GdAwGc+jsMkxA1xnzCQFxgsm7yyRltTE84bYQ3an 0J/wM5vKZ7vVh7viP1nhACOI4DvLwsqwSIeEAsEZjDT1DdaJxdSOny2lhyQ8WWFaAsV1 /zgnqT6m6WWZbjlTId1bH0S7YdGIoklHjRLGr6EAfO12yQSFzdNzyTm7b2ToKWPh5rlL isbw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Qc4Gq3rB; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k5si4005110ejo.440.2021.10.14.06.09.31; Thu, 14 Oct 2021 06:09:31 -0700 (PDT) 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=@gmail.com header.s=20210112 header.b=Qc4Gq3rB; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 099E568AA16; Thu, 14 Oct 2021 16:09:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9143768A9C4 for ; Thu, 14 Oct 2021 16:09:11 +0300 (EEST) Received: by mail-pg1-f179.google.com with SMTP id r2so5477577pgl.10 for ; Thu, 14 Oct 2021 06:09:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qlcJsVVQtboQE57m3B73K4D71FM9/s3qn5WDg9NbMxI=; b=Qc4Gq3rBJNe3tqE5hTO+WsxUky0u324uwga9AHWTUpA1HfBZZaUTMItgg998oswZLj kO4CBhNTidH4hz8cfK2MeQaIL6EyPPtxrrdVPAAToIZAma4Z0p9COM/lAnrCBqA0wife pyNAntnOdhdtQFKsCjAyY6MIALCAFmI0lUV7pgJFCX10LvcHUi5fmumGy0n50uSR6zw6 xv+qadRook4VRbTj+vmRHa0YV3xuoKVTixeiziFSvu1yg9x196m1CxfqYMjTAXva7NUr sUN/U9wt6rbiT0aqWVThx2eEuspI4p9j4hH+HIfHzMkKPXSmenXSf5OkLYBHJGQdE0Ds HXTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=qlcJsVVQtboQE57m3B73K4D71FM9/s3qn5WDg9NbMxI=; b=ISRxLIFb4LwL/fi/u5Jyu9B7fPb1Jc8h8jNGVvO+VIhLDNK6yXd7EC1xKs/8ios+WX xYEWIcMPIj+vxEFUUiRe+TBbTiqwgvRNavyZlQ5c9mzeKs2qQRq6X8lS1KfUAt7PIkXp da7I0+wgZ6iYcWiFGxSLlgCoyY/E6h6okhJP+uxXhpTCqBsIi87kOL2mdb1h2dbgk1nw ryXcr9iMoDOX8YGn7iXEvUmsXOdZkuVDZOZbH5qzWK+e+CTB+i4XsifqTdDFbP+vteQU zU/acOgUzAMFqFsWJllrQKhb840YKxnhjOsC23dgxCwAYOSBogX5O4rWkN0pUNhJRsIL SXLA== X-Gm-Message-State: AOAM532N+U69EBl32R7Qc267TfUWNNBCYSxxKrVltILfQGD5GnnxOU4P eMlG8n4r84Llv9uTZMquqwx8ADHeQy4= X-Received: by 2002:a63:5544:: with SMTP id f4mr4163653pgm.431.1634216949734; Thu, 14 Oct 2021 06:09:09 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id 66sm2504789pfu.185.2021.10.14.06.09.08 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Oct 2021 06:09:09 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 14 Oct 2021 21:08:56 +0800 Message-Id: <1634216942-20329-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1634216942-20329-1-git-send-email-lance.lmwang@gmail.com> References: <1634216942-20329-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/8] avfilter/vf_showinfo: small adjustments for the HDR10+ dump 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: LzQnG1PKz9Td From: Limin Wang summary for the adjustments: 1, remove the extra "," in the ,} ...{0.2004,0.3001,0.4008,0.5005,0.6002,0.7009,0.8006,0.9013,} to ...{0.2004,0.3001,0.4008,0.5005,0.6002,0.7009,0.8006,0.9013} 2, add "," between the } and new field } fraction_bright_pixels to }, fraction_bright_pixels 3, remove the extra space between "} }" ...{0.2004,0.3001,0.4008,0.5005,0.6002,0.7009,0.8006,0.9013,} } to ...{0.2004,0.3001,0.4008,0.5005,0.6002,0.7009,0.8006,0.9013,}} Signed-off-by: Limin Wang --- libavfilter/vf_showinfo.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c index c8c7b98..ff438e7 100644 --- a/libavfilter/vf_showinfo.c +++ b/libavfilter/vf_showinfo.c @@ -221,7 +221,7 @@ static void dump_dynamic_hdr_plus(AVFilterContext *ctx, AVFrameSideData *sd) av_log(ctx, AV_LOG_INFO, "num_windows: %d, ", hdr_plus->num_windows); for (int w = 1; w < hdr_plus->num_windows; w++) { AVHDRPlusColorTransformParams *params = &hdr_plus->params[w]; - av_log(ctx, AV_LOG_INFO, "window %d { ", w); + av_log(ctx, AV_LOG_INFO, w > 1 ? ", window %d { " : "window %d { ", w); av_log(ctx, AV_LOG_INFO, "window_upper_left_corner: (%5.4f,%5.4f),", av_q2d(params->window_upper_left_corner_x), av_q2d(params->window_upper_left_corner_y)); @@ -242,7 +242,7 @@ static void dump_dynamic_hdr_plus(AVFilterContext *ctx, AVFrameSideData *sd) params->semimajor_axis_external_ellipse); av_log(ctx, AV_LOG_INFO, "semiminor_axis_external_ellipse: %d, ", params->semiminor_axis_external_ellipse); - av_log(ctx, AV_LOG_INFO, "overlap_process_option: %d}, ", + av_log(ctx, AV_LOG_INFO, "overlap_process_option: %d}", params->overlap_process_option); } av_log(ctx, AV_LOG_INFO, "targeted_system_display_maximum_luminance: %9.4f, ", @@ -252,7 +252,7 @@ static void dump_dynamic_hdr_plus(AVFilterContext *ctx, AVFrameSideData *sd) for (int i = 0; i < hdr_plus->num_rows_targeted_system_display_actual_peak_luminance; i++) { av_log(ctx, AV_LOG_INFO, "("); for (int j = 0; j < hdr_plus->num_cols_targeted_system_display_actual_peak_luminance; j++) { - av_log(ctx, AV_LOG_INFO, "%5.4f,", + av_log(ctx, AV_LOG_INFO, i ? ",%5.4f" : "%5.4f", av_q2d(hdr_plus->targeted_system_display_actual_peak_luminance[i][j])); } av_log(ctx, AV_LOG_INFO, ")"); @@ -264,9 +264,9 @@ static void dump_dynamic_hdr_plus(AVFilterContext *ctx, AVFrameSideData *sd) AVHDRPlusColorTransformParams *params = &hdr_plus->params[w]; av_log(ctx, AV_LOG_INFO, "window %d {maxscl: {", w); for (int i = 0; i < 3; i++) { - av_log(ctx, AV_LOG_INFO, "%5.4f,",av_q2d(params->maxscl[i])); + av_log(ctx, AV_LOG_INFO, i ? ",%5.4f" : "%5.4f",av_q2d(params->maxscl[i])); } - av_log(ctx, AV_LOG_INFO, "} average_maxrgb: %5.4f, ", + av_log(ctx, AV_LOG_INFO, "}, average_maxrgb: %5.4f, ", av_q2d(params->average_maxrgb)); av_log(ctx, AV_LOG_INFO, "distribution_maxrgb: {"); for (int i = 0; i < params->num_distribution_maxrgb_percentiles; i++) { @@ -274,35 +274,35 @@ static void dump_dynamic_hdr_plus(AVFilterContext *ctx, AVFrameSideData *sd) params->distribution_maxrgb[i].percentage, av_q2d(params->distribution_maxrgb[i].percentile)); } - av_log(ctx, AV_LOG_INFO, "} fraction_bright_pixels: %5.4f, ", + av_log(ctx, AV_LOG_INFO, "}, fraction_bright_pixels: %5.4f", av_q2d(params->fraction_bright_pixels)); if (params->tone_mapping_flag) { - av_log(ctx, AV_LOG_INFO, "knee_point: (%5.4f,%5.4f), ", av_q2d(params->knee_point_x), av_q2d(params->knee_point_y)); + av_log(ctx, AV_LOG_INFO, ", knee_point: (%5.4f,%5.4f), ", av_q2d(params->knee_point_x), av_q2d(params->knee_point_y)); av_log(ctx, AV_LOG_INFO, "bezier_curve_anchors: {"); for (int i = 0; i < params->num_bezier_curve_anchors; i++) { - av_log(ctx, AV_LOG_INFO, "%5.4f,", + av_log(ctx, AV_LOG_INFO, i ? ",%5.4f" : "%5.4f", av_q2d(params->bezier_curve_anchors[i])); } - av_log(ctx, AV_LOG_INFO, "} "); + av_log(ctx, AV_LOG_INFO, "}"); } if (params->color_saturation_mapping_flag) { - av_log(ctx, AV_LOG_INFO, "color_saturation_weight: %5.4f", + av_log(ctx, AV_LOG_INFO, ", color_saturation_weight: %5.4f", av_q2d(params->color_saturation_weight)); } - av_log(ctx, AV_LOG_INFO, "} "); + av_log(ctx, AV_LOG_INFO, "}"); } if (hdr_plus->mastering_display_actual_peak_luminance_flag) { - av_log(ctx, AV_LOG_INFO, "mastering_display_actual_peak_luminance: {"); + av_log(ctx, AV_LOG_INFO, ", mastering_display_actual_peak_luminance: {"); for (int i = 0; i < hdr_plus->num_rows_mastering_display_actual_peak_luminance; i++) { av_log(ctx, AV_LOG_INFO, "("); for (int j = 0; j < hdr_plus->num_cols_mastering_display_actual_peak_luminance; j++) { - av_log(ctx, AV_LOG_INFO, " %5.4f,", + av_log(ctx, AV_LOG_INFO, i ? ",%5.4f" : "%5.4f", av_q2d(hdr_plus->mastering_display_actual_peak_luminance[i][j])); } av_log(ctx, AV_LOG_INFO, ")"); } - av_log(ctx, AV_LOG_INFO, "} "); + av_log(ctx, AV_LOG_INFO, "}"); } }