From patchwork Thu Nov 9 12:19:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 44588 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4fa4:b0:181:818d:5e7f with SMTP id gh36csp444262pzb; Thu, 9 Nov 2023 04:26:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IHDAYbfBb48Cqoonn0cR1lbU8oUPYHBZhB3BdM4/fVVVKoz0H3I6UXoY2HjG43DrLE82Daj X-Received: by 2002:a17:907:9304:b0:9d3:85b9:afdf with SMTP id bu4-20020a170907930400b009d385b9afdfmr4147623ejc.3.1699532797373; Thu, 09 Nov 2023 04:26:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699532797; cv=none; d=google.com; s=arc-20160816; b=SpDrbTzYx9hg/X+MSA6g6sdUTesjlE8rZwZKbWKqujgbkWORdwpVCexQYntQ0/k4AU y1TSiwFM+BsMWTHcLfKoPGxNBuaKCiXad5z5+TgQlgRixwpVPzHT4KyCwAbLDEGfBqaL AV24v3xETHBUyymiBT5SmLkBjAlwwXSNT2U8e7W3eQLGlIw9PHZj8MnSNUhwLy7yQLig ihJ28A8VUWUUJJ6OoHjxR4dDKqNuV69HxPvN9ozBY06G/4JNFuZrCcJpMR65eBcAwGcc smGChNLRgBitDbvf+zUnVyg6Df+kuqjGEFHWpWtvmsFcR0llJk8QPcCYNubi62hFPCHn WF6A== 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=NWfRX9TJRHGpUxt0gHkeym7LCiGCK3dsMvMzcs9/+T0=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=aa6LTSebZ0Ayjm+pEKFVQ/ufPge6bX3y69towoqFHWAPjRnRwRsi76tMd/JvNaGhpH X7aagiqzmYfkIvwP4bNl5uTd2+qXvrfEGaO2zP/D3DICrD7U1rMYA3WmVXviq42yew0e IBpXfWFlms8xIXP3tDpa+KaZ1E5psr+vl2qyzCIAxKVZYSI7lT3VYkABz+aYJh9I941s sR1Ev2ZukxgfC4w0pXJVTqCrkeOYxYkj7b5Srha1XUDORnjf7Rmwh3Hcw4dyjWrkfLSI GEmbZ0w89UVItuzJ+xTNbCSGaNa7v+rXz9Ui3ndBorFSQ+XgtwGIAhSWp410u/sWlobS NOLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=TwAvx6Fl; 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 t8-20020a056402240800b0053e87d6c435si8198665eda.689.2023.11.09.04.26.37; Thu, 09 Nov 2023 04:26:37 -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=TwAvx6Fl; 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 3551E68CC0C; Thu, 9 Nov 2023 14:25:49 +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 F3A3E68CBCB for ; Thu, 9 Nov 2023 14:25:41 +0200 (EET) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id D27704BD04; Thu, 9 Nov 2023 13:25:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1699532738; bh=GwQ14Q+N3aQoCq7Q9YqAhsBz0du8jaC/HcWOvLykG5c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TwAvx6FlJYIMc3dlWckpQilKEd/0WxoL3jByhrzUb2ZeyR5YpsmigyzfTzz3FfXGA fJPG9YFTv63sjGHZczHbBs8to1nlhOmjjRaoU9h3ekJE0Urxe4a/F3c/LMZHFpBdpX m3/tA1a0mpxovYo4/UXXaC/QnTcdN94VHpZ8Cko0= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Nov 2023 13:19:44 +0100 Message-ID: <20231109122534.124157-13-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231109122534.124157-1-ffmpeg@haasn.xyz> References: <20231109122534.124157-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 12/25] avfilter/vf_libplacebo: 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: dhfcEMdqVbtD From: Niklas Haas --- libavfilter/vf_libplacebo.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/libavfilter/vf_libplacebo.c b/libavfilter/vf_libplacebo.c index b6e82a61e0..a9a3d884ce 100644 --- a/libavfilter/vf_libplacebo.c +++ b/libavfilter/vf_libplacebo.c @@ -882,6 +882,8 @@ static int output_frame(AVFilterContext *ctx, int64_t pts) out->pts = pts; out->width = outlink->w; out->height = outlink->h; + out->colorspace = outlink->colorspace; + out->color_range = outlink->color_range; if (s->fps.num) out->duration = 1; @@ -892,22 +894,11 @@ static int output_frame(AVFilterContext *ctx, int64_t pts) out->color_trc = AVCOL_TRC_SMPTE2084; } - if (s->colorspace >= 0) - out->colorspace = s->colorspace; - if (s->color_range >= 0) - out->color_range = s->color_range; if (s->color_trc >= 0) out->color_trc = s->color_trc; if (s->color_primaries >= 0) out->color_primaries = s->color_primaries; - /* Sanity colorspace overrides */ - if (outdesc->flags & AV_PIX_FMT_FLAG_RGB) { - out->colorspace = AVCOL_SPC_RGB; - } else if (out->colorspace == AVCOL_SPC_RGB) { - out->colorspace = AVCOL_SPC_UNSPECIFIED; - } - changed_csp = ref->colorspace != out->colorspace || ref->color_range != out->color_range || ref->color_trc != out->color_trc || @@ -1203,6 +1194,18 @@ static int libplacebo_query_format(AVFilterContext *ctx) for (int i = 0; i < s->nb_inputs; i++) RET(ff_formats_ref(infmts, &ctx->inputs[i]->outcfg.formats)); RET(ff_formats_ref(outfmts, &ctx->outputs[0]->incfg.formats)); + + /* Set colorspace properties */ + RET(ff_formats_ref(ff_all_color_spaces(), &ctx->inputs[0]->outcfg.color_spaces)); + RET(ff_formats_ref(ff_all_color_ranges(), &ctx->inputs[0]->outcfg.color_ranges)); + + outfmts = s->colorspace > 0 ? ff_make_formats_list_singleton(s->colorspace) + : ff_all_color_spaces(); + RET(ff_formats_ref(outfmts, &ctx->outputs[0]->incfg.color_spaces)); + + outfmts = s->color_range > 0 ? ff_make_formats_list_singleton(s->color_range) + : ff_all_color_ranges(); + RET(ff_formats_ref(outfmts, &ctx->outputs[0]->incfg.color_ranges)); return 0; fail: