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 0157548680 for ; Wed, 13 Dec 2023 13:18:09 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C202E68D288; Wed, 13 Dec 2023 15:16:01 +0200 (EET) Received: from haasn.dev (haasn.dev [78.46.187.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 15B9068D1F8 for ; Wed, 13 Dec 2023 15:15:45 +0200 (EET) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 28CF34BD40; Wed, 13 Dec 2023 14:15:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1702473342; bh=wJVk4x8gnlNDgmcDNkgNESobmlOqX3LJbIWBYXPECEo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZfpkfVQwCaSNYKuVzvvb9huCrxOOghm/pWZ1kUhWOTo/ln2yC5FZaLCHNXnOnJUQj KUfn8JM5axmfk8umEhkLJBe0HgD+unMdcb15jB/jdYKXLhbITg22Ac6Dn54DxXa4l5 N0kG1uFwKHHVazSj+U9+X3HU+WNted+kMXGJvzSI= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Wed, 13 Dec 2023 14:12:08 +0100 Message-ID: <20231213131536.10242-12-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 11/15] 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 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_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: -- 2.43.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".