From patchwork Sat Oct 28 14:41:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niklas Haas X-Patchwork-Id: 44411 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dd83:b0:15d:8365:d4b8 with SMTP id kw3csp498228pzb; Sat, 28 Oct 2023 07:45:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHweEtbEi7DwfLjys5P6gkD9G6/2uh4JG1dwijPuLRBWJtuV8l3mXJRL7SitQGO57jaxAzq X-Received: by 2002:a17:906:da8b:b0:9cc:97b:5a15 with SMTP id xh11-20020a170906da8b00b009cc097b5a15mr4346688ejb.64.1698504349287; Sat, 28 Oct 2023 07:45:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698504349; cv=none; d=google.com; s=arc-20160816; b=kNBH94VG5IBEHA6794s4xZZNb1ahiCB5TQtDAbb/8rw7EgL11dtYdZnBjitD9sph87 ++/RC6UqMkEEnBmV/a5XA1neRDZLH/xHevIiAGPNHwGHRD9KCun6Lm6/bEHnOUl9U80+ AcyRgW9mQDdHWfk9Fp7HBzRLVm9D9eki1fUDwJaRUDbAHbAHdOvLy+ctXAOhDlyDGRlf qUgncCuBEWhTvDyj65Yvzh//9M2UblzUKDAH0OE/4aC7NQypPOFwm0CZbx0THLFII9RZ uheqLaaouqIC5JP8cWNbmm9BhOl1QC3YBU+S1cC3mW+Spih9k3euGwRh/iVnZ7fQafLS fkew== 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=Na2EytXGaaaTVsheuDzEV5XHmOlXRT3BVA/M0VTzANo=; fh=xmAeKtysnShNOmkhiJmYkS30uw4Fu2hvBJ7qlIwukxQ=; b=GwfPDesDAPFyQ5yEYpuj91/lHQZ8oAENUWrmxQzGZUhah4/8cNchdSH87MyIHVkuNP kdjsXvoRSHA1sH+BAdGW6SGTnkzUqOdZYn1/uni2DM9YNpBcI17L982RyrUiajjdjybv QFD6GktLcQs6GDztsC8qFvUCz55LduwM1WE6ZcHM1JClfiBUyzrn4yyFnglhtFQJADQn 0UW+C7iRV5ZdFDkYXViLHH6G6esI8fR3P8bbc87mLHZS1tb2fcEvg3FpTDJOq1Z5/wdu ZHY6eCbde2J/eAyLE0Woq5tu3BmeI0z7HU93mm6do40kIMegjeiBmAUMkUf/9S2vImnl 7/Xg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@haasn.xyz header.s=mail header.b=u+7RPLRq; 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 30-20020a170906009e00b0099cb1ff44bcsi453139ejc.613.2023.10.28.07.45.48; Sat, 28 Oct 2023 07:45:49 -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=u+7RPLRq; 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 B2A9068CBDC; Sat, 28 Oct 2023 17:44:49 +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 9555468CBC9 for ; Sat, 28 Oct 2023 17:44:40 +0300 (EEST) Received: from haasn.dev (unknown [10.30.0.2]) by haasn.dev (Postfix) with ESMTP id A1C314BB1A; Sat, 28 Oct 2023 16:44:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=haasn.xyz; s=mail; t=1698504276; bh=IK0BmDwSurKpHhEJgtfbeZrjMGeXjiZ2DOvKKrw2T4Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u+7RPLRqSDlS2ONZEsFpkV1YkzoWPqz+MxM/M7NvDlxaXqwQF564ov3eOqxyPOCID m1pkPaj5MT64r+TRNNLXX3HKbaP6c1z30cSY9nJIvyC4W8cg3enXFH8C09sM+zIX7Y IFUk9SE/5aZfThgcD2i8ubsoxafX1h0wIbtfSllE= From: Niklas Haas To: ffmpeg-devel@ffmpeg.org Date: Sat, 28 Oct 2023 16:41:14 +0200 Message-ID: <20231028144430.60538-8-ffmpeg@haasn.xyz> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231028144430.60538-1-ffmpeg@haasn.xyz> References: <20231028144430.60538-1-ffmpeg@haasn.xyz> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 07/10] 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: dsRoL5EW1mWK 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 | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 3d58de0494..cde6f52169 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -687,6 +687,27 @@ 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 +815,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 &&