From patchwork Tue Feb 27 13:43:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 46567 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51b:b0:19e:cdac:8cce with SMTP id gm27csp1998146pzb; Tue, 27 Feb 2024 05:43:28 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXXmnW4xMfZnBMFaPIHhmBCOeM5iXWIoGHzcRg+j79F11NmNAJWjxKV+wedR4nPiD5EQkbfFchgFzc4LSfM3Mk+wa7nP9HPDFNh1Q== X-Google-Smtp-Source: AGHT+IFclYgKrfBP4nqoeNdwZnz/L5e1gMNsHbugYpGfqEO/5KRsWJH3Y5HUZsNzGqTxWH+B3D2T X-Received: by 2002:a17:907:1c25:b0:a43:bf24:6f7e with SMTP id nc37-20020a1709071c2500b00a43bf246f7emr1289561ejc.15.1709041408279; Tue, 27 Feb 2024 05:43:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709041408; cv=none; d=google.com; s=arc-20160816; b=NdFID+KGEASX14YFQE2EIZoctNfLBVI6ivPPHEi+qXxPfIK9TZyGwm4O71Yog4yaYI zGX5y6Y3jeEjv4zkwPoubuTfgLdvU56jFPCWVTfabiyPocj5Ue15glcgj2y8ld3vSLJD hYuX2vjbcPCTW+vFbKGr44x/sEmBJ9oe0/5gjig12VxKZQ7B9MqdJWl96cJiMiyv6pYg tVgmBgfGJGqlC217zjxa0lC4EUJmNw+VKMrQLgaG1p/O48pusXuON37kv7mDVe9Uv74U Crw0Y8FDDWqCpLQI+pNrrO4DOqAvOGmreD+6AM/KCl/MSyN+hCU3UsQwy67ypiR+sVI3 YnSA== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=r7VGPZUlghH7a+7NbT+OKJF1N2+nRmUiFPSpjRbHhpQ=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=fNO/QyUXXPAsqqfbr5PobpWjHR0qWjnhUmGo+23wdtlQZRi+7v9VD/MngTM5iz7+C+ W36ByiIAB0Mw50SMPzwCHUNOQnvEAx2r7PrJBuNUTtB/K6INo616OYdZu2zMTp1kAPPW tszr9ieROV3AiIm9LIAv0X1vXJkFf0npccS7L1N/EfNN5rs1VLWK/ibaSJVSJ/O+OhHL H2JPYAGwrMOzqKZHU8tgc2eZ9n6pYqVfg9Jole6yqtCfx0X12xfPmUsblWUly2Aufl/v GGMi15buIrx18zZCOQ0rpxEFyAmbmmpAfKLzhEzGoA7SP8V6+YtAadKJT5mewdS8F8Ml WpJw==; 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=ZXGETmr8; 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 bj19-20020a170906b05300b00a3eb0a46e52si744768ejb.724.2024.02.27.05.43.27; Tue, 27 Feb 2024 05:43:28 -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=@haasn.xyz header.s=mail header.b=ZXGETmr8; 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 1EC9968C81A; Tue, 27 Feb 2024 15:43:25 +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 C699E68C81A for ; Tue, 27 Feb 2024 15:43:17 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1709041396; bh=pgvev/w1o09dDvgzpVnYza+K8qMZWypTAgiJ5h3MBY4=; h=From:To:Cc:Subject:Date:From; b=ZXGETmr8+NmTUF7kXL68gQg6oEm8WcahysChJqgRg2q+v89XOa/7RTOmISEz5IcjS 9H49JMVau3hgaka1oGDQsmT7nBkRPwKtbaA4nHugcMqteI7PbyxtGTyYCIEbWzmE7f GabJJZz2cSlLruzfg5itzp2NlTr6v6v8rF3caEtY= Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 56D88434A2; Tue, 27 Feb 2024 14:43:16 +0100 (CET) From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Tue, 27 Feb 2024 14:43:12 +0100 Message-ID: <20240227134313.46097-1-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.43.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avfilter/vf_showinfo: add AVFilmGrainAOMParams support 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: BkUnwFF3Zgsb From: Niklas Haas For my own testing purposes. --- libavfilter/vf_showinfo.c | 42 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c index 309de28df91..830170363bc 100644 --- a/libavfilter/vf_showinfo.c +++ b/libavfilter/vf_showinfo.c @@ -462,8 +462,46 @@ static void dump_sei_film_grain_params_metadata(AVFilterContext *ctx, const AVFr switch (fgp->type) { case AV_FILM_GRAIN_PARAMS_NONE: - case AV_FILM_GRAIN_PARAMS_AV1: - return; + break; + case AV_FILM_GRAIN_PARAMS_AV1: { + const AVFilmGrainAOMParams *aom = &fgp->codec.aom; + const int num_ar_coeffs_y = 2 * aom->ar_coeff_lag * (aom->ar_coeff_lag + 1); + const int num_ar_coeffs_uv = num_ar_coeffs_y + !!aom->num_y_points; + av_log(ctx, AV_LOG_INFO, "y_points={ "); + for (int i = 0; i < aom->num_y_points; i++) + av_log(ctx, AV_LOG_INFO, "{%d, %d} ", aom->y_points[i][0], aom->y_points[i][1]); + av_log(ctx, AV_LOG_INFO, "}; chroma_scaling_from_luma=%d; ", aom->chroma_scaling_from_luma); + for (int uv = 0; uv < 2; uv++) { + av_log(ctx, AV_LOG_INFO, "uv_points[%d]={ ", uv); + for (int i = 0; i < aom->num_uv_points[uv]; i++) + av_log(ctx, AV_LOG_INFO, "{%d %d} ", aom->uv_points[uv][i][0], aom->uv_points[uv][i][1]); + av_log(ctx, AV_LOG_INFO, "}; "); + } + av_log(ctx, AV_LOG_INFO, "scaling_shift=%d; ", aom->scaling_shift); + av_log(ctx, AV_LOG_INFO, "ar_coeff_lag=%d; ", aom->ar_coeff_lag); + if (num_ar_coeffs_y) { + av_log(ctx, AV_LOG_INFO, "ar_coeffs_y={ "); + for (int i = 0; i < num_ar_coeffs_y; i++) + av_log(ctx, AV_LOG_INFO, "%d ", aom->ar_coeffs_y[i]); + av_log(ctx, AV_LOG_INFO, "}; "); + } + for (int uv = 0; num_ar_coeffs_uv && uv < 2; uv++) { + av_log(ctx, AV_LOG_INFO, "ar_coeffs_uv[%d]={ ", uv); + for (int i = 0; i < num_ar_coeffs_uv; i++) + av_log(ctx, AV_LOG_INFO, "%d ", aom->ar_coeffs_uv[uv][i]); + av_log(ctx, AV_LOG_INFO, "}; "); + } + av_log(ctx, AV_LOG_INFO, "ar_coeff_shift=%d; ", aom->ar_coeff_shift); + av_log(ctx, AV_LOG_INFO, "grain_scale_shift=%d; ", aom->grain_scale_shift); + for (int uv = 0; uv < 2; uv++) { + av_log(ctx, AV_LOG_INFO, "uv_mult[%d] = %d; ", uv, aom->uv_mult[uv]); + av_log(ctx, AV_LOG_INFO, "uv_mult_luma[%d] = %d; ", uv, aom->uv_mult_luma[uv]); + av_log(ctx, AV_LOG_INFO, "uv_offset[%d] = %d; ", uv, aom->uv_offset[uv]); + } + av_log(ctx, AV_LOG_INFO, "overlap_flag=%d; ", aom->overlap_flag); + av_log(ctx, AV_LOG_INFO, "limit_output_range=%d; ", aom->limit_output_range); + break; + } case AV_FILM_GRAIN_PARAMS_H274: { const AVFilmGrainH274Params *h274 = &fgp->codec.h274; const char *color_range_str = av_color_range_name(h274->color_range);