From patchwork Sat Oct 12 19:49:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 15725 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 7001344A34F for ; Sat, 12 Oct 2019 22:50:08 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 59EDB689B07; Sat, 12 Oct 2019 22:50:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 15C17689249 for ; Sat, 12 Oct 2019 22:50:02 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id p14so15333453wro.4 for ; Sat, 12 Oct 2019 12:50:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=HQq88Q5hrAN3OWeIFgJ8UfHnciB9BY9+GFi+Q8Gdg0I=; b=r9VVx3LEiewuKHIdbD95Q9F55U6H/hV3WGcAJKAUGX5p8/TOYQovbi0YskgjMOYqaN qbyfxGJ8W3EfEoqYZMfJ0dTRcZddfAiYzJ3YZBU1MeO2qQCdqkc3iFbjEcPwsllmDDEM W8N1+7dkumh2D/XRXn3pXI90Pf+LVcvtI5OmQe5lK/9wkx5fJrVGURyazgqyfpAu5mEa aVrhNJPdKWMKFAcf/KJY9zjsLLLR5McNUUGGQcSXdxcDNtufQYbjB7//+Y+xsfqpomrQ 57co/elv0SVMrzNYkj6tkHUwyaAwCriQMxHdBI71LhXCKLK2et4Nf7Z4qFxJbDRdKbMJ srpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=HQq88Q5hrAN3OWeIFgJ8UfHnciB9BY9+GFi+Q8Gdg0I=; b=dSStyDDBUtRyvyDs/5l4kkemobxt4Nj+/d7VbQo/qd3lw78IJ1cq/a+k2RsnoNtdWg xS2gpr8a/rbezyTEOXZIG5pqlxnyqBNtcNt02UzIV54t+mM5wiLCpypuiSMnv87ZD+he h2X8UhW/1tj/IQYqVpbvR2Xas6No64PJR1SCmivvHNfL3Mr0boOyjDfQJAY/a5I8EHPS cvQIC5h5xH60iNb4H+jtnM03FXW4fUgxhFJcdYjSTg7/sJSl0+by7XRpBz27n/GtOX7Z VNlOmT23mhmnnfzK0ebW9BYuJ7alPCQ8P7fhmKvJ1ybn2vKmVsIH0X9gaB4SDeKmkkjW VHYQ== X-Gm-Message-State: APjAAAXOMnGXyb/AC7HjNoQoACPHYILbwT26BHGPOsCwiW/YWoC+YuwQ k+pCalGBwCtjkzAy0DQqvvD0bAzD X-Google-Smtp-Source: APXvYqwyfd4jJAXVJo1ToUg1hjzhO6hsXNSAwlDZ3ghz6E/zXKI5Ly4NYEcWJF1cTupjY+ga7uFJrg== X-Received: by 2002:adf:ee4f:: with SMTP id w15mr17632305wro.87.1570909801365; Sat, 12 Oct 2019 12:50:01 -0700 (PDT) Received: from localhost.localdomain ([37.244.241.148]) by smtp.gmail.com with ESMTPSA id g11sm13191670wmh.45.2019.10.12.12.50.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Oct 2019 12:50:00 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sat, 12 Oct 2019 21:49:53 +0200 Message-Id: <20191012194953.18819-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avfilter/vf_libvmaf: fix filtering of >8 bit data X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This is what reference does. Signed-off-by: Paul B Mahol --- libavfilter/vf_libvmaf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_libvmaf.c b/libavfilter/vf_libvmaf.c index 249e50c720..ed3a383709 100644 --- a/libavfilter/vf_libvmaf.c +++ b/libavfilter/vf_libvmaf.c @@ -110,6 +110,7 @@ FRAMESYNC_DEFINE_CLASS(libvmaf, LIBVMAFContext, fs); const type *main_ptr = (const type *) s->gmain->data[0]; \ \ float *ptr = ref_data; \ + float factor = 1.f / (1 << (bits - 8)); \ \ int h = s->height; \ int w = s->width; \ @@ -118,7 +119,7 @@ FRAMESYNC_DEFINE_CLASS(libvmaf, LIBVMAFContext, fs); \ for (i = 0; i < h; i++) { \ for ( j = 0; j < w; j++) { \ - ptr[j] = (float)ref_ptr[j]; \ + ptr[j] = ref_ptr[j] * factor; \ } \ ref_ptr += ref_stride / sizeof(*ref_ptr); \ ptr += stride / sizeof(*ptr); \ @@ -128,7 +129,7 @@ FRAMESYNC_DEFINE_CLASS(libvmaf, LIBVMAFContext, fs); \ for (i = 0; i < h; i++) { \ for (j = 0; j < w; j++) { \ - ptr[j] = (float)main_ptr[j]; \ + ptr[j] = main_ptr[j] * factor; \ } \ main_ptr += main_stride / sizeof(*main_ptr); \ ptr += stride / sizeof(*ptr); \