From patchwork Mon Mar 18 16:54:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 47181 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:958e:b0:1a3:31a3:7958 with SMTP id iu14csp1139567pzb; Mon, 18 Mar 2024 09:57:21 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUqS9E0WU28D+uYRuZsIyunwJAapNgq6gYsXvwVulSqhRcFhAQIaQt8qZKjAEdYCaYfT9Xdm48cjqCg/Qe3AUZBm+8zrlrkHcoB+A== X-Google-Smtp-Source: AGHT+IFw1K/VeugCUFy6h6LRWrA5HZ1uPvOuLglvoMxyustE+2eXpC6daDFum9eTuJ+1R2Ds/wRG X-Received: by 2002:aa7:cd58:0:b0:568:260b:e502 with SMTP id v24-20020aa7cd58000000b00568260be502mr6764459edw.13.1710781040823; Mon, 18 Mar 2024 09:57:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710781040; cv=none; d=google.com; s=arc-20160816; b=BVruxsFb2lXj/1Dc8XiEDlh1rnVC/QQEBBEjSxOO/7ZjOTV7u0m9Pse6rafI6qt+CT NvsssPVKlq03w4mv9ao5Jb8P8cr5/iwL3PFHcPy4qjMqU6pu9ckSjfklw0kz1CN53Mex qrP80XpbJ1TPJsc7HDZEoboLwhohITfJfHBaF6t4qQjYVUvywxi/k000SM9QX012ETkV 2laUw5fY+fO+GlqtAWKVAlFi6UTdmyWGZLxcG59E5j1augBrFYyC3sCx6T54eROQOAGH 9r/ScQNXzWvBW0Zzez+Jc3zU7HfUYW19PD3mTJ7yTSQppLT8Cxkl8nTCeGl0LWA6p1+w NbwA== 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 :message-id:date:to:from:dkim-signature:delivered-to; bh=YnqthYt7+DX7waGbfPd/2FJGalpJKUI68INQxasFANU=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=ppUHjW/YgqIXCkmFH7ZKsO2MXky61wE3QdPPfKS6wfFHco13s+Sz1lXk5qso6e034d hctA2P7UDt+7f8U5FVJNtkzk7GriGh+wlwyojqihGKu0EYzjJWkhUmdPxkE6H7Cddsep 1qwMZYh7sDRCUloUi0jxFRS8WC/kv5saPXgTJEU/3WB5x57b7ko01A9csvCHF1Rm/BPQ lVMnna0PjYYp+kA60HQ/XbIhMtp29XkDfAX87InE0zqccmH9bMQRWMOhZxVs6TUpnC3d 1j+yNExWPXooi3RsrinNwLAokIH2Pb2yScYNdbDXuZYU7P5oDKvcBWnvR+VXb69sDPDc B/ZA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=mJjwLng6; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t13-20020a056402240d00b00567e1287325si4642631eda.445.2024.03.18.09.57.20; Mon, 18 Mar 2024 09:57:20 -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=@haasn.xyz header.s=mail header.b=mJjwLng6; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C5BB468D2FD; Mon, 18 Mar 2024 18:57:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CD54868D269 for ; Mon, 18 Mar 2024 18:56:57 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1710781017; bh=wo7DjPX0S1YRHrXCO/m/gUuKRw+uEJCeUy4FPcsbjqc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mJjwLng6orSeTGVu3RV8KNlRDudLlFFmFgtkvIut0QnU9pB3fqHgIfQOa3KNSF122 +2w0YzbYa7T5kFRjM36qXPHQJg/9BOKPg074osyBbyKZUxfFVcfhQamRlJ7d2bfMrP NEQulg+5ILAFphuVBXU6DVvyDBr7aRKVNVtJVV6Y= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 8D26F4344E; Mon, 18 Mar 2024 17:56:57 +0100 (CET) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 Mar 2024 17:54:11 +0100 Message-ID: <20240318165651.75520-4-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240318165651.75520-1-ffmpeg@haasn.xyz> References: <20240318165651.75520-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 03/13] avfilter/vf_showinfo: adapt to new AVFilmGrainParams 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: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: gKqJAKK+tKYV From: Niklas Haas --- libavfilter/vf_showinfo.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c index 095cb22639f..28d8ea76e9b 100644 --- a/libavfilter/vf_showinfo.c +++ b/libavfilter/vf_showinfo.c @@ -452,6 +452,11 @@ static void dump_sei_film_grain_params_metadata(AVFilterContext *ctx, const AVFr [AV_FILM_GRAIN_PARAMS_H274] = "h274", }; + const char *color_range_str = av_color_range_name(fgp->color_range); + const char *color_primaries_str = av_color_primaries_name(fgp->color_primaries); + const char *color_trc_str = av_color_transfer_name(fgp->color_trc); + const char *colorspace_str = av_color_space_name(fgp->color_space); + if (fgp->type >= FF_ARRAY_ELEMS(film_grain_type_names)) { av_log(ctx, AV_LOG_ERROR, "invalid data\n"); return; @@ -459,6 +464,16 @@ static void dump_sei_film_grain_params_metadata(AVFilterContext *ctx, const AVFr av_log(ctx, AV_LOG_INFO, "type %s; ", film_grain_type_names[fgp->type]); av_log(ctx, AV_LOG_INFO, "seed=%"PRIu64"; ", fgp->seed); + av_log(ctx, AV_LOG_INFO, "width=%d; ", fgp->width); + av_log(ctx, AV_LOG_INFO, "height=%d; ", fgp->height); + av_log(ctx, AV_LOG_INFO, "subsampling_x=%d; ", fgp->subsampling_x); + av_log(ctx, AV_LOG_INFO, "subsampling_y=%d; ", fgp->subsampling_y); + av_log(ctx, AV_LOG_INFO, "color_range=%s; ", color_range_str ? color_range_str : "unknown"); + av_log(ctx, AV_LOG_INFO, "color_primaries=%s; ", color_primaries_str ? color_primaries_str : "unknown"); + av_log(ctx, AV_LOG_INFO, "color_trc=%s; ", color_trc_str ? color_trc_str : "unknown"); + av_log(ctx, AV_LOG_INFO, "color_space=%s; ", colorspace_str ? colorspace_str : "unknown"); + av_log(ctx, AV_LOG_INFO, "bit_depth_luma=%d; ", fgp->bit_depth_luma); + av_log(ctx, AV_LOG_INFO, "bit_depth_chroma=%d; ", fgp->bit_depth_chroma); switch (fgp->type) { case AV_FILM_GRAIN_PARAMS_NONE: @@ -504,18 +519,7 @@ static void dump_sei_film_grain_params_metadata(AVFilterContext *ctx, const AVFr } case AV_FILM_GRAIN_PARAMS_H274: { const AVFilmGrainH274Params *h274 = &fgp->codec.h274; - const char *color_range_str = av_color_range_name(h274->color_range); - const char *color_primaries_str = av_color_primaries_name(h274->color_primaries); - const char *color_trc_str = av_color_transfer_name(h274->color_trc); - const char *colorspace_str = av_color_space_name(h274->color_space); - av_log(ctx, AV_LOG_INFO, "model_id=%d; ", h274->model_id); - av_log(ctx, AV_LOG_INFO, "bit_depth_luma=%d; ", h274->bit_depth_luma); - av_log(ctx, AV_LOG_INFO, "bit_depth_chroma=%d; ", h274->bit_depth_chroma); - av_log(ctx, AV_LOG_INFO, "color_range=%s; ", color_range_str ? color_range_str : "unknown"); - av_log(ctx, AV_LOG_INFO, "color_primaries=%s; ", color_primaries_str ? color_primaries_str : "unknown"); - av_log(ctx, AV_LOG_INFO, "color_trc=%s; ", color_trc_str ? color_trc_str : "unknown"); - av_log(ctx, AV_LOG_INFO, "color_space=%s; ", colorspace_str ? colorspace_str : "unknown"); av_log(ctx, AV_LOG_INFO, "blending_mode_id=%d; ", h274->blending_mode_id); av_log(ctx, AV_LOG_INFO, "log2_scale_factor=%d; ", h274->log2_scale_factor);