From patchwork Fri Apr 14 15:58:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suraj Shirvankar X-Patchwork-Id: 41180 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp610032pzb; Fri, 14 Apr 2023 08:59:14 -0700 (PDT) X-Google-Smtp-Source: AKy350YFLAhG6C80ljeTdNPyGkCnKtPzaa0BXSWUFihxdhku1SaTKwlnMyn5lEb1hEgLDa184iZh X-Received: by 2002:a17:906:614:b0:92b:e1ff:be30 with SMTP id s20-20020a170906061400b0092be1ffbe30mr6154090ejb.4.1681487954136; Fri, 14 Apr 2023 08:59:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681487954; cv=none; d=google.com; s=arc-20160816; b=tVqSGvl0CBABVxamlNTAicvY55KqDGzKeLpbJDTSjUcOe203oMyQoUNzWF+/TqtfUq FvT6rljnSgUok3jjkOQz/F6PjVNvhiT7n8Yj6UAhXeABtpfaB++wZWjG115Yp8ytNjk9 tZnI6oyQ3wrq06qvy2VeSwte1IlY8d0PqMgtlFAOCGQg19WBis8JsU16pCF4WAg8P/bB q5DDmXJE8W4aDvZ7TWfa3tRuAbYw7JBNzPbAiBpwtzmQthBeTkkN09tQmMHr89aEdn7m J4Ia2QZ7I1JCrdb3aO45xmBu/385rvmNB42WztaazKzdocXQEZS2+L1jdhFupSUtwmUX ROVA== 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:content-language:to:from:user-agent:mime-version :date:message-id:dkim-signature:delivered-to; bh=Zzc2vpIM/OAQfV4+PR1u4dAzJ+Xppdp2DXq36QP3dqg=; b=f64wJfcZLxawLtQB2jCcZza3cs+EaEJWU3vE9Smo6OE1iQkmRfjhoH8zymXpFWctW2 /33+gnG0GVI/nd2Zd5b69X+HLGl9FS0CNiyxBp/Yc7LfSLh9IJ0lFRv+291ypHd4uhv3 Qac6FLSVuxbZoDkTPDZc9mwtUvged41fDPBc+wCOa7+Mfwr62Eh6otByNe4oLB7uF5Aj 4J/7HHKsjNz5aizvjhGvZ0151pXRg8G1m0cxBydUrQrEoWNs8tQ8fxHF+iTy1nnfF7Q1 8Jxi3aI7BM2ZJ87CjjsQhZCY/oerJ6/MfgDve6dwiFiHaWhQj+rBNUoETR33cbA+oV6T I/hA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=Qp0vKgbh; 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 l5-20020a170907914500b0094a5477988asi4620346ejs.668.2023.04.14.08.59.13; Fri, 14 Apr 2023 08:59:14 -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=20221208 header.b=Qp0vKgbh; 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 B233E68BEAE; Fri, 14 Apr 2023 18:59:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5E6E268BE80 for ; Fri, 14 Apr 2023 18:59:02 +0300 (EEST) Received: by mail-wm1-f54.google.com with SMTP id he13so15632761wmb.2 for ; Fri, 14 Apr 2023 08:59:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681487941; x=1684079941; h=content-transfer-encoding:content-language:to:subject:from :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=Hek6ZeYmsuQcBoX3FI6SjLHy8/IrJ8ALyyV2TFKIHxI=; b=Qp0vKgbhCfDUDDF94HV4j35vj/i1qNmadyrJyL6UyFIbzgJvL5kofhzwT5CiQ7qv4R V+Bw8HJGeJkU4UaUzyYrgg5AAiVMJVh4WgIJyF9PIcgepUAZAsWI0AioU1L8bfsyaH/r OCFk9V7HJ0liJyFzCBincnfvxPYWup/YMGpqCtqXg2p07ByXGqf5RfJ2m224RRqFx4+B 5wxe8B4uM62zqLFcuc1wnqbkmC78EdHy4FCzjmZf+PcjcKco6lUNpupTICQF6HupMAvB 4n41Hg/4G94jFwFYKQvolRPCURnNCodM1uqseWmIiwRdQVk+keNoRC9EPJXP/t2l8IvO 6TEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681487941; x=1684079941; h=content-transfer-encoding:content-language:to:subject:from :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=Hek6ZeYmsuQcBoX3FI6SjLHy8/IrJ8ALyyV2TFKIHxI=; b=ljTJNXIEOC9SLbeWz7/8EYinoWhGtqPYsct1qpQqEASjvN0+XI3WA8A4EzwK0dh9Jp kfZm/sLMGHgdbEf+r88QnS+Juljb4YeIXtH5Czipy6NT4Otk/8EbvEN507g/EiE4sC5J lDFtZ6uQ8m0ZD/ErVcukJIElHsyZ43lVAOTY5O0LsPB/0Iyt4grqLEGBWpAVJdH8S/1E W15ylWLa2PeSWHUTT7gF1Q/dlJ1NFaV9VUaHrlO5t4j0w2+EI1Oafo5nCwpRzE4bGh4q +gIfQqNRUdwNyR8KjELP9qKD4X6q26gTeu6kH/LfW9utSizbRURqIgzevvEpaPER4/J6 8r0Q== X-Gm-Message-State: AAQBX9esptNgcEDE/52Hs41nrgYBtNJ/SQaRJV8KlW0gLaWbZUuO8i2l Dq2hQUm3IAvZJMLFhNNRAmm1xXEZ6aT8JA== X-Received: by 2002:a1c:cc1a:0:b0:3ef:6b97:f0c3 with SMTP id h26-20020a1ccc1a000000b003ef6b97f0c3mr5068973wmb.15.1681487941039; Fri, 14 Apr 2023 08:59:01 -0700 (PDT) Received: from [192.168.1.216] ([81.0.1.1]) by smtp.gmail.com with ESMTPSA id p6-20020a1c7406000000b003ed2c0a0f37sm4568552wmc.35.2023.04.14.08.59.00 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 14 Apr 2023 08:59:00 -0700 (PDT) Message-ID: <260ab8b9-ddbe-c933-9a08-3420c4a02189@gmail.com> Date: Fri, 14 Apr 2023 17:58:59 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.9.1 From: Suraj Shirvankar To: ffmpeg-devel@ffmpeg.org Content-Language: en-US Subject: [FFmpeg-devel] [PATCH] vf_psnr: Refactor vf_psnr sse_line 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: 5aa5vDguIDpq Signed-off-by: Suraj Shirvankar --- libavfilter/vf_psnr.c | 41 ++++++++++++++++++----------------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/libavfilter/vf_psnr.c b/libavfilter/vf_psnr.c index 15cde7e8c8..a0c673831d 100644 --- a/libavfilter/vf_psnr.c +++ b/libavfilter/vf_psnr.c @@ -59,7 +59,7 @@ typedef struct PSNRContext { } PSNRContext; #define OFFSET(x) offsetof(PSNRContext, x) -#define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM +#define FLAGS AV_OPT_FLAG_FILTERING_PARAM | AV_OPT_FLAG_VIDEO_PARAM static const AVOption psnr_options[] = { {"stats_file", "Set file where to store per-frame difference information", OFFSET(stats_file_str), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, FLAGS }, @@ -81,31 +81,26 @@ static inline double get_psnr(double mse, uint64_t nb_frames, int max) return 10.0 * log10(pow_2(max) / (mse / nb_frames)); } -static uint64_t sse_line_8bit(const uint8_t *main_line, const uint8_t *ref_line, int outw) -{ - int j; - unsigned m2 = 0; - - for (j = 0; j < outw; j++) - m2 += pow_2(main_line[j] - ref_line[j]); +#define SSE_LINE(name, type) \ + static uint64_t sse_line_##name(const uint8_t *_main_line, \ + const uint8_t *_ref_line, int outw) \ + { \ + int j; \ + uint64_t m2 = 0; \ + const type *main_line = (const type *)_main_line; \ + const type *ref_line = (const type *)_ref_line; \ + \ + for (j = 0; j < outw; j++) \ + m2 += pow_2(main_line[j] - ref_line[j]); \ + \ + return m2; \ + } - return m2; -} +SSE_LINE(8bit, uint8_t) +SSE_LINE(16bit, uint16_t) -static uint64_t sse_line_16bit(const uint8_t *_main_line, const uint8_t *_ref_line, int outw) +typedef struct ThreadData { - int j; - uint64_t m2 = 0; - const uint16_t *main_line = (const uint16_t *) _main_line; - const uint16_t *ref_line = (const uint16_t *) _ref_line; - - for (j = 0; j < outw; j++) - m2 += pow_2(main_line[j] - ref_line[j]); - - return m2; -} - -typedef struct ThreadData { const uint8_t *main_data[4]; const uint8_t *ref_data[4]; int main_linesize[4];