From patchwork Sat Oct 12 19:48:51 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: 15724 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 7130744A326 for ; Sat, 12 Oct 2019 22:49:06 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4508E689AD6; Sat, 12 Oct 2019 22:49:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DFEFB6881DF for ; Sat, 12 Oct 2019 22:48:59 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id 3so13117366wmi.3 for ; Sat, 12 Oct 2019 12:48:59 -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=oQrRZlT9fnYBSsbiTaMXCTRLLDvWOnGjwWdSh0nKk+eMprsb9EZ4uwb3D6nTysmXsl j3HxghZ2VOb/KtRlN6tD60YrtjHXKgyTS16O/+Atc99LigHpKjclyPqG/FV0vb4sMgQN 8tmgmAbBsXCqiZCivfosmH5MecBOk0gbxRYsDeJWPipnK0mA3ehDsG5Nlrf9SVf9ndkl 68j1LI6hDAxYRpJuvNbGRqZVIUPymv0olG3zPS9SB9YDlXvy/Q6TOeUjNmF3zAqzDnkK GIcw2BFh6oIWPLRG0ze4BUcV/oz9kw7nBSFKtqAYKvBCUVQDk9EZRF3Lsd42teJa4o/p nQRw== 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=JPRnMAiLFyYl7NvHfdSFR/G9aqbv7jSetaAzte9/ZxsZwyAzL/sH2mlB+4b7qhD9N0 WJHdzk1SsvQGl5W0lYNhALB5j6mVld8PYPWGgdulQyxo3AHefC+5tNZcmFsk89uzw0fQ 9vCvSVik5hriQ4xcALTwhwjPL66MUlJX2Knh1sAl/vV6PY55jQdOQPNLw13TnoNbl+bh CCTza5k0fQ6g6JLFiG163D4wTwE0nhYpxUPIQ7NxOc3YpKvByFIQ0RlbHuspSFm7Hnre 4XYrEDEpKXzeo6S/CmA/lGTBs2c78ZR30Pa9et12MiW8bUkLgia/4NpZThVrU5O973Mp 3fTQ== X-Gm-Message-State: APjAAAUvTC4OyO/Wiy0FPL7PEFO81KIKlA6jFi53dLsHiPhsmgSAYdYS BRm2d3ig/mHlcCWnUXq30EwA3S2r X-Google-Smtp-Source: APXvYqyHlEQ9U7jVjjVd3gIMDldjWaA6z6MwtGDUGINEjRyO4MKmrtoBgaJj/YBHg/Wy/CqMDX0gDw== X-Received: by 2002:a7b:c187:: with SMTP id y7mr8940988wmi.154.1570909739147; Sat, 12 Oct 2019 12:48:59 -0700 (PDT) Received: from localhost.localdomain ([37.244.241.148]) by smtp.gmail.com with ESMTPSA id c21sm9191492wmb.46.2019.10.12.12.48.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Oct 2019 12:48:58 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sat, 12 Oct 2019 21:48:51 +0200 Message-Id: <20191012194851.18363-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); \