From patchwork Fri Mar 31 16:49:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chema Gonzalez X-Patchwork-Id: 40962 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp870302pzb; Fri, 31 Mar 2023 09:49:49 -0700 (PDT) X-Google-Smtp-Source: AKy350Zks3iesw6vr83+G/QFU8CJQtp0hbVHv/2Jl6f/L1/JionwFukLa2iMS6juX1e7SZbVE3iX X-Received: by 2002:a17:906:8581:b0:93e:3127:fc28 with SMTP id v1-20020a170906858100b0093e3127fc28mr28375394ejx.39.1680281389040; Fri, 31 Mar 2023 09:49:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680281389; cv=none; d=google.com; s=arc-20160816; b=k1dAotSOntpBocv8QjeKfpfwzlg0VCiHAArc/wdzY54YfS9h/h6yRGoVH/I9iERwJE 9wMasGq6aBaLSX6T+EXkcY40W0N0aW9KL3whoBl9UEWYY0wUR5SPgu5UESLXggemP6lm b2r75hWms5JXCF8z8XvJ3wNjYkxp4BgqzNoPA/hTRDZch8iskkG0FXSW4JMv4d/ppTIg vXoP0eJEuvufkIzx9pwuGfk3sZ/gkmBB168IL/+6XnSsGg1oqVRG4nKdsrVvZvz0AzmU oBoiOPeH8c53pBUG/DhFwnDFNOEqYd3iTxatpx5o5JIpo96IZnI+LDcIodhYGfxc2L5j 9swg== 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=6RZj4N4oE4bXxkF4KRHxqgj4HO5UiejvlErBT9Ht67c=; b=QvtOCDC6frCeGbFuBgXEmFFhq3f0bLqDcyFnBEGN47PAJ9RORiE4TBbyfclNj0Hoei 5S6ujP/Mmm0T5FDM1ZbHNiuxkwmhqIQ2TCOJsKiMUjyNWGxznnlFUojO5cmlhzI8g7G6 +6SPeUYXbZMGUEs0mop/tOM4k9Mkf5uoU32YmnR+7A7mQFmkXD7wfwCjwvSKYerESmuA da8lCiMFo+9QP6awGJJBNiqmUPWt9qc9L+ATsxA3HgJvjKMUH9CaOG9wSed1eDw1TQ+P ySEdnWmQUgRHyqcRCFTcXGdPYkAWYf1lwxdS4yKyrRJkcFgg5G9CrcNmLFs7lpeuNNFq sr7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=jeyUPMD7; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a21-20020a1709063a5500b008b223aa7a2dsi2156792ejf.734.2023.03.31.09.49.48; Fri, 31 Mar 2023 09:49: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=@gmail.com header.s=20210112 header.b=jeyUPMD7; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D032368C291; Fri, 31 Mar 2023 19:49:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 839B768C224 for ; Fri, 31 Mar 2023 19:49:31 +0300 (EEST) Received: by mail-pl1-f177.google.com with SMTP id o11so21809737ple.1 for ; Fri, 31 Mar 2023 09:49:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680281369; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Wb7jizZSuquV/wg5Lv6s7o01csWuqXwVJewYwKK7EpQ=; b=jeyUPMD7qE5xecsGadVps4ZHCOxUeue/nRDh3+RuzDWWKAbghJiweWQxUwYdZPN5EX DeY8rEjsPS2ZQu/Jt+TnxCH8BCi75NqekgRQedtfO8tXrCEzlzMUx0Jgh1d5Tas27T15 w8hnCEzN0rOi2cW1pBKxQIruGx+su6B6sQlWYYDljG9VmgOPz9ZcEKTCWZS87Mw+JDF8 ZsKG8vegamqgyNVLFLf4HK+tmyQVMmTJ1IKPQOIdSsFhw9mkMA3aTMBl73hjiSShsspl 6IyAwafBm1bKdAetIgJdz+gs4kJV0eVCB8qjFNYdZ6cu/t9h6LMLIqWXU5JQiiZ+m2pY Z+GQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680281369; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Wb7jizZSuquV/wg5Lv6s7o01csWuqXwVJewYwKK7EpQ=; b=owyqtXvMOoBIMRM24Qgpd7/t9Xa9KQQUPU5siSBJClxJ/+RZSAUz6Q/s2c24T9VtXd KxMM1DvPUqWXrNiFJwEwc05h9bkMa76GdNSbQETzvc2DFaQi4hlNyOhBYxOl+JQxN8PT gwQgFXhKFGLAgdq10ZLGdCSNbtCO5NgnlwD90HWKV+xCkpgBx/CbfhUKGohw0Yut6CT7 gQ6rkzTBadtqflIRpDI7Vr9ygj2zTIhDNU4yHXw7hFR4UnoK1rztRgGmbFox+gsAI+tj S9bJKFfcJbZTuRzjIdKtb7OkuqegM1Ijq29sx/+dUhxtHZqP96fvYskBz6wecUUhkOcc 0Yqg== X-Gm-Message-State: AAQBX9dgfrahvMSlUqJxivjTCHZo0VMAachb51ZPVFMd1GvawZtIU8nO kPs7Dpe5NloefVMKh6rIHZxHY4HykKo= X-Received: by 2002:a17:903:2803:b0:19e:73df:b0e9 with SMTP id kp3-20020a170903280300b0019e73dfb0e9mr23710945plb.21.1680281369374; Fri, 31 Mar 2023 09:49:29 -0700 (PDT) Received: from wilferico.thefacebook.com ([2620:10d:c090:400::5:b0e]) by smtp.gmail.com with ESMTPSA id w7-20020a170902d70700b0019aa6bf4450sm1772117ply.188.2023.03.31.09.49.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Mar 2023 09:49:29 -0700 (PDT) From: Chema Gonzalez To: ffmpeg-devel@ffmpeg.org Date: Fri, 31 Mar 2023 09:49:21 -0700 Message-Id: <20230331164923.4051693-2-chemag@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230331164923.4051693-1-chemag@gmail.com> References: <20230331164923.4051693-1-chemag@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] lavfi/vf_psnr: add warning when color ranges differ 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: Chema Gonzalez Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: efPl6ax4qjhV The PSNR filter uses the pixel values without considering the color ranges. This is incorrect. Patch adds a warning so at least the user knows it. Let's see an example: (1) Let's get a simple black pixel/white pixel image. ``` $ echo -n -e "\x00\x00\x00\xff\xff\xff" > /tmp/foo.rgb24 ``` (2) From this image, let's distill full and limited range y4m copies. ``` $ ffmpeg -y -f rawvideo -video_size 2x1 -pix_fmt rgb24 -i /tmp/foo.rgb24 -vf scale="out_range=full" -pix_fmt yuv420p /tmp/foo.full.y4m $ xxd /tmp/foo.full.y4m 00000000: 5955 5634 4d50 4547 3220 5732 2048 3120 YUV4MPEG2 W2 H1 00000010: 4632 353a 3120 4970 2041 303a 3020 4334 F25:1 Ip A0:0 C4 00000020: 3230 6a70 6567 2058 5953 4353 533d 3432 20jpeg XYSCSS=42 00000030: 304a 5045 4720 5843 4f4c 4f52 5241 4e47 0JPEG XCOLORRANG 00000040: 453d 4655 4c4c 0a46 5241 4d45 0a00 ff80 E=FULL.FRAME.... 00000050: 80 . ``` and ``` $ ffmpeg -y -f rawvideo -video_size 2x1 -pix_fmt rgb24 -i /tmp/foo.rgb24 -vf scale="out_range=limited" -pix_fmt yuv420p /tmp/foo.limited.y4m $ xxd /tmp/foo.limited.y4m 00000000: 5955 5634 4d50 4547 3220 5732 2048 3120 YUV4MPEG2 W2 H1 00000010: 4632 353a 3120 4970 2041 303a 3020 4334 F25:1 Ip A0:0 C4 00000020: 3230 6a70 6567 2058 5953 4353 533d 3432 20jpeg XYSCSS=42 00000030: 304a 5045 4720 5843 4f4c 4f52 5241 4e47 0JPEG XCOLORRANG 00000040: 453d 4c49 4d49 5445 440a 4652 414d 450a E=LIMITED.FRAME. 00000050: 10eb 8080 .... ``` Note that the 2x images are the same (both have 1x pixel at the darkest black, and one at the brightest white). Only difference is the range. (3) Let's calculate the PSNR score: ``` $ ./ffmpeg -filter_threads 1 -filter_complex_threads 1 -i /tmp/foo.full.y4m -i /tmp/foo.limited.y4m -lavfi "psnr" -f null - ... [Parsed_psnr_0 @ 0x2f5dac0] PSNR y:22.972065 u:inf v:inf average:25.982365 min:25.982365 max:25.982365 ``` As we are comparing an image with itself, we expect "y:inf" as the luma PSNR. Issue here is that the PSNR filter just uses the pixel values, ignoring the color ranges. A possible solution would be to have the filter do the conversion. Proposed solution is to add a warning. ``` $ ./ffmpeg -filter_threads 1 -filter_complex_threads 1 -i /tmp/foo.full.y4m -i /tmp/foo.limited.y4m -lavfi "psnr" -f null - ... [Parsed_psnr_0 @ 0x2f5dac0] Warning: master and reference frames use different color ranges (pc != tv) ... [Parsed_psnr_0 @ 0x2f5dac0] PSNR y:22.972065 u:inf v:inf average:25.982365 min:25.982365 max:25.982365 ``` Tested: Ran fate. ``` $ make fate -j ... TEST seek-lavf-ppmpipe TEST seek-lavf-pgmpipe TEST seek-lavf-mxf_opatom ``` --- libavfilter/vf_psnr.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavfilter/vf_psnr.c b/libavfilter/vf_psnr.c index 15cde7e8c8..bd33322593 100644 --- a/libavfilter/vf_psnr.c +++ b/libavfilter/vf_psnr.c @@ -188,6 +188,13 @@ static int do_psnr(FFFrameSync *fs) td.planeheight[c] = s->planeheight[c]; } + if (master->color_range != ref->color_range) { + av_log(ctx, AV_LOG_WARNING, "Warning: master and reference " + "frames use different color ranges (%s != %s)\n", + av_color_range_name(master->color_range), + av_color_range_name(ref->color_range)); + } + ff_filter_execute(ctx, compute_images_mse, &td, NULL, FFMIN(s->planeheight[1], s->nb_threads)); From patchwork Fri Mar 31 16:49:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chema Gonzalez X-Patchwork-Id: 40963 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp870393pzb; Fri, 31 Mar 2023 09:49:56 -0700 (PDT) X-Google-Smtp-Source: AKy350bHEzqJfuuC6X2qJWopzaylBkRzzCLuS8GYMy9uXMOh/0jyJ1qGpi2QUCLCty4689C21Mef X-Received: by 2002:a17:906:f6cd:b0:92f:b8d0:746c with SMTP id jo13-20020a170906f6cd00b0092fb8d0746cmr27265936ejb.20.1680281396713; Fri, 31 Mar 2023 09:49:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680281396; cv=none; d=google.com; s=arc-20160816; b=n3utxofu40J5jUQRcUxbssglpY+c6Cs/Q1KkmrAv+XljFbllG6ppjQj5B2fvO1E1aT qnWhZoRys9WVkekM742sIzX+9+ISJAEddu+zj53NAF6h1U1CVl8aI3yyCRspL3ThXizi x3HO6p6QDXjJv/InwkWURdI9AmjZrukEBYXwwRYyZEeLUw+RmlfSECfmPD31zu+aaHNH q651OzRHF5fjuPH/a/RJrc7jEWy/0a3kDDje9g/DXT+v9L5znI9n4JQhDD1yOM48DtQk iycbycedaVsNNCQmnyLTxdtZMRjdpg7eb/1lU7A68aXXIgmdk2e3C8rlj1QnHOAijGOw 3M8w== 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=FNfvLKcsAXuaO9cuU2bwB9Dp5hJ9FNWsfFBhkuvAHkI=; b=ETfyKLFlil5xVgxBjhC/ZtnBEyU+yh1+i/k9grEtbJNLusBRYYpH6QHi6UCFQzm6pF NbEjVklZDJHw1JZ45dGY1+BN0oGqVesbkL8298H0TMSxcVpIQo93a+ERoKFJe6YcSiXl isaK7Lhaa3W6NbogSoomFVHI/mdyKN0hU7n9mWk/LeSaTEDrJYeYkcdWF6mh5PKqn9Fg VSD/L6YTJXO0yJeVNvUF0G56XWGfhFHZMkkMhr0ngRCVKhDwsRaGRAMVx1F20o92pGwP 9F4auZUpVbRhonFxrHvxAVCvM07pNYNyUMMv0dMRb8RofrcXft8vzRFlN5V/IXcFzrKP xn/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=XGwsQhfB; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f7-20020a170906738700b0092a3709e877si2566331ejl.679.2023.03.31.09.49.56; Fri, 31 Mar 2023 09:49:56 -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=@gmail.com header.s=20210112 header.b=XGwsQhfB; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DAC1568C292; Fri, 31 Mar 2023 19:49:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1607068C1E4 for ; Fri, 31 Mar 2023 19:49:33 +0300 (EEST) Received: by mail-pj1-f50.google.com with SMTP id o6-20020a17090a9f8600b0023f32869993so26029743pjp.1 for ; Fri, 31 Mar 2023 09:49:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680281371; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9Zp/+K4jbL6yi0zO6NWXi1wqOrx6GWa8r1w8haAKATM=; b=XGwsQhfB5y8OPabZ6M4tyLkxFPi2FTy+Hb+uHhSJmH/iGes5Jfw/6skTvquiQi8lSX 5rJ3rtVS8JhQqfUyZbx+PyPOqXEnrz8OmivtaBWPGzQwnKuVhrqEnm2M/XLp2r1OZzNF YF6cxB7k1G0uxo8Z2J77iXvkpVGZ/bAecSNcYiRPUckdrUnCWC/jXvWEojjC6HWrK8z7 qMi7FbZDUgL67oqaZm69zn50ze2TG+Xp7twmrB1XJaHVNbGRp+sxyuE8QO3qXR+lCqhz CiJNt0bh+VT0QCaj/GcEykgpp/D97L+mU52O3+5Pjg/fWzRVgzWJVKACrYWEPHZXOn2z vBYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680281371; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9Zp/+K4jbL6yi0zO6NWXi1wqOrx6GWa8r1w8haAKATM=; b=KYonTFcx4nXAz7hKrY/emiKyBYmM34QVCsAmmHw8wK7WDgl1K7TAl3mJwJkGLaGWmZ pN8/Ao1SwNUE6YmxEBo/UiH2JL6iPD8ap+wASJFA9/4J+mficiy551TxDmndmcODvWxG 6jmBxiKxWxzXS/GNr8VPxkyaWf3jlHH0MY3+53qk2hIrsY6uITIEvYe5VPQvb3Eyz/Sn 9ycmEMZ7zxORMpiqSUZpiN6ETDmPhJqszJGTrC9S6qwwfvEcq5cMsdimVActpSnzsD0R YeNRkLlBdWDD0hksFcEKIvF60kC9kbpZYYyaRLpKihhIzfuSa7JybDSPctTTJF0R+Ekv fyGg== X-Gm-Message-State: AAQBX9fWFCEgqj3sIKJhOR0mZ2+dKh8ZG0sNBshCgs1xAFRrJ1ypVKDI mdUYicOMOPJBgzxQW5MzNpU4RfYSs64= X-Received: by 2002:a17:903:22c6:b0:1a2:8924:2230 with SMTP id y6-20020a17090322c600b001a289242230mr7172386plg.27.1680281370940; Fri, 31 Mar 2023 09:49:30 -0700 (PDT) Received: from wilferico.thefacebook.com ([2620:10d:c090:400::5:b0e]) by smtp.gmail.com with ESMTPSA id w7-20020a170902d70700b0019aa6bf4450sm1772117ply.188.2023.03.31.09.49.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Mar 2023 09:49:30 -0700 (PDT) From: Chema Gonzalez To: ffmpeg-devel@ffmpeg.org Date: Fri, 31 Mar 2023 09:49:22 -0700 Message-Id: <20230331164923.4051693-3-chemag@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230331164923.4051693-1-chemag@gmail.com> References: <20230331164923.4051693-1-chemag@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] lavfi/vf_ssim: add warning when color ranges differ 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: Chema Gonzalez Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: zonEKGQa/r+P The SSIM filter uses the pixel values without considering the color ranges. This is incorrect. Patch adds a warning so at least the user knows it. Let's see an example. (1) Let's get FR and LR versions of the same image. ``` $ ffmpeg -y -i /tmp/lena.490x490.ppm -vf scale="out_range=full" -pix_fmt yuv420p /tmp/lena.full.y4m $ xxd /tmp/lena.full.y4m |head 00000000: 5955 5634 4d50 4547 3220 5734 3930 2048 YUV4MPEG2 W490 H 00000010: 3439 3020 4632 353a 3120 4970 2041 303a 490 F25:1 Ip A0: 00000020: 3020 4334 3230 6a70 6567 2058 5953 4353 0 C420jpeg XYSCS 00000030: 533d 3432 304a 5045 4720 5843 4f4c 4f52 S=420JPEG XCOLOR 00000040: 5241 4e47 453d 4655 4c4c 0a46 5241 4d45 RANGE=FULL.FRAME 00000050: 0a72 7271 7070 706f 6f6e 6d6d 6c6d 6d6d .rrqpppoonmmlmmm 00000060: 6c6e 6e6d 6d6e 6e6e 6d6c 6d6d 6d6d 6d6d lnnmmnnnmlmmmmmm 00000070: 6d6e 6d6b 6c6d 6e6e 6d6c 6d6d 6e6e 6f6f mnmklmnnmlmmnnoo 00000080: 6f6f 6e6e 6e6e 6f70 7172 7375 7676 7370 oonnnnopqrsuvvsp 00000090: 6d69 6662 5e59 534d 4845 3d35 302e 2d2c mifb^YSMHE=50.-, ``` ``` $ ffmpeg -y -i /tmp/lena.490x490.ppm -vf scale="out_range=limited" -pix_fmt yuv420p /tmp/lena.limited.y4m $ xxd /tmp/lena.limited.y4m | head 00000000: 5955 5634 4d50 4547 3220 5734 3930 2048 YUV4MPEG2 W490 H 00000010: 3439 3020 4632 353a 3120 4970 2041 303a 490 F25:1 Ip A0: 00000020: 3020 4334 3230 6a70 6567 2058 5953 4353 0 C420jpeg XYSCS 00000030: 533d 3432 304a 5045 4720 5843 4f4c 4f52 S=420JPEG XCOLOR 00000040: 5241 4e47 453d 4c49 4d49 5445 440a 4652 RANGE=LIMITED.FR 00000050: 414d 450a 7272 7170 7070 6f6f 6e6e 6e6d AME.rrqpppoonnnm 00000060: 6e6e 6e6d 6f6e 6e6e 6e6e 6e6e 6d6e 6e6e nnnmonnnnnnnmnnn 00000070: 6e6e 6e6e 6f6e 6c6d 6e6f 6e6e 6d6e 6e6f nnnnonlmnonnmnno 00000080: 6f6f 6f6f 6f6f 6f6f 6f6f 7071 7273 7576 oooooooooopqrsuv 00000090: 7673 706e 6a68 6461 5c57 524e 4b44 3d39 vspnjhda\WRNKD=9 ``` Note that the 2x images are the same. Only difference is the range, and the precision issues related to range conversion. (2) Let's calculate the SSIM score: ``` $ ./ffmpeg -filter_threads 1 -filter_complex_threads 1 -i /tmp/lena.full.y4m -i /tmp/lena.limited.y4m -lavfi "ssim" -f null - ... [Parsed_ssim_0 @ 0x360ab00] SSIM Y:0.942347 (12.391801) U:0.995808 (23.776062) V:0.996104 (24.093747) All:0.960217 (14.003012) ``` As we are comparing an image with itself, we expect "Y: 1" as the luma SSIM. Issue here is that the SSIM filter just uses the pixel values, ignoring the color ranges. Proposed solution is to add a warning. ``` $ ./ffmpeg -filter_threads 1 -filter_complex_threads 1 -i /tmp/foo.full.y4m -i /tmp/foo.limited.y4m -lavfi "ssim" -f null - ... [Parsed_ssim_0 @ 0x3766280] Warning: master and reference frames use different color ranges (pc != tv) ... [Parsed_ssim_0 @ 0x3766280] SSIM Y:0.000000 (0.000000) U:0.000000 (0.000000) V:0.000000 (0.000000) All:0.000000 (0.000000) ``` Tested: Ran fate. ``` $ make fate -j ... TEST seek-lavf-ppmpipe TEST seek-lavf-pgmpipe TEST seek-lavf-mxf_opatom ``` --- libavfilter/vf_ssim.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavfilter/vf_ssim.c b/libavfilter/vf_ssim.c index 1933b9b82d..c3a05182fb 100644 --- a/libavfilter/vf_ssim.c +++ b/libavfilter/vf_ssim.c @@ -358,6 +358,13 @@ static int do_ssim(FFFrameSync *fs) td.planeheight[n] = s->planeheight[n]; } + if (master->color_range != ref->color_range) { + av_log(ctx, AV_LOG_WARNING, "Warning: master and reference " + "frames use different color ranges (%s != %s)\n", + av_color_range_name(master->color_range), + av_color_range_name(ref->color_range)); + } + ff_filter_execute(ctx, s->ssim_plane, &td, NULL, FFMIN((s->planeheight[1] + 3) >> 2, s->nb_threads)); From patchwork Fri Mar 31 16:49:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chema Gonzalez X-Patchwork-Id: 40964 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp870516pzb; Fri, 31 Mar 2023 09:50:05 -0700 (PDT) X-Google-Smtp-Source: AKy350Zz3tEfmC0lbeG7OkL6HEs9KpHVxrlIIlDN4uIMrbc9PFox2x4/jnfApe0eq4aYSLyjAsA0 X-Received: by 2002:a17:906:b303:b0:933:48ce:73a5 with SMTP id n3-20020a170906b30300b0093348ce73a5mr25740685ejz.56.1680281404851; Fri, 31 Mar 2023 09:50:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680281404; cv=none; d=google.com; s=arc-20160816; b=fmY3cLqyNa2rV7jGWoWqUv+zBGgeoJ8m2xCc2jB9S7AELrZxeJJf9Oflg1VNu7IuPX HQ/abJ2x1PxCd5V+EFPgQYvu5q1HZSq97PQ7GIhkjrU27nveRMYZ5qhVUYURLHunIdEO MRdm8iF8N8enO8r7t1mYHb1ZmZ++ne58+AZwxF/5DSnuZ+Xrwy6qk/mixpNaJ+FoW7/K FvU8/OAYtr30KmyBTGGzrKJg/2x8E4ysQVzszuWpajMxgZOBdlMeApZ4Cd1jNiVdDyYp s6pj0skkWuKKTxu4hvRqHTP4f/OYlEITyZyYGOX2q/Zk1MijirlBf+uXn1eE6C+tl7b6 P9LA== 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=wUrHH2T+rXPc1QBog9jhui/eDUXnmstsTWDEx1ep51g=; b=R8d3Fqnln049ALJJftYDOvXfZNX3EIqPdNVNGgzYC5/GbeGXBVNjtD6pBSp5UNtdOK hm2W1P7lW1PSkyNUJiy/tWdqhUB6srZ05FJANLuL/b48jeWmGlyaN212hFNyVLpg5Rd6 yC/Y5tyntv6BwM6F5u2JfHY36aulCM5r/kuVGoGW0aYsQE5TtXB80rW1J3CiLhUtmHqB KXMJVX1odFGAUzixkDe8jvsMsPR8nlc4SPLXGjHYVmwaWyq+Uj/Jmf9QXP7o2rQJJRbJ LF1YnCvLqVVt/V2qSneU3aCYh/i1hjDqfU9kZcQi0ymxB122LlFKwlHVnW7Djli6AF2o yNXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=izOW1iSz; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g12-20020a056402180c00b005021f0d5755si1336908edy.668.2023.03.31.09.50.04; Fri, 31 Mar 2023 09:50:04 -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=@gmail.com header.s=20210112 header.b=izOW1iSz; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E27E168C2DF; Fri, 31 Mar 2023 19:49:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9DA1468C292 for ; Fri, 31 Mar 2023 19:49:34 +0300 (EEST) Received: by mail-pl1-f171.google.com with SMTP id kq3so21749271plb.13 for ; Fri, 31 Mar 2023 09:49:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680281372; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+SrWmZstzaJKdn4oayzmJP0n0Nx0wNRqc1Wdg4Czwsc=; b=izOW1iSzQOwrw00BymXBJ4hjx9u7JqaI7eDPbzX3YOZOGttyBfj1kZ3AA/I4kgcUuQ oGo4cvPvmKbWRsOnDM4rVOSiX0oo1GI62uUNPs1XkjAcNqJEC8bNWIYmgdIYc28baCpr EjeoMpmj6Y0pAOk5xesN3ileCdM1vw7VTo5lTrnDGqQflI+/QZknyvVVXnMwh4Iwm2t7 wXSD7z32tGHeBqpx/0ySPd50NQHSjgnVPvSJgPY1CDhXNHdSfESZ3GguwQzNdhVZqBrM OvC7T42NjQQl15mcr9GhaH7SXd03ASVETFlLAplhUen/0rABPgllyn44htrb7/CnzOjH mD5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680281372; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+SrWmZstzaJKdn4oayzmJP0n0Nx0wNRqc1Wdg4Czwsc=; b=ib/yVJabk5DZgEGplmZ8A+VUOSXh9LSaatRjnroPidMyM79vzt3hYclAayL142gFym 7vjliK61PzD/ecImGxNW+WBimu224tjRdTyI6Vx+v3YLIM/jFkR7VF7Be+D4L07MPg2+ Tky1/8n7vIZlYYmYkuwuzhSmCkxIG9+xFuRxfNNfqGsPkYpZnvc6/YFH7AT37WSnQmUr T8V8eaxWdHb2AzhMfrZMxlKmIrJs1vZe+8Bz6w58Ho9rAtAWvo9kdUv9CEeiKgNfqv5Z eEJKeMiT+io+EQMKKCZxHc9U2Q/u4fRJb1oCzjLHTA+eSG/cZVMoCAZJokQfE9w1R1zF oCww== X-Gm-Message-State: AAQBX9cuyVvtYnDridzWfmEvdlcf6zaCyWzs8nRX09f0mvq33duxea44 8+VDlaD92XBW5xHBC3Rgp4lmeT+TUxg= X-Received: by 2002:a17:90b:4a8b:b0:23f:abfd:1241 with SMTP id lp11-20020a17090b4a8b00b0023fabfd1241mr29718378pjb.1.1680281372308; Fri, 31 Mar 2023 09:49:32 -0700 (PDT) Received: from wilferico.thefacebook.com ([2620:10d:c090:400::5:b0e]) by smtp.gmail.com with ESMTPSA id w7-20020a170902d70700b0019aa6bf4450sm1772117ply.188.2023.03.31.09.49.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Mar 2023 09:49:32 -0700 (PDT) From: Chema Gonzalez To: ffmpeg-devel@ffmpeg.org Date: Fri, 31 Mar 2023 09:49:23 -0700 Message-Id: <20230331164923.4051693-4-chemag@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230331164923.4051693-1-chemag@gmail.com> References: <20230331164923.4051693-1-chemag@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] lavfi/vf_libvmaf: add warning when color ranges differ 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: Chema Gonzalez Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 2RihwJVjCSoq The VMAF filter uses the pixel values without considering the color ranges. This is incorrect. Patch adds a warning so at least the user knows it. Let's see an example. (1) Let's get FR and LR versions of the same image. ``` $ ffmpeg -y -i /tmp/lena.490x490.ppm -vf scale="out_range=full" -pix_fmt yuv420p /tmp/lena.full.y4m $ xxd /tmp/lena.full.y4m |head 00000000: 5955 5634 4d50 4547 3220 5734 3930 2048 YUV4MPEG2 W490 H 00000010: 3439 3020 4632 353a 3120 4970 2041 303a 490 F25:1 Ip A0: 00000020: 3020 4334 3230 6a70 6567 2058 5953 4353 0 C420jpeg XYSCS 00000030: 533d 3432 304a 5045 4720 5843 4f4c 4f52 S=420JPEG XCOLOR 00000040: 5241 4e47 453d 4655 4c4c 0a46 5241 4d45 RANGE=FULL.FRAME 00000050: 0a72 7271 7070 706f 6f6e 6d6d 6c6d 6d6d .rrqpppoonmmlmmm 00000060: 6c6e 6e6d 6d6e 6e6e 6d6c 6d6d 6d6d 6d6d lnnmmnnnmlmmmmmm 00000070: 6d6e 6d6b 6c6d 6e6e 6d6c 6d6d 6e6e 6f6f mnmklmnnmlmmnnoo 00000080: 6f6f 6e6e 6e6e 6f70 7172 7375 7676 7370 oonnnnopqrsuvvsp 00000090: 6d69 6662 5e59 534d 4845 3d35 302e 2d2c mifb^YSMHE=50.-, ``` ``` $ ffmpeg -y -i /tmp/lena.490x490.ppm -vf scale="out_range=limited" -pix_fmt yuv420p /tmp/lena.limited.y4m $ xxd /tmp/lena.limited.y4m | head 00000000: 5955 5634 4d50 4547 3220 5734 3930 2048 YUV4MPEG2 W490 H 00000010: 3439 3020 4632 353a 3120 4970 2041 303a 490 F25:1 Ip A0: 00000020: 3020 4334 3230 6a70 6567 2058 5953 4353 0 C420jpeg XYSCS 00000030: 533d 3432 304a 5045 4720 5843 4f4c 4f52 S=420JPEG XCOLOR 00000040: 5241 4e47 453d 4c49 4d49 5445 440a 4652 RANGE=LIMITED.FR 00000050: 414d 450a 7272 7170 7070 6f6f 6e6e 6e6d AME.rrqpppoonnnm 00000060: 6e6e 6e6d 6f6e 6e6e 6e6e 6e6e 6d6e 6e6e nnnmonnnnnnnmnnn 00000070: 6e6e 6e6e 6f6e 6c6d 6e6f 6e6e 6d6e 6e6f nnnnonlmnonnmnno 00000080: 6f6f 6f6f 6f6f 6f6f 6f6f 7071 7273 7576 oooooooooopqrsuv 00000090: 7673 706e 6a68 6461 5c57 524e 4b44 3d39 vspnjhda\WRNKD=9 ``` Note that the 2x images are the same. Only difference is the range, and the precision issues related to range conversion. (2) Let's calculate the VMAF score: ``` $ ./ffmpeg -filter_threads 1 -filter_complex_threads 1 -i /tmp/lena.full.y4m -i /tmp/lena.limited.y4m -lavfi libvmaf="model=path=/usr/share/model/vmaf_v0.6.1neg.json" -report -f null - ... [Parsed_libvmaf_0 @ 0x3cc9b40] VMAF score: 85.530109 ``` As we are comparing an image with itself, we expect the score to be close to 100. Issue here is that the VMAF filter just uses the pixel values, ignoring the color ranges. Proposed solution is to add a warning. ``` $ ./ffmpeg -filter_threads 1 -filter_complex_threads 1 -i /tmp/lena.full.y4m -i /tmp/lena.limited.y4m -lavfi libvmaf="model=path=/us r/share/model/vmaf_v0.6.1neg.json" -report -f null - ... [Parsed_libvmaf_0 @ 0x3cc9b40] Warning: distorted and reference frames use different color ranges (pc != tv) ... [Parsed_libvmaf_0 @ 0x3cc9b40] VMAF score: 85.530109 ``` Tested: Ran fate. ``` $ make fate -j ... TEST seek-lavf-ppmpipe TEST seek-lavf-pgmpipe TEST seek-lavf-mxf_opatom ``` --- libavfilter/vf_libvmaf.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavfilter/vf_libvmaf.c b/libavfilter/vf_libvmaf.c index 2586f37d99..d330658abb 100644 --- a/libavfilter/vf_libvmaf.c +++ b/libavfilter/vf_libvmaf.c @@ -141,6 +141,13 @@ static int do_vmaf(FFFrameSync *fs) if (ctx->is_disabled || !ref) return ff_filter_frame(ctx->outputs[0], dist); + if (dist->color_range != ref->color_range) { + av_log(ctx, AV_LOG_WARNING, "Warning: distorted and reference " + "frames use different color ranges (%s != %s)\n", + av_color_range_name(dist->color_range), + av_color_range_name(ref->color_range)); + } + err = copy_picture_data(ref, &pic_ref, s->bpc); if (err) { av_log(s, AV_LOG_ERROR, "problem during vmaf_picture_alloc.\n");