From patchwork Wed Dec 13 13:12:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 45109 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp4264424pzf; Wed, 13 Dec 2023 05:17:44 -0800 (PST) X-Google-Smtp-Source: AGHT+IFPvVYX57N49VvnBZXjpIdbPGBmWvNrW4ebg8qr4KGbpAfIYey4f4tHVM+PZsokn1SbCssq X-Received: by 2002:a05:6402:222b:b0:551:3f17:4763 with SMTP id cr11-20020a056402222b00b005513f174763mr2013070edb.80.1702473464459; Wed, 13 Dec 2023 05:17:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702473464; cv=none; d=google.com; s=arc-20160816; b=OjOnBEU3mKov2rqeKBPIVlWJ/wXKFXY82jgayh9NDA2wnHZ9ZVLuN0l+Ab7m55LB3W GnhCEl2NUNMQLXfbU0vPnbehX5tO8teUXLU76ARYQT6qR37vk/JBPN3eWPC++xw383dO G0uTWG19pVm/x6K+zLbw9ujTarXbQWAZOwHYcJSdeH17/ZRd5VKicUN5avPW3w8CiPdF zDJcUH48a7a5CTTEbWiWjoqD3M7ouUDLKpK1qEyVllfa+zT7EMXjrsHNU1+9P7O2Si+F IRZa7LGRuWZzo1ABNdME+GYQuty5KmJlg85Xj0uOibiqAc/Bbjm+pgNF4AUPGpz9bSwn oGgA== 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=jShybgn+WkgYYD8DuihiafD+6CcIyBhvYcTU3JSwY30=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=aUiiX+WHcavBIJAyTs/GSkAlEuDsM8GL5qTE7esMZOoKh3sgD/7/17HkLm/h3pKvA+ lotc8gvWaXzrmX4FVaSkjVdAhVNPd7O3NPBtMOaWLHGNvP1LUv07bTYKxSgrjSGq7hHw 5Bm+IFOj5q/ZD/rO6nFNqTWgkXtZzUoj1aneaXuJjCD1/xcwolcTb0VTmm8RpcAY0y40 iiFRj+A4Exz2Vl0MbJDpGXvXgtbTKEQVd4RtCIt0iLRWQuz5p7pCZ5kbht9eq8Ol8UTI 5r/QPBjqQncDytPm9sEhiytgDlD4jj1ZsVg8qbLFHBJ/VDbpkFDI0cQAKn9TfFtz5EPk t6xQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=ajOpNyJd; 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 t1-20020a50d701000000b00551d1fffae2si1056123edi.664.2023.12.13.05.17.44; Wed, 13 Dec 2023 05:17:44 -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=ajOpNyJd; 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 1268C68D264; Wed, 13 Dec 2023 15:15:59 +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 AABA168D1F3 for ; Wed, 13 Dec 2023 15:15:44 +0200 (EET) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 8F3C54BD27; Wed, 13 Dec 2023 14:15:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1702473341; bh=ZWyysk/LHs7fyKwe16KHz9FnxwWMlWLO57svolpyn4w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ajOpNyJdbpbbRT+UT4iTCTDBmzChnd3+SSmmxS6ehrs2qCDrRmeYr7kDMrDieQbmp OcNOreeVee6zKDWDvf7kF4zTCxIn02HC85LDgqPiesChSL4wwfKCaqcCYl1on0+pXp 7HnRsFpsmnlCZnfc/rzT3WzBXtSUFE8lxf1W/WyQ= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Wed, 13 Dec 2023 14:12:06 +0100 Message-ID: <20231213131536.10242-10-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231213131536.10242-1-ffmpeg@haasn.xyz> References: <20231213131536.10242-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 09/15] avfilter/vf_zscale: switch to 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: Niklas Haas Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: +9g9lj/0FfZe From: Niklas Haas Following the same design as vf_scale. --- libavfilter/vf_zscale.c | 44 +++++++++++++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 10 deletions(-) diff --git a/libavfilter/vf_zscale.c b/libavfilter/vf_zscale.c index f76c9954cd..3b14ce4f33 100644 --- a/libavfilter/vf_zscale.c +++ b/libavfilter/vf_zscale.c @@ -187,8 +187,12 @@ static av_cold int init(AVFilterContext *ctx) return 0; } +static enum AVColorRange convert_range_from_zimg(enum zimg_pixel_range_e color_range); + static int query_formats(AVFilterContext *ctx) { + ZScaleContext *s = ctx->priv; + AVFilterFormats *formats; static const enum AVPixelFormat pixel_fmts[] = { AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, @@ -217,7 +221,27 @@ static int query_formats(AVFilterContext *ctx) ret = ff_formats_ref(ff_make_format_list(pixel_fmts), &ctx->inputs[0]->outcfg.formats); if (ret < 0) return ret; - return ff_formats_ref(ff_make_format_list(pixel_fmts), &ctx->outputs[0]->incfg.formats); + ret = ff_formats_ref(ff_make_format_list(pixel_fmts), &ctx->outputs[0]->incfg.formats); + if (ret < 0) + return ret; + + if ((ret = ff_formats_ref(ff_all_color_spaces(), &ctx->inputs[0]->outcfg.formats)) < 0 || + (ret = ff_formats_ref(ff_all_color_ranges(), &ctx->inputs[0]->outcfg.formats)) < 0) + return ret; + + formats = s->colorspace != ZIMG_MATRIX_UNSPECIFIED && s->colorspace > 0 + ? ff_make_formats_list_singleton(s->colorspace) + : ff_all_color_spaces(); + if ((ret = ff_formats_ref(formats, &ctx->outputs[0]->incfg.formats)) < 0) + return ret; + + formats = s->range != -1 + ? ff_make_formats_list_singleton(convert_range_from_zimg(s->range)) + : ff_all_color_ranges(); + if ((ret = ff_formats_ref(formats, &ctx->outputs[0]->incfg.formats)) < 0) + return ret; + + return 0; } static void slice_params(ZScaleContext *s, int out_h, int in_h) @@ -678,15 +702,9 @@ fail: static void update_output_color_information(ZScaleContext *s, AVFrame *frame) { - if (s->colorspace != -1) - frame->colorspace = (int)s->dst_format.matrix_coefficients; - if (s->primaries != -1) frame->color_primaries = (int)s->dst_format.color_primaries; - if (s->range != -1) - frame->color_range = convert_range_from_zimg(s->dst_format.pixel_range); - if (s->trc != -1) frame->color_trc = (int)s->dst_format.transfer_characteristics; @@ -775,6 +793,8 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) if ((link->format != outlink->format) || (link->w != outlink->w) || (link->h != outlink->h) || + (link->colorspace != outlink->colorspace) || + (link->color_range != outlink->color_range) || s->first_time || (s->src_format.chroma_location != s->dst_format.chroma_location) || (s->src_format.color_family !=s->dst_format.color_family) || @@ -796,6 +816,8 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) goto fail; av_frame_copy_props(out, in); + out->colorspace = outlink->colorspace; + out->color_range = outlink->color_range; if ((ret = realign_frame(desc, &in, 1)) < 0) goto fail; @@ -805,9 +827,11 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) snprintf(buf, sizeof(buf)-1, "%d", outlink->h); av_opt_set(s, "h", buf, 0); - link->dst->inputs[0]->format = in->format; - link->dst->inputs[0]->w = in->width; - link->dst->inputs[0]->h = in->height; + link->dst->inputs[0]->format = in->format; + link->dst->inputs[0]->w = in->width; + link->dst->inputs[0]->h = in->height; + link->dst->inputs[0]->colorspace = in->colorspace; + link->dst->inputs[0]->color_range = in->color_range; s->nb_threads = av_clip(FFMIN(ff_filter_get_nb_threads(ctx), FFMIN(link->h, outlink->h) / MIN_TILESIZE), 1, MAX_THREADS); slice_params(s, out->height, in->height);