From patchwork Wed Feb 23 19:45:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 34494 X-Google-Smtp-Source: ABdhPJwqsadqAPty+X7qWcoCvUQXgJmgZInRTVw8rXdhhLM3u7xVeCi8UELk6WJtxixC2ztYLe5c X-Received: by 2002:a17:906:3803:b0:6aa:a5a0:1a54 with SMTP id v3-20020a170906380300b006aaa5a01a54mr963129ejc.162.1645645566786; Wed, 23 Feb 2022 11:46:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645645566; cv=none; d=google.com; s=arc-20160816; b=xNun0Aw8l6/YDqzXWSkgssYLOWNTJ6Aef4EWpMrxyOXhhxKAYIP8+AWI8gjZVf7JCc x7QBbKiHJPHSe2tEn2ZzpFRREV4uvwcQD0f/lB/tJ5pAsRoJx52E1tUkt/dpR+jod8a6 CqfBycu/Bz97hFCrqe4zOI7Ds5ri9N5g8iQvHQT6G1ZeDjui8eka5wVj168smSRw3leX 0Uw17qh7WzKIgzQOFwyR3pOTL+a8EydSX9Sqjq6E63K0RX7iEkMeQhnk/c4qLnLJjUDr 1MkWwGQXUwHDzQ0a3DQBNk1/TRXwxfowGo+7cs7dWRWbwwId7c3PKpsT//SQCg94QyYO WXIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=9eZTi+r+emasVlNIy+8JVPf5SCbpwvrF1TJ/trLHjiw=; b=tfocV/s8yozuPXBWloLb2xmV9DgH/xT7ZmjY/VHI/H+aiAHkod0qW5mCvm2lwlddKA UvPuLWClDzc8F271QorxqwbBn6xlIXv9nIJDkdKqUWmf59oNC47qi+hgPJ2TrqWdkQup fg8U1JFf1HT4lD3wFOitU6HNN4PB52AMpvkMzJ/dDPfOIukcIaTj0wLD5+wMr6YWEHs0 xA+zHNCjyx/67rFwOCU6Ye75PTzqLRxEJv7h9d3q7MtDnhtX2xYgVJv/8StOvZFZwcB/ xOkRoKtVbuUbVMFR/mAcbXegre3m6yZtCHCECMY+YFidztyFK2NwdOkdEQc7SAmbe7uN L7WQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20210112.gappssmtp.com header.s=20210112 header.b=0EV8du1r; 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 l6si315354ejo.623.2022.02.23.11.46.06; Wed, 23 Feb 2022 11:46:06 -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=@martin-st.20210112.gappssmtp.com header.s=20210112 header.b=0EV8du1r; 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 4F69C68B2EC; Wed, 23 Feb 2022 21:46:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B5F6768B21A for ; Wed, 23 Feb 2022 21:45:56 +0200 (EET) Received: by mail-wr1-f44.google.com with SMTP id f17so16514570wrh.7 for ; Wed, 23 Feb 2022 11:45:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=G2owW8KRKnd7ZCLbAcXEIA6I7/LAvQbcaicLJsPHCUs=; b=0EV8du1rtMkmb+rjWZjVW5aUYkttKyUGfY4Fmq8n3GdPD1Z1aelc7dHID2RKijkGy3 Cok8aYWXG6pxvzJPXmsaD65zMH0vrW7UNuIfMat5fdGUgbTg50Jx/0abC8EQ4pj9uWuP lZ0GSrNg0nkmD8dN80mjkkrtSApJo/G3w6Uvsg8NjxxP8IlRkfKSYSqX7G8/oA4z6NhW XIpttwBrFp/yZWlPmZntQRZWdR3IpGtis22VChCwNw7aLsy1QYZSOwxUKkNTrQO627Bz h4j4GzDxKaUPVR1FXioPNySJIfjpquzDwUwYj2bskiDhW+QM0pK68O20PZNQf020kQpO Dnlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=G2owW8KRKnd7ZCLbAcXEIA6I7/LAvQbcaicLJsPHCUs=; b=tSrGvGZ6TBRL9Y7eSWNWaoheWxbKhQVcmctv4inf+wqKvkRmDByraT6nEO5Tn0hrbE 8hx9PRY3Ednenil7QZ4rWvG7fHVwrNoH0716C1pCNbtdq4jfD/swTg62ZRHeB1jM+fZ5 fvQKRevOz8l3zHzA+5vgtcGLBIZ8q8cQcLqM8aETlSQsTe1Hsg+dtu3Ix1HCTU0wE1eH Qs+NQPN1qY6aN6FerlFZ/zAr8zX1IYWuV03zyZwmQSdfyQ68fgp/1w3D6ESbDnfAvXSr sndMqc3/bTuvKkl3+hVRQQN6tdBiEaiIYNeZz9cOApyTi6YFBlPDGKt623x2UI3tH6dj WSpw== X-Gm-Message-State: AOAM531gFnlyJ6iaZdJA5NYhZt2iQIgywETA5Tu6xzvjB0Y1Q4zIWCiw G8o6Mu48ABGUUEhd4KMBPtzQsM9yuwOjaAEr X-Received: by 2002:adf:f710:0:b0:1ed:af2d:dc44 with SMTP id r16-20020adff710000000b001edaf2ddc44mr906514wrp.44.1645645555505; Wed, 23 Feb 2022 11:45:55 -0800 (PST) Received: from localhost (host-97-187.parnet.fi. [77.234.97.187]) by smtp.gmail.com with ESMTPSA id g12sm569250wmq.28.2022.02.23.11.45.54 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 23 Feb 2022 11:45:54 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Feb 2022 21:45:53 +0200 Message-Id: <20220223194553.59514-1-martin@martin.st> X-Mailer: git-send-email 2.32.0 (Apple Git-132) In-Reply-To: <20220219154831.GW2829255@pb2> References: <20220219154831.GW2829255@pb2> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] swscale: Take the destination range into account for yuv->rgb->yuv conversions 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: KUFysyT1NTjf The range parameters need to be set up before calling sws_init_context (which selects which fastpaths can be used; this gets called by sws_getContext); solely passing them via sws_setColorspaceDetails isn't enough. This fixes producing full range YUV range output when doing YUV->YUV conversions between different YUV color spaces. Signed-off-by: Martin Storsjö --- libswscale/utils.c | 11 ++++++++--- tests/fate/libswscale.mak | 16 ++++++++++++++++ tests/ref/fate/sws-yuv-colorspace | 6 ++++++ tests/ref/fate/sws-yuv-range | 6 ++++++ 4 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 tests/ref/fate/sws-yuv-colorspace create mode 100644 tests/ref/fate/sws-yuv-range diff --git a/libswscale/utils.c b/libswscale/utils.c index 7c8e1bbdde..34f7f0b869 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -1037,11 +1037,16 @@ int sws_setColorspaceDetails(struct SwsContext *c, const int inv_table[4], srcRange, table, dstRange, brightness, contrast, saturation); - c->cascaded_context[1] = sws_getContext(tmp_width, tmp_height, tmp_format, - dstW, dstH, c->dstFormat, - c->flags, NULL, NULL, c->param); + c->cascaded_context[1] = sws_alloc_set_opts(tmp_width, tmp_height, tmp_format, + dstW, dstH, c->dstFormat, + c->flags, c->param); if (!c->cascaded_context[1]) return -1; + c->cascaded_context[1]->srcRange = srcRange; + c->cascaded_context[1]->dstRange = dstRange; + ret = sws_init_context(c->cascaded_context[1], NULL , NULL); + if (ret < 0) + return ret; sws_setColorspaceDetails(c->cascaded_context[1], inv_table, srcRange, table, dstRange, 0, 1 << 16, 1 << 16); diff --git a/tests/fate/libswscale.mak b/tests/fate/libswscale.mak index cf9319ec44..f8572f9c37 100644 --- a/tests/fate/libswscale.mak +++ b/tests/fate/libswscale.mak @@ -17,6 +17,22 @@ $(SWS_SLICE_TEST-yes): tools/scale_slice_test$(EXESUF) $(SWS_SLICE_TEST-yes): REF = /dev/null FATE_LIBSWSCALE_SAMPLES += $(SWS_SLICE_TEST-yes) +FATE_LIBSWSCALE-$(CONFIG_RAWVIDEO_DEMUXER) += fate-sws-yuv-colorspace +fate-sws-yuv-colorspace: tests/data/vsynth1.yuv +fate-sws-yuv-colorspace: ffmpeg$(PROGSSUF)$(EXESUF) +fate-sws-yuv-colorspace: CMD = framecrc \ + -f rawvideo -s 352x288 -pix_fmt yuv420p -i $(TARGET_PATH)/tests/data/vsynth1.yuv \ + -frames 1 \ + -vf scale=in_color_matrix=bt709:in_range=limited:out_color_matrix=bt601:out_range=full:flags=+accurate_rnd+bitexact + +FATE_LIBSWSCALE-$(CONFIG_RAWVIDEO_DEMUXER) += fate-sws-yuv-range +fate-sws-yuv-range: tests/data/vsynth1.yuv +fate-sws-yuv-range: ffmpeg$(PROGSSUF)$(EXESUF) +fate-sws-yuv-range: CMD = framecrc \ + -f rawvideo -s 352x288 -pix_fmt yuv420p -i $(TARGET_PATH)/tests/data/vsynth1.yuv \ + -frames 1 \ + -vf scale=in_color_matrix=bt601:in_range=limited:out_color_matrix=bt601:out_range=full:flags=+accurate_rnd+bitexact + FATE_LIBSWSCALE += $(FATE_LIBSWSCALE-yes) FATE_LIBSWSCALE_SAMPLES += $(FATE_LIBSWSCALE_SAMPLES-yes) FATE-$(CONFIG_SWSCALE) += $(FATE_LIBSWSCALE) diff --git a/tests/ref/fate/sws-yuv-colorspace b/tests/ref/fate/sws-yuv-colorspace new file mode 100644 index 0000000000..bcf3c4b89c --- /dev/null +++ b/tests/ref/fate/sws-yuv-colorspace @@ -0,0 +1,6 @@ +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 352x288 +#sar 0: 0/1 +0, 0, 0, 1, 152064, 0xcbcb97b9 diff --git a/tests/ref/fate/sws-yuv-range b/tests/ref/fate/sws-yuv-range new file mode 100644 index 0000000000..5b6f93b225 --- /dev/null +++ b/tests/ref/fate/sws-yuv-range @@ -0,0 +1,6 @@ +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 352x288 +#sar 0: 0/1 +0, 0, 0, 1, 152064, 0xe75c71a9