From patchwork Thu Apr 25 12:57:26 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: 12908 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 38DBF449647 for ; Thu, 25 Apr 2019 16:04:27 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0EE0768A833; Thu, 25 Apr 2019 16:04:27 +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 5DF816883B6 for ; Thu, 25 Apr 2019 16:04:18 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id f7so7633421wrs.2 for ; Thu, 25 Apr 2019 06:04:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=dRGW3hguPiqmPKUUNM45cLEyqOroph04byGoYxSij2A=; b=nWeaVPJ5ut1gLnRDTRnwOdp0TED8uUDuc96o2MVad3tffaZBYVaE63rmWDTYvX9mNs nvR5PuDVUHlnS/RCTH99QIA/aB33s3SSEmAGsrKq7brQNxPTy7YeMPU0XUBE2tnTE+1K Acc+MmO7LxXTx//acEGb2EEQxXSa7VefOr3sdUA2osKZbnHmbKSMbjjqJ9nUt2XaPLte vjiC/BXbh11tpjAHzZiW6qaunsbttCzEnItKJDLn07gDfIes1Zl+M9yc+dc2Ip2Jxf+Y AxhhD0zYaTFzlC/I8RAhCFbZe07zemMSaUYn5y90jA6oQ0sufN1LhuDVbXhbDGOJgXOx 4izw== 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:in-reply-to :references; bh=dRGW3hguPiqmPKUUNM45cLEyqOroph04byGoYxSij2A=; b=r8NbHlsWIgff4FO392tvXiRph4MZXFid8txmGf3Bj/Br+tnx4YE2CjM58o12Bih/lQ Oj5351TtieRwyU6NyUyoUdDNUjP640n91I+xWu4W3AgInybhjg/bp42RNPu/wb4dmI7f NxqKV1NPvzhPgkxKSrjwWP9/mmUKttSHiVUDQ1rHTsNylwHJRvAh4MGtHe5CH5QPTV5T xy9zK5USUpH4NvLGXUkBzpgDSJ7P7LLR8F3cYVxU00PMY2Eh3ofaKUVIlFh17NXsuFU1 vSc5RGL1sWvVZ8W8wCPG35/N6TsovkTGDnAB95K3/BYdikrWntJIimRtTgYKSWg+MvEP 0y1g== X-Gm-Message-State: APjAAAWHbtJFUYzFL5BtjI70ZZRAOKWwwUZQBw/Cp/g16q44QXhOnE+l EeEEX7F1Xo3zJAUkTXUWd4/OLhZL X-Google-Smtp-Source: APXvYqzWb6LqXgNsgiLqVHUc/OfAUlDmWT43+BwEiB8uQ46Rl141eAT7jYow54kaQ5DJKeeJB4IWxQ== X-Received: by 2002:adf:dcc7:: with SMTP id x7mr21138857wrm.6.1556197060158; Thu, 25 Apr 2019 05:57:40 -0700 (PDT) Received: from localhost.localdomain ([37.244.238.255]) by smtp.gmail.com with ESMTPSA id e16sm28315229wrs.0.2019.04.25.05.57.38 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Apr 2019 05:57:39 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Apr 2019 14:57:26 +0200 Message-Id: <20190425125726.16617-2-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190425125726.16617-1-onemda@gmail.com> References: <20190425125726.16617-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avfilter/vf_lut3d: fix range domain processing for .cube format 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" The ranges are for input, not for output. Signed-off-by: Paul B Mahol --- libavfilter/vf_lut3d.c | 73 +++++++++++++++++++++++++++++------------- 1 file changed, 51 insertions(+), 22 deletions(-) diff --git a/libavfilter/vf_lut3d.c b/libavfilter/vf_lut3d.c index d1974b0e05..c3dd6eb69f 100644 --- a/libavfilter/vf_lut3d.c +++ b/libavfilter/vf_lut3d.c @@ -64,6 +64,7 @@ typedef struct LUT3DContext { uint8_t rgba_map[4]; int step; avfilter_action_func *interp; + struct rgbvec scale; struct rgbvec lut[MAX_LEVEL][MAX_LEVEL][MAX_LEVEL]; int lutsize; #if CONFIG_HALDCLUT_FILTER @@ -219,7 +220,9 @@ static int interp_##nbits##_##name##_p##depth(AVFilterContext *ctx, void *arg, i const uint8_t *srcbrow = in->data[1] + slice_start * in->linesize[1]; \ const uint8_t *srcrrow = in->data[2] + slice_start * in->linesize[2]; \ const uint8_t *srcarow = in->data[3] + slice_start * in->linesize[3]; \ - const float scale = (1. / ((1<lutsize - 1); \ + const float scale_r = (lut3d->scale.r / ((1<lutsize - 1); \ + const float scale_g = (lut3d->scale.g / ((1<lutsize - 1); \ + const float scale_b = (lut3d->scale.b / ((1<lutsize - 1); \ \ for (y = slice_start; y < slice_end; y++) { \ uint##nbits##_t *dstg = (uint##nbits##_t *)grow; \ @@ -231,9 +234,9 @@ static int interp_##nbits##_##name##_p##depth(AVFilterContext *ctx, void *arg, i const uint##nbits##_t *srcr = (const uint##nbits##_t *)srcrrow; \ const uint##nbits##_t *srca = (const uint##nbits##_t *)srcarow; \ for (x = 0; x < in->width; x++) { \ - const struct rgbvec scaled_rgb = {srcr[x] * scale, \ - srcg[x] * scale, \ - srcb[x] * scale}; \ + const struct rgbvec scaled_rgb = {srcr[x] * scale_r, \ + srcg[x] * scale_g, \ + srcb[x] * scale_b}; \ struct rgbvec vec = interp_##name(lut3d, &scaled_rgb); \ dstr[x] = av_clip_uintp2(vec.r * (float)((1<height * (jobnr+1)) / nb_jobs; \ uint8_t *dstrow = out->data[0] + slice_start * out->linesize[0]; \ const uint8_t *srcrow = in ->data[0] + slice_start * in ->linesize[0]; \ - const float scale = (1. / ((1<lutsize - 1); \ + const float scale_r = (lut3d->scale.r / ((1<lutsize - 1); \ + const float scale_g = (lut3d->scale.g / ((1<lutsize - 1); \ + const float scale_b = (lut3d->scale.b / ((1<lutsize - 1); \ \ for (y = slice_start; y < slice_end; y++) { \ uint##nbits##_t *dst = (uint##nbits##_t *)dstrow; \ const uint##nbits##_t *src = (const uint##nbits##_t *)srcrow; \ for (x = 0; x < in->width * step; x += step) { \ - const struct rgbvec scaled_rgb = {src[x + r] * scale, \ - src[x + g] * scale, \ - src[x + b] * scale}; \ + const struct rgbvec scaled_rgb = {src[x + r] * scale_r, \ + src[x + g] * scale_g, \ + src[x + b] * scale_b}; \ struct rgbvec vec = interp_##name(lut3d, &scaled_rgb); \ dst[x + r] = av_clip_uint##nbits(vec.r * (float)((1<r, &vec->g, &vec->b) != 3) return AVERROR_INVALIDDATA; - vec->r *= max[0] - min[0]; - vec->g *= max[1] - min[1]; - vec->b *= max[2] - min[2]; } } } break; } } + + lut3d->scale.r = av_clipf(1. / (max[0] - min[0]), 0.f, 1.f); + lut3d->scale.g = av_clipf(1. / (max[1] - min[1]), 0.f, 1.f); + lut3d->scale.b = av_clipf(1. / (max[2] - min[2]), 0.f, 1.f); + return 0; } @@ -609,6 +616,11 @@ static int parse_cinespace(AVFilterContext *ctx, FILE *f) break; } } + + lut3d->scale.r = av_clipf(1. / (in_max[0] - in_min[0]), 0.f, 1.f); + lut3d->scale.g = av_clipf(1. / (in_max[1] - in_min[1]), 0.f, 1.f); + lut3d->scale.b = av_clipf(1. / (in_max[2] - in_min[2]), 0.f, 1.f); + return 0; } @@ -765,6 +777,8 @@ static av_cold int lut3d_init(AVFilterContext *ctx) const char *ext; LUT3DContext *lut3d = ctx->priv; + lut3d->scale.r = lut3d->scale.g = lut3d->scale.b = 1.f; + if (!lut3d->file) { set_identity_matrix(lut3d, 32); return 0; @@ -1016,6 +1030,7 @@ static int update_apply_clut(FFFrameSync *fs) static av_cold int haldclut_init(AVFilterContext *ctx) { LUT3DContext *lut3d = ctx->priv; + lut3d->scale.r = lut3d->scale.g = lut3d->scale.b = 1.f; lut3d->fs.on_event = update_apply_clut; return 0; } @@ -1087,6 +1102,7 @@ typedef struct LUT1DContext { const AVClass *class; char *file; int interpolation; ///scale.r = av_clipf(1. / (in_max[0] - in_min[0]), 0.f, 1.f); + lut1d->scale.g = av_clipf(1. / (in_max[1] - in_min[1]), 0.f, 1.f); + lut1d->scale.b = av_clipf(1. / (in_max[2] - in_min[2]), 0.f, 1.f); + return 0; } @@ -1227,13 +1248,15 @@ try_again: } while (skip_line(line)); if (av_sscanf(line, "%f %f %f", &lut1d->lut[0][i], &lut1d->lut[1][i], &lut1d->lut[2][i]) != 3) return AVERROR_INVALIDDATA; - lut1d->lut[0][i] *= max[0] - min[0]; - lut1d->lut[1][i] *= max[1] - min[1]; - lut1d->lut[2][i] *= max[2] - min[2]; } break; } } + + lut1d->scale.r = av_clipf(1. / (max[0] - min[0]), 0.f, 1.f); + lut1d->scale.g = av_clipf(1. / (max[1] - min[1]), 0.f, 1.f); + lut1d->scale.b = av_clipf(1. / (max[2] - min[2]), 0.f, 1.f); + return 0; } @@ -1349,7 +1372,9 @@ static int interp_1d_##nbits##_##name##_p##depth(AVFilterContext *ctx, \ const uint8_t *srcrrow = in->data[2] + slice_start * in->linesize[2]; \ const uint8_t *srcarow = in->data[3] + slice_start * in->linesize[3]; \ const float factor = (1 << depth) - 1; \ - const float scale = (1. / factor) * (lut1d->lutsize - 1); \ + const float scale_r = (lut1d->scale.r / factor) * (lut1d->lutsize - 1); \ + const float scale_g = (lut1d->scale.g / factor) * (lut1d->lutsize - 1); \ + const float scale_b = (lut1d->scale.b / factor) * (lut1d->lutsize - 1); \ \ for (y = slice_start; y < slice_end; y++) { \ uint##nbits##_t *dstg = (uint##nbits##_t *)grow; \ @@ -1361,9 +1386,9 @@ static int interp_1d_##nbits##_##name##_p##depth(AVFilterContext *ctx, \ const uint##nbits##_t *srcr = (const uint##nbits##_t *)srcrrow; \ const uint##nbits##_t *srca = (const uint##nbits##_t *)srcarow; \ for (x = 0; x < in->width; x++) { \ - float r = srcr[x] * scale; \ - float g = srcg[x] * scale; \ - float b = srcb[x] * scale; \ + float r = srcr[x] * scale_r; \ + float g = srcg[x] * scale_g; \ + float b = srcb[x] * scale_b; \ r = interp_1d_##name(lut1d, 0, r); \ g = interp_1d_##name(lut1d, 1, g); \ b = interp_1d_##name(lut1d, 2, b); \ @@ -1441,15 +1466,17 @@ static int interp_1d_##nbits##_##name(AVFilterContext *ctx, void *arg, \ uint8_t *dstrow = out->data[0] + slice_start * out->linesize[0]; \ const uint8_t *srcrow = in ->data[0] + slice_start * in ->linesize[0]; \ const float factor = (1 << nbits) - 1; \ - const float scale = (1. / factor) * (lut1d->lutsize - 1); \ + const float scale_r = (lut1d->scale.r / factor) * (lut1d->lutsize - 1); \ + const float scale_g = (lut1d->scale.g / factor) * (lut1d->lutsize - 1); \ + const float scale_b = (lut1d->scale.b / factor) * (lut1d->lutsize - 1); \ \ for (y = slice_start; y < slice_end; y++) { \ uint##nbits##_t *dst = (uint##nbits##_t *)dstrow; \ const uint##nbits##_t *src = (const uint##nbits##_t *)srcrow; \ for (x = 0; x < in->width * step; x += step) { \ - float rr = src[x + r] * scale; \ - float gg = src[x + g] * scale; \ - float bb = src[x + b] * scale; \ + float rr = src[x + r] * scale_r; \ + float gg = src[x + g] * scale_g; \ + float bb = src[x + b] * scale_b; \ rr = interp_1d_##name(lut1d, 0, rr); \ gg = interp_1d_##name(lut1d, 1, gg); \ bb = interp_1d_##name(lut1d, 2, bb); \ @@ -1544,6 +1571,8 @@ static av_cold int lut1d_init(AVFilterContext *ctx) const char *ext; LUT1DContext *lut1d = ctx->priv; + lut1d->scale.r = lut1d->scale.g = lut1d->scale.b = 1.f; + if (!lut1d->file) { set_identity_matrix_1d(lut1d, 32); return 0;