From patchwork Sat Apr 1 17:47:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chema Gonzalez X-Patchwork-Id: 40966 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp1609500pzb; Sat, 1 Apr 2023 10:47:54 -0700 (PDT) X-Google-Smtp-Source: AKy350aSAwQ0CAUlMzXc3B8UoBzj546q73iv0GUxvHXuO7wbguhTy6vIdLqUlTkfipV7dcl/ZHJC X-Received: by 2002:a17:907:a586:b0:946:c60b:470b with SMTP id vs6-20020a170907a58600b00946c60b470bmr18239726ejc.63.1680371274760; Sat, 01 Apr 2023 10:47:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680371274; cv=none; d=google.com; s=arc-20160816; b=LzxwJM3YaYuootepzEJGE5aX7TFX3vRosBdRf2Ki8txYRL5BTz0kE0t6hM8rfBlp75 3ZYu2CbQKU2NFb1wyIgrcLFg28UgmeAJWEq8oc/KAlRBnBSIszrHX5JoQZiC+WGXwUUk 67pPg3cK3YSsH5elwNePN7iAE4qDdbcDOTbxRHVrmBMSq+PsZ5vXWQK9FR2BGhknbEfi c7zKIu1cVI4e62OAq6kysMvYtbWf2SJ59m1uW8tCKBfrdO2xGzt6ItShMdWqgiq/zUUG 38EmoRdX7Ur3NqfzxT7vyO7yAL2jOzp2S4Epqfmq4fV3N8YS+PFn50m/4CD0FMolVC6V 3vsA== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=gsyRo5KaKjna5EDnvtPAZiHk5YbebIEyB0iHKZCC4Y4=; b=TACygvQazikvQArz0nIseLeLednKCcnH4ytaPzGm0kZ+OY3b+CfqPjTXNA7asZYf3B 4jFDMddQg11yAuZtNa+KgakU4KpkY9n0EDR4JzEUqghG++cQzrpVNzE2rgPzp8X7hG2d +kMxhOuV4LFUK7qy+83uDdfo+mCxV44AgaQub1EepPUFCPOFrdWADXaTjh0eG3cgWkMI BCFtSS6vSixn8qqOg1H4ldpaLjgCAOYxoZtRnVqloM1sBPFr8ryn2R+SqYJlnqq2OdNa W9+wh0cV1bdyEUrrtd+4BIqInzeATr4oevXldxos/gmyxp+azKUuTKM6QgIK6DOmOzeq Z+GQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=p0iGYBlY; 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 u10-20020aa7d98a000000b005021cd581a0si4447629eds.402.2023.04.01.10.47.54; Sat, 01 Apr 2023 10:47:54 -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=p0iGYBlY; 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 49DDE68BEB0; Sat, 1 Apr 2023 20:47:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3DA3A68BF58 for ; Sat, 1 Apr 2023 20:47:44 +0300 (EEST) Received: by mail-pf1-f170.google.com with SMTP id cm5so10876499pfb.0 for ; Sat, 01 Apr 2023 10:47:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680371261; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=aWi2S0/tib9N0XKm6rtXvgXfz/PWmtEJEYWpbCUO6NY=; b=p0iGYBlY5g04R3q65oj5rkvfq16n045eW76BmNwcy7RDgAEd2SxtHeSipa5DxO49Qf wbAVbmwPxOJ0+XuL1o4+PYFmOQaURC/gnwKGJHJGs0TMPfdLvENRXM3f1OBtHeCWwnMU 2B6w93ohyGA85LduqcmT11vGa3HxM6ywy6OQj8GuUqukYBsoLeHE7BuoYXLB68bNmmIx GU18/q05WQPRdG4elyTatLn1V7qEYrfAjJvh6U3/GsvRDkZrkOYdllFLmHyV4yX2AzIO JJ3UJPxCsPros4eTn7TrH8Td4OcPxdzn3ybujFPFw9lhN7K/koEzhnw95xDtp6thKH/z B7fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680371261; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=aWi2S0/tib9N0XKm6rtXvgXfz/PWmtEJEYWpbCUO6NY=; b=53uoAAn0V70SJ+gJ878Nbk2Lpy21c6rK+EY01EedXPdfDsHCYx6Q/tUqUka0n9m2fm zrzy/om0eAg90YuHksgyaU3qVRgeBvm2sz2piTUwkEgtoSyVy8LMJBQLJ5u8qILpwQ1N yDrGlf+VDzFc20f+ycY/EGJFxj9lbcyrxBQ6NhZBCnTriKcZ4wMECrwxq/BeNULuMRTZ j/x3+4gx1FDHLA/DLMriG3SsqhVuanxf8015sJsTrkkSNhBt9DdbmmU/vIBH9j3ACmTG XRGRVM6aQ2z1U+PxA+i3oK2lg0USeT9kb4AgwLyqkSUb7ZzQu5SXz+uyZNmkLkiqNhRn Ixnw== X-Gm-Message-State: AAQBX9d/M13bStgIAWDhTuXGwSUDo9fwWIb1IRPN1X/PHq1P1yn0JXkt 2uMbTtor8BMRlwH5eK2qR+58MV2dOs0= X-Received: by 2002:a62:1ac9:0:b0:62d:b4aa:79f9 with SMTP id a192-20020a621ac9000000b0062db4aa79f9mr14953498pfa.28.1680371261487; Sat, 01 Apr 2023 10:47:41 -0700 (PDT) Received: from wilferico.thefacebook.com ([2620:10d:c090:400::5:b0e]) by smtp.gmail.com with ESMTPSA id w22-20020a056a0014d600b005810c4286d6sm1508972pfu.0.2023.04.01.10.47.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Apr 2023 10:47:41 -0700 (PDT) From: Chema Gonzalez To: ffmpeg-devel@ffmpeg.org Date: Sat, 1 Apr 2023 10:47:35 -0700 Message-Id: <20230401174737.85192-1-chemag@gmail.com> X-Mailer: git-send-email 2.39.2 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: WOp08cvdVgUZ 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] 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..058a8932f4 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, "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));