From patchwork Fri Mar 29 15:47:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Gaullier X-Patchwork-Id: 47651 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp2061621pzb; Fri, 29 Mar 2024 08:48:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXTKxxoVBJaQP3RbkgN0Jk0jgxRLWmj/WYdLpf0QjQ5zvzaZt9C0Oma5frN8k/eVkON311TB+dQFIqly7CsO0LLv9FK1bJPtjx1aA== X-Google-Smtp-Source: AGHT+IE2ezeEwfzMBJuTZ8UIzfcv/9ekB29z+ryBi/aAXWQXfltZzqD5mXFl9zJldFI2zM8ohQ6b X-Received: by 2002:adf:e412:0:b0:33e:773c:ff6 with SMTP id g18-20020adfe412000000b0033e773c0ff6mr2208313wrm.46.1711727283099; Fri, 29 Mar 2024 08:48:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711727283; cv=none; d=google.com; s=arc-20160816; b=FqkFtYs9bcMkfwClQLCxPjZjLQh7weXh6TfPmEk+Sdz+KlGfY3TRBIRF9WzdM+v3O9 QuioiWuClQpEtugTJ7r4lIX40WVLYtxaBymeXI2bCj87EJxYf0eWp6NlxHn15hF5L+dk kxnqEtg9R+H9VGhlij1D4y3daqr62FpHi/t/uPytQQv1J1l8E+MRze8XVeWHu0o7oAFN 6qIPp/1ISFem5wjzK0ImYgQlfVjhIyi8et7rBMNPj9YQotAQwAzpsNzJoYB8zIj9thG8 qhmy5TqHNs/q33PdDRWTySvwcwmT09Sq8uPvD4Iq3Z9jeDIzSWXOZq12jRBBnTN9B/EZ GVPg== 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:delivered-to; bh=ggYUTIQdC0D5c2GqTuGqv+tOdpfrRmf2A54pIeM+xjM=; fh=zgMS+X4RExv2k7fU8QdWClnqVJdqO/9UbUuBS5xxJDs=; b=JWpTsVPxSZkEXn2aVaJUme2h5CwKg0+vTL3vyXVFA5ucyeTzuiiDt8brER6db2TysA 0xPT42gBaWiZW53jXHHeCH6suJJzw2+3kRdHTHVAeJZ656kQ9oQU5eECx5R915/qz/HI l2NIlp8qNHnirxp5HmewgqiS4v+4yFySwExxL1v9DXHDIeGxnbqVM0Y901TZqhLqUBHa GO1kAPkSZi1JYFhefqU5bQC+fKi4vQJFU+ee1uqlSsk3/wjNSw8lKLOS3yFVD3GIQa7E 04E3seher7BHfwHiZoL7F2iAqgYfaPyMZ4x6iejMHZoPmJ4gWeeGS429HWy/Hn7VNpCa nb7w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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 oz19-20020a1709077d9300b00a4df27c0bc2si1913900ejc.310.2024.03.29.08.48.02; Fri, 29 Mar 2024 08:48:03 -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; 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 CE5E368D732; Fri, 29 Mar 2024 17:47:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from srv-infra-2.infra.inf.glb.tvvideoms.com (www.inf.tvvideoms.com [213.205.126.156]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BD3A968C37D for ; Fri, 29 Mar 2024 17:47:51 +0200 (EET) Received: from cji.paris (unknown [172.16.3.159]) by srv-infra-2.infra.inf.glb.tvvideoms.com (Postfix) with ESMTP id DD87A4135A; Fri, 29 Mar 2024 15:47:50 +0000 (UTC) From: Nicolas Gaullier To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Mar 2024 16:47:46 +0100 Message-Id: <20240329154746.439232-3-nicolas.gaullier@cji.paris> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20240329154746.439232-1-nicolas.gaullier@cji.paris> References: <20240329154746.439232-1-nicolas.gaullier@cji.paris> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/2] avfilter/vf_colorspace: Use colorspace negotiation API 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: Nicolas Gaullier Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: iUqcSStzOSu6 Fixes a regression due to the fact that the colorspace filter does not use the new API introduced by 8c7934f73ab6c568acaa. The scale filter uses it since 45e09a30419cc2a7251e, and the setparams filter since 3bf80df3ccd32aed23f0. Example 1 - color_range specified and chained with scale filter: ffmpeg -f lavfi -i testsrc -vf setparams=color_primaries=bt470bg: color_trc=smpte170m:colorspace=bt470bg,colorspace=bt709:range=tv,scale ,showinfo -f null -frames 1 - Before: color_range:unknown color_space:bt470bg ... After: color_range:tv color_space:bt709 ... Example 2 - color_range pass-through: ffmpeg -f lavfi -i testsrc -vf "setparams=color_primaries=bt470bg: color_trc=smpte170m:colorspace=bt470bg:range=unknown, setparams=range=pc:enable='between(n,1,2)', setparams=range=tv:enable='between(n,2,3)', colorspace=bt709,showinfo" -f null -frames 3 - 2>&1|awk "/color_/ {print \$4}" Before: color_range:tv color_range:tv color_range:tv After: color_range:unknown color_range:pc color_range:tv Signed-off-by: Nicolas Gaullier --- libavfilter/vf_colorspace.c | 64 +++++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 27 deletions(-) diff --git a/libavfilter/vf_colorspace.c b/libavfilter/vf_colorspace.c index f367ce17c6..a006fd5aac 100644 --- a/libavfilter/vf_colorspace.c +++ b/libavfilter/vf_colorspace.c @@ -432,8 +432,7 @@ static int create_filtergraph(AVFilterContext *ctx, if (out->color_trc != s->out_trc) s->out_txchr = NULL; if (in->colorspace != s->in_csp || in->color_range != s->in_rng) s->in_lumacoef = NULL; - if (out->colorspace != s->out_csp || - out->color_range != s->out_rng) s->out_lumacoef = NULL; + if (out->color_range != s->out_rng) s->rgb2yuv = NULL; if (!s->out_primaries || !s->in_primaries) { s->in_prm = in->color_primaries; @@ -562,26 +561,8 @@ static int create_filtergraph(AVFilterContext *ctx, redo_yuv2rgb = 1; } - if (!s->out_lumacoef) { - s->out_csp = out->colorspace; + if (!s->rgb2yuv) { s->out_rng = out->color_range; - s->out_lumacoef = av_csp_luma_coeffs_from_avcsp(s->out_csp); - if (!s->out_lumacoef) { - if (s->out_csp == AVCOL_SPC_UNSPECIFIED) { - if (s->user_all == CS_UNSPECIFIED) { - av_log(ctx, AV_LOG_ERROR, - "Please specify output colorspace\n"); - } else { - av_log(ctx, AV_LOG_ERROR, - "Unsupported output color property %d\n", s->user_all); - } - } else { - av_log(ctx, AV_LOG_ERROR, - "Unsupported output colorspace %d (%s)\n", s->out_csp, - av_color_space_name(s->out_csp)); - } - return AVERROR(EINVAL); - } redo_rgb2yuv = 1; } @@ -686,6 +667,26 @@ static av_cold int init(AVFilterContext *ctx) { ColorSpaceContext *s = ctx->priv; + s->out_csp = s->user_csp == AVCOL_SPC_UNSPECIFIED ? + default_csp[FFMIN(s->user_all, CS_NB)] : s->user_csp; + s->out_lumacoef = av_csp_luma_coeffs_from_avcsp(s->out_csp); + if (!s->out_lumacoef) { + if (s->out_csp == AVCOL_SPC_UNSPECIFIED) { + if (s->user_all == CS_UNSPECIFIED) { + av_log(ctx, AV_LOG_ERROR, + "Please specify output colorspace\n"); + } else { + av_log(ctx, AV_LOG_ERROR, + "Unsupported output color property %d\n", s->user_all); + } + } else { + av_log(ctx, AV_LOG_ERROR, + "Unsupported output colorspace %d (%s)\n", s->out_csp, + av_color_space_name(s->out_csp)); + } + return AVERROR(EINVAL); + } + ff_colorspacedsp_init(&s->dsp); return 0; @@ -734,6 +735,10 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) return res; } + out->colorspace = outlink->colorspace; + if (s->user_rng == AVCOL_RANGE_UNSPECIFIED) + outlink->color_range = link->src->inputs[0]->color_range; + out->color_range = outlink->color_range; out->color_primaries = s->user_prm == AVCOL_PRI_UNSPECIFIED ? default_prm[FFMIN(s->user_all, CS_NB)] : s->user_prm; if (s->user_trc == AVCOL_TRC_UNSPECIFIED) { @@ -745,10 +750,6 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) } else { out->color_trc = s->user_trc; } - out->colorspace = s->user_csp == AVCOL_SPC_UNSPECIFIED ? - default_csp[FFMIN(s->user_all, CS_NB)] : s->user_csp; - out->color_range = s->user_rng == AVCOL_RANGE_UNSPECIFIED ? - in->color_range : s->user_rng; if (rgb_sz != s->rgb_sz) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(out->format); int uvw = in->width >> desc->log2_chroma_w; @@ -838,10 +839,19 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_NONE }; - int res; + int res, ret; ColorSpaceContext *s = ctx->priv; + AVFilterLink *outlink = ctx->outputs[0]; AVFilterFormats *formats = ff_make_format_list(pix_fmts); + if (ret = ff_formats_ref(ff_make_formats_list_singleton(s->out_csp), + &outlink->incfg.color_spaces) < 0) + return ret; + if (s->user_rng != AVCOL_RANGE_UNSPECIFIED + && (ret = ff_formats_ref(ff_make_formats_list_singleton(s->user_rng), + &outlink->incfg.color_ranges) < 0)) + return ret; + if (!formats) return AVERROR(ENOMEM); if (s->user_format == AV_PIX_FMT_NONE) @@ -854,7 +864,7 @@ static int query_formats(AVFilterContext *ctx) if (res < 0) return res; - return ff_formats_ref(formats, &ctx->outputs[0]->incfg.formats); + return ff_formats_ref(formats, &outlink->incfg.formats); } static int config_props(AVFilterLink *outlink)