From patchwork Sat Oct 12 19:45:00 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: 15723 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 43317449D77 for ; Sat, 12 Oct 2019 22:45:16 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2DDDE689AD6; Sat, 12 Oct 2019 22:45:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 952DB689963 for ; Sat, 12 Oct 2019 22:45:09 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id v17so13097490wml.4 for ; Sat, 12 Oct 2019 12:45:09 -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=AEiRH6QhsmOZhYZaujDftSbl1EDxqTm50Qyec4EiPmw=; b=fxrwhbf2/r3YXzTP31C3niCc1yu/hBjSZDi/RWGLJx23/lP/6l9FQjQdqhtoB+XdTZ pTCPu9D5K0b2JftgejUpQtxzQgpHioixGyaVng8CJBIwrqmmaxjR5hbS76GAn/JMVP0s KV5NHtztMZqDJIDm7Cf+xwRte3c0/cSbDGuPSPE0YGnafAYIj0woJPsmV8O2sCHkTrli WZTer2fVz49iEAOfdQHSAsSIy2ru8XbPKmTd/mP7z/1LPNwqQCFh1m5MXlnIY3z0ilqo OxWWy6Nim0jju/z+XRYPobtydErz+nIe219Ur+S1wCREmvkUJ2fJ12685EKlwN5ezV9J 2x6A== 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=AEiRH6QhsmOZhYZaujDftSbl1EDxqTm50Qyec4EiPmw=; b=Kn96eISGMsqDRHaiGHNuQcnizJQv9MtfQ0GRZq7zOYsUGw7dI0l+zRC2R4Eccgznv5 sb0teKUmcTCtMiakNVY98yWkXyo821RCMfJg+8ZV758PMJQBHLYclNMvmbN7iKr3Bjb8 cN0jp2wTzKhT4hHi1Mr4aNODLpk5uVtvGJuentBc/Nu0aPyJyjeuHWS8444pnoIqyS9h 5/MDz8k8XRp98SJzU86FHD5m3di4GdyUCDs4mz8ep0lX9YdwZbDkOsBDFVuWXoU1HQEu nEPzPZHQz4/nkTkz1mRqB+kDHxCAK2+Sxi0pD1irmi/N5JhCyn97CWPNaHTRl0Res917 ZVuQ== X-Gm-Message-State: APjAAAXh/uKCcP0FKTU+7dORIxyYfJF0lxIR7mfXkT4t6Tmk4XAp8c/F iANXEPPtC7rcE/YDRK/07XOgHudv X-Google-Smtp-Source: APXvYqw8MxK9oC/ksw8+49r5C97gg8wd447BvjRjxRC+v4eMzqOE3CInBnkCuCx33CYsm72sNAKcow== X-Received: by 2002:a1c:67d7:: with SMTP id b206mr8092754wmc.157.1570909508872; Sat, 12 Oct 2019 12:45:08 -0700 (PDT) Received: from localhost.localdomain ([37.244.241.148]) by smtp.gmail.com with ESMTPSA id f18sm10494709wmh.43.2019.10.12.12.45.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Oct 2019 12:45:08 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sat, 12 Oct 2019 21:45:00 +0200 Message-Id: <20191012194500.17414-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..e071df77c5 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); \