From patchwork Sat Sep 5 21:13:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Reid X-Patchwork-Id: 22125 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 331E844A0BF for ; Sun, 6 Sep 2020 00:13:12 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0683968A865; Sun, 6 Sep 2020 00:13:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8722A68973D for ; Sun, 6 Sep 2020 00:13:05 +0300 (EEST) Received: by mail-pl1-f172.google.com with SMTP id y6so2702038plk.10 for ; Sat, 05 Sep 2020 14:13:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=uC8a2XiSuWWLAvJqi1PZjbi0tnhZC3UEEBUMFMebOUw=; b=ESbemlzXWxCJDG/3ZjEmWJm8qTziwMlJOcB8LmkiiGN3e5MbrYkAPTRkotdPwIo4im ZGjvpInw23MI5t6mZFcRaiyXCOlbnnGQQBnw4xfkib3tjBNComPJTS1KmnYywXItuz7Z +WtI3m+z7R7vIvLRVq8PCbQDgPU7T4Ds7o9517t71cEvpgsiO5ZArzbvggaUjt5+AcMs zxb8b6pGMNh2vGXBmv202zYs4t69nHPC8jF28lfs90ybXPfFyd0bdy2u1tjYR186XlWu y964yStUacNA8sYfabx3MxTQB1mvFDWmAo8BRdEAXJYbTw/gAwGFeZlhRdMzTVt+jpw9 mJ2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=uC8a2XiSuWWLAvJqi1PZjbi0tnhZC3UEEBUMFMebOUw=; b=CvkVKMpHVt/1O/hRY23wrq+r/FumYnYJu6ZEwIreMSgkFRW4UVPjRyq5uoEvvL/WZO jNV48+o3/RHv30icIigG+CD/cltxl8N00Ia2tOdVBdtO1P7PgYWm0ZUapuF5JeG2XxVj q5yIeMCYjtNytNRjR93sqIBMjgWe03vHcl9lqlrHyy6/lIuLRqwTiV2/F80Rs8d5hAhp 1YPNysXu8JOCdn/JMdYpMakGfEOA2bTZcaEATMW4CATs3MA2dA8RNhhbVxAs5USU5IBt ucQxjZNXpGWWPAE8Ob7xSVXm1vIqInosP6cdwtpM/2Wm89I/yYJsXsabogUKmGCcJuqq lbww== X-Gm-Message-State: AOAM531LXcFvB4yfYHEcTWiJF42LMWaWE+0j3HhUq2kdPA8+3Dr4uViK yt6ni86Ub7LGNZtRW0456kU/S1hXkV5Yeg== X-Google-Smtp-Source: ABdhPJybfoY9o1e90z4GyWq700mPaHHoBUS6G0MraZp2DltfZJYzFAVEBgGJqXO8HxBriO1721fe6A== X-Received: by 2002:a17:902:aa8d:: with SMTP id d13mr13841911plr.124.1599340383433; Sat, 05 Sep 2020 14:13:03 -0700 (PDT) Received: from MRMacbook.hitronhub.home (S01069050ca607903.vc.shawcable.net. [174.7.236.190]) by smtp.gmail.com with ESMTPSA id gb17sm8591021pjb.15.2020.09.05.14.13.02 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 05 Sep 2020 14:13:02 -0700 (PDT) From: mindmark@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 5 Sep 2020 14:13:01 -0700 Message-Id: <20200905211301.81127-1-mindmark@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avfilter/vf_lut3d: support remaping negative values in the prelut 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 Cc: Mark Reid Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Mark Reid --- libavfilter/vf_lut3d.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libavfilter/vf_lut3d.c b/libavfilter/vf_lut3d.c index 6730a424ce..988f6c8b55 100644 --- a/libavfilter/vf_lut3d.c +++ b/libavfilter/vf_lut3d.c @@ -878,18 +878,16 @@ static int parse_cinespace(AVFilterContext *ctx, FILE *f) prelut_sizes[i] = npoints; in_min[i] = FLT_MAX; - in_max[i] = FLT_MIN; + in_max[i] = -FLT_MAX; out_min[i] = FLT_MAX; - out_max[i] = FLT_MIN; - - last = FLT_MIN; + out_max[i] = -FLT_MAX; for (int j = 0; j < npoints; j++) { NEXT_FLOAT_OR_GOTO(v, end) in_min[i] = FFMIN(in_min[i], v); in_max[i] = FFMAX(in_max[i], v); in_prelut[i][j] = v; - if (v < last) { + if (j > 0 && v < last) { av_log(ctx, AV_LOG_ERROR, "Invalid file, non increasing prelut.\n"); ret = AVERROR(ENOMEM); goto end;