From patchwork Fri Oct 27 17:04:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 44387 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a17:907:11d0:b0:9b2:d3d7:e340 with SMTP id va16csp2508ejb; Fri, 27 Oct 2023 10:06:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFeiwsELc3MlwGzTF4rhNvU7QtBGxt0T6YBgoIAQ+8h7upnKXzPO0bFAu073Jy2QSxbc/ph X-Received: by 2002:a17:907:3206:b0:9ba:a38:f2b2 with SMTP id xg6-20020a170907320600b009ba0a38f2b2mr2574447ejb.41.1698426368685; Fri, 27 Oct 2023 10:06:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698426368; cv=none; d=google.com; s=arc-20160816; b=Z9q2xylVQ91q/IlpEgU7ZYIIGzLMgrFSKTWdInHwWm9bUxdUQO3Gn8p+E2USiPRQ+r iQ+mCkteM69KXCIlc1v7cTjM4vvnUeATgXxHsFTFudVRJcXldeVrrigYIob9JcpE9Ipb 6PiM/bfGAWY0MP4lJShGKjztrxVosq8tIxZvHYHVxN1+9pK7QtJRkFDMHtQ/ImtSzRNT ssGIRhz9dmTxYVU7kndBKq06WnD0261TlOer+SMbiV1a4X0z192Y9Mm8ZXyD9NyvdRtt IevuJEQbh0mve9XjQn6nhzbBEyceyYo6ztB+eWkDw2SszdZc/fv1R4TKx1mjtJhxhKHq wWjg== 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=MpryFSdsPRODLKZc8/Y/8YOFSrcVZzjUfEhidHhtM5s=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=neakrl+/1e1aDZ7e25+jT53pmT0IzbA70SitOfP+H4jofuLWkz7HoU+BqgqEhMb8Y4 bLYjCyFnL+rxASuf4wm7Ic9ezN9FeQkfKpTOquDxyGlforyqXvlPeVt4c75n5sgsf0Bs VWIzFWapP4qEYU2WQJangmX3CXSqELS3vKOqkQO32dQ1F3QzbzgKBGsLPUjOBgRY4wNt lA+SQxK4cX2k6BB4pvu5wzwr6v9HNVME9fCaGxbiXVDzKiFQxol3t+7sjuvlxiIsBtRd 04mzI6CUI/XaK5xYLE+WQ8lSYXLTK3S5koLEn67Qfmulc1vcbhzK+o+S9i5y+SwnjObT 73UQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=kLFAKrLA; 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 gn35-20020a1709070d2300b009b2c5985861si967836ejc.1010.2023.10.27.10.05.58; Fri, 27 Oct 2023 10:06:08 -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; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=kLFAKrLA; 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 AD3ED68CBFB; Fri, 27 Oct 2023 20:05:02 +0300 (EEST) 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 9F2E568CBDA for ; Fri, 27 Oct 2023 20:04:55 +0300 (EEST) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id 6A8F24BB0D; Fri, 27 Oct 2023 19:04:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1698426291; bh=4+hPgcf6OKl1rEN6Su29JmY5uHYViRBq+Qj7XdhHr04=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kLFAKrLAhCyY7hEj3yPiWd/nTJYPSJIipm5vJ8j2nLfBFECjwGQqRete/MogEK69X DIVZv/MAiUB+2O6x/Frj83LpkK1gxVNx1vx4a8ISVuRFrV65/PUQoS+SeHpU8Lc3+M nODtTLJK7gUGnO2yCQZDiRDObqtRNGzSdrsOm8qM= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Oct 2023 19:04:45 +0200 Message-ID: <20231027170446.63684-7-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231027170446.63684-1-ffmpeg@haasn.xyz> References: <20231027170446.63684-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 7/8] avfilter/vf_scale: tag output color space 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: OiNYV0UtUvMf From: Niklas Haas When using vf_scale to force a specific output color space, also tag this on the AVFrame. (Mirroring existing logic for output range) --- libavfilter/vf_scale.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 4a2f0bd1f1..d79d67c413 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -821,6 +821,9 @@ scale: out->width = outlink->w; out->height = outlink->h; out->color_range = out_full ? AVCOL_RANGE_JPEG : AVCOL_RANGE_MPEG; + if (scale->out_color_matrix >= 0 && + scale->out_color_matrix != AVCOL_SPC_UNSPECIFIED) + out->colorspace = scale->out_color_matrix; // Sanity checks: // 1. If the output is RGB, set the matrix coefficients to RGB.