From patchwork Wed Dec 13 13:12:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 45112 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp4264695pzf; Wed, 13 Dec 2023 05:18:11 -0800 (PST) X-Google-Smtp-Source: AGHT+IFzDEW0jdyg1vLvx8d4h5sv6hpsb/y1Wxg+0+voDlvE1S2S0Ar7g0/FVqLEJ/18ac9lo7j6 X-Received: by 2002:a17:907:7d8c:b0:a1d:58ff:df2b with SMTP id oz12-20020a1709077d8c00b00a1d58ffdf2bmr4806866ejc.17.1702473491455; Wed, 13 Dec 2023 05:18:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702473491; cv=none; d=google.com; s=arc-20160816; b=BAmqBi3njojYypLsFo9LRIcqUYRPQbRo15bCELkcQJtgFWr9MB0HxPdi3m5N+yb5Od 1nMJvDEbF+abhsq8l3elNJYmRAucOV9V9iKTJBt5RXTfqlPGGq8hcUiesBa6EwxSYkDf 1xSBbSmCWYOSNNRfoB1YPOWZ3uyzhun0n19J2+yPs7+xzyBGNHJvN3F+tF2HRBZiWahI kpewGEKSLz8m8DmEy3l91jnLh8jT/edlrt9bueqVbz3zQlNjBiBkVDb06mM0H9cG7BDT AAm1spiJcERzm7PoF2oUOX9C+ZzCk5T5CpUdsKqf2aRPRDyweJyVcscP6YChF/7Tker2 /ETw== 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=S0saI32HwvlAYWDTKIcHcmQY2yTTzyZ8gv2J35SXX7A=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=t8VHQK+rDGn5Phf8nTB+iA953C0iCMDZNyZKnaB+KSaRe2mW4tVrW+avPc8SNcyyu0 +tMUxJzdkpXYduGKcCma4XR9XqJPAvqx0Z9FTSbyWq/X8b8xJ9CL6XSIUwqcRBcmpWP/ O8PqeunBpk2u2lpAqKGLji50/J8X5AZmACE1bxywcg4pMLtvA5+Ae65g1N7luLruRlnn vKs/Xf0u3qSlsHFk2H2U5jTtNiNnyhwIXKOoXUmLzes+XI4HVB/U/pQoMdRMHzSyq9zg nu9MatwxGHR6MTGTq/bdmC+ne+jGS0ThR3NtXBn7uEsIqrkcTuxJK5uys/2CnmGY9h7d ECQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=ZfpkfVQw; 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 lj3-20020a170906f9c300b00a1cd7788572si4956509ejb.828.2023.12.13.05.18.10; Wed, 13 Dec 2023 05:18:11 -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=ZfpkfVQw; 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 F2B7568D285; Wed, 13 Dec 2023 15:16:01 +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 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: hS2hlrp26y5m 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: