From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id C6C6C4A044 for ; Mon, 18 Mar 2024 16:57:17 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8593468D31E; Mon, 18 Mar 2024 18:57:05 +0200 (EET) 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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); -- 2.44.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".