From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 4B1A34566F for ; Fri, 14 Apr 2023 16:30:16 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 02C6A68BEB9; Fri, 14 Apr 2023 19:30:14 +0300 (EEST) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D278668BE51 for ; Fri, 14 Apr 2023 19:30:06 +0300 (EEST) Received: by mail-wm1-f45.google.com with SMTP id q5so10673057wmo.4 for ; Fri, 14 Apr 2023 09:30:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681489806; x=1684081806; 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=Gyr+QVQirHufSGpTAIctLU45UxI1MDcqDoAKqthMZAA=; b=L4xFD7IKPy8u4SaL77/krOAI5yWs1i5gted0vXwQTO6rdwElu8/zLvkkmmrAUZlxh3 /mlZlvCbcyEzyNjOIpkYNQ2aZgxbBjXV9ffLbhvEhliDwar+dOYevkmqtbxt0Uz4fLPF aI6J6HJVpblBkVVJtNEqaP+g+oRUC6ahlbuFaGY/LoI6gSXS2qrZkvdns7QAWfnhXLqV fu0oRmcPQ4GgoYKC+6OkXC6nPdvj9rSW1RURRSxpWJKfwz03qWYZGfuns/Sw4O+yxL0q oZZeY/hjJm1I+2fXqiofBhAbV1PyyXhyQTCcgZ36IXbDsJJpLuBWXQ8Oe/uq4K72gLOZ nPmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681489806; x=1684081806; 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=Gyr+QVQirHufSGpTAIctLU45UxI1MDcqDoAKqthMZAA=; b=D/DkoP3YkH4bhKY1HCJcWGPg0QYgqih0Y3yc6qqgiy4nTFr8hY2KmQg+3y4+mD/Ycd ThQk2Bb/bnu0T42wFrb1A+Pw7z+M8Sbni73WVW49rHHrhiBqPwJdqOm7EtZIUQHstL2e w5UFNFp4ez/G63sB6x3MbRPxGJOqW3H4TgJ13lgL2Dq95Q0b2EFIE5vr/1T6RPDX6X45 kYK3t3PvyoD/lsG7yU4HlpUUhfCXC+SbUSPrfVi3hLJ7rDOfAFCUGKwW3P0KdyfvZGGl p/kPch4A0I2r8EF+QcLki1zch1XrHTai2S5uDfzT0CM6EVg+oKSfn9umkXqgkZvheT5q SxFw== X-Gm-Message-State: AAQBX9f3LhGfAOz/3cCewxA7tkVJbP+BiV9XnS8FbG3J61lrKYUVN3Ex UsBYz/1Cf8p+dXLmxhB2e0uA6e8rk43Y4A== X-Google-Smtp-Source: AKy350bmzRV+bkjbIFGVk3SfjCh9EZK87KI341t/w/DNNDQGfzQ2uF2fw0egIFCpHYOXdzju/nn2vQ== X-Received: by 2002:a05:600c:204c:b0:3f0:aeac:2f9c with SMTP id p12-20020a05600c204c00b003f0aeac2f9cmr3143446wmg.7.1681489805606; Fri, 14 Apr 2023 09:30:05 -0700 (PDT) Received: from [192.168.1.216] ([81.0.1.1]) by smtp.gmail.com with ESMTPSA id 8-20020a05600c228800b003edef091b17sm4644690wmf.37.2023.04.14.09.30.05 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 14 Apr 2023 09:30:05 -0700 (PDT) Message-ID: <817ffb0b-b08f-ee24-9085-0e7ea483a7f2@gmail.com> Date: Fri, 14 Apr 2023 18:30:04 +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] avfilter: 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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Small refactor to psnr 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]; -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".