From patchwork Fri Oct 27 17:04:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 44386 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a17:907:11d0:b0:9b2:d3d7:e340 with SMTP id va16csp2362ejb; Fri, 27 Oct 2023 10:06:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF38lLbGO+foaOwvAfJjPe8QfveK+oQwhYIA1BH8XwIvpT/rsA5y0xGDpoVlq/JVr3H2zlF X-Received: by 2002:aa7:d296:0:b0:53e:58fd:9600 with SMTP id w22-20020aa7d296000000b0053e58fd9600mr2861026edq.36.1698426359409; Fri, 27 Oct 2023 10:05:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698426359; cv=none; d=google.com; s=arc-20160816; b=k70vd1kgAykE1jtVIDPvycVsjGa0OVq3YkGJVwBSSHAly3OqM4pwaypKb2o8SwVfAI yKByAu+kYAwN9P7gGG9R8a3g0iNbkYP4axjctnE8I8Kh5NDc76R4eEknElGaVRTZgZxV YXqf5CDUWiY0ITn6t91HHVvZGx9+UB/+JnnkBpxUL7qDbjrrh79oyIZ6jbvbQXojXny7 AAxXctGiW69RuIhsBSh9e5muL3nJJXkIpcLVdF6c+5sW5MEoHPgBracL0WKV38CAcHPZ Wild7KtnjYvadd4DX4HupGLWcBZjx9//TPYkusEi+zyS5UxRKoNdpmjqjHlOJc5AAJcn CSIg== 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=hwoYkr9ZWgHEayURhAPFT5fP5YkesTVGhBF4Cl6s3vQ=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=NqzNWLk5vLZXw05WE3Mpb5Fmr8G6N8BpTz8IYQC62QHySCt5mA8iFqaJ6QgJx/8qWm qiO48wXaoM6u1s4jR3GNj0eWBVXXDDDsODp8884csavmbyJjGlecoGdIcwXNfzRT6Wtt 5SbPdHKpj1u0QuMCEXcgrDLS2Bfh+iWsexDZITEgX3CKQGxS2Ghp9957a/VpgGzF2rlG tZe7uxOonJ92aH9MFWsOHggFS6idVm0NdE5+Er1L6xwgP/CaWjDPqknYTGcJLDFrokFh Oh3AfOzuYFpS+8ashadaxpeFLZyciGRY5cXdCCHjYQkC8SYvDe0akTbOlAQGJjM038wN q44g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=p3cl3ZyV; 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 f19-20020a056402355300b00540b6b6705csi1021646edd.312.2023.10.27.10.05.48; Fri, 27 Oct 2023 10:05:59 -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=p3cl3ZyV; 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 C340D68CBF0; Fri, 27 Oct 2023 20:05:01 +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 28B8E68C9DD for ; Fri, 27 Oct 2023 20:04:51 +0300 (EEST) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id E14EA4BB07; Fri, 27 Oct 2023 19:04:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1698426291; bh=LMmqL+qp2g92LrFxAtDUorY31nyCV1TPjEJdJV5P5uU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p3cl3ZyVn5gD+8w2qY1PwBsbPs8/VoBne9tpi9nuMtvYZiLc8qWalMlNObkaW3/22 JFDbiKSTSjMj0SSh5V519t26Hmh4IsX6mRqpd5Ea467MgizyvFo4jRbxAK4NjgeJfj iWb77EXcHA11olJAOM90rOtve/E3dwB+oLUxqVSs= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Oct 2023 19:04:43 +0200 Message-ID: <20231027170446.63684-5-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 5/8] avfilter/vf_scale: preserve YUV range by default 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: YnBujaiRo3My From: Niklas Haas YUV->YUV conversions should preserve input range, if the output range is unspecified. Ensures full-range YUV input comes out as full-range YUV output by default, even through YUV->YUV pixel format conversions. --- libavfilter/vf_scale.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 19c91cb86e..f9b0746072 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -687,6 +687,28 @@ static int scale_field(ScaleContext *scale, AVFrame *dst, AVFrame *src, return 0; } +static int is_regular_yuv(enum AVPixelFormat fmt) +{ + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(fmt); + if (desc->flags & (AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_PAL)) + return 0; + if (desc->name && av_strstart(desc->name, "xyz", NULL)) + return 0; + if (desc->nb_components < 3) + return 0; /* grayscale is forced full range inside libswscale */ + switch (fmt) { + case AV_PIX_FMT_YUVJ420P: + case AV_PIX_FMT_YUVJ422P: + case AV_PIX_FMT_YUVJ444P: + case AV_PIX_FMT_YUVJ440P: + case AV_PIX_FMT_YUVJ411P: + return 0; + default: + return 1; + } +} + + static int scale_frame(AVFilterLink *link, AVFrame *in, AVFrame **frame_out) { AVFilterContext *ctx = link->dst; @@ -794,6 +816,8 @@ scale: in_full = in->color_range == AVCOL_RANGE_JPEG; if (scale->out_range != AVCOL_RANGE_UNSPECIFIED) out_full = scale->out_range == AVCOL_RANGE_JPEG; + else if (is_regular_yuv(in->format) && is_regular_yuv(outlink->format)) + out_full = in_full; /* preserve pixel range by default */ if (in->width == outlink->w && in->height == outlink->h &&