From patchwork Fri Apr 19 17:53:37 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: 12818 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 A4570448AC6 for ; Fri, 19 Apr 2019 20:54:06 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 924F568AA2D; Fri, 19 Apr 2019 20:54:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B631D68AA00 for ; Fri, 19 Apr 2019 20:53:58 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id 4so6958976wmf.1 for ; Fri, 19 Apr 2019 10:53:58 -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=v4aE+7T62aEknT44sHpFmYixfRz+ruEo7d8wn4NxdCs=; b=JdQiMM2ete0PGgOUiYb6wLQETum4nnifIUxfDpCRU5yLLjYa2YKcuV7I9l8F4U5KHx 8EmuAi1nL+N7MnGHCVvvV+5mlF0pK2Z68Rwn7H8oahKFqhZwdhVqZYCuRgKoUOdXYh3x 8QpC+ZZxnjHOLRzDPVAKs86aezrXNZfS+aaUtQ6DdqF2ucAdyA7WTW/HB2vPQTSvsYN2 0Nvn7WtbQZOkBaZQ/7izts5ProQ4LBBe4++7J2OOAdugBUDKstE68XD8V6AeLFCr/TVy jhbDdad+/f6vllVtdSH1ZqPEGbLrKOcR39RbNxoUrxI3tr4bMCL05/QPwHsodav4E9+t 8jxg== 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=v4aE+7T62aEknT44sHpFmYixfRz+ruEo7d8wn4NxdCs=; b=H8vHI/bALGYdE1zsDjpsAwZZMrGeBnsh+niOPQbSi1Zfx0aLSitBof/txnH5veC9cZ Sj/kSRYBddPUmP1oVbPha2VYHRAhDrpV4UdURBxmjqHc5X1XqkISL30QbhT+EwM0XvRN AJJPB79mhNz4YtsciFRFr6Y7jBV3xTamr6ety6QPrM6MDWqmcjadIs+N3VI5w4EzW9lW n0OvyMoOPz1dhsLliLzwuXxEox9YVOgnggbQe8/kB4zZj0vpxagDLCZox1f48ClX0WKZ ZnqEb4hpLpqrZgHk5x8m5MM6xCD6LFUyDKMhr9UeSw0AzfESv5lbXWi+9yPFbu65fRdH Tu8Q== X-Gm-Message-State: APjAAAUyHxs8YG0x4e3t3mXEmgVuwXRgKRIUrZJrRs3TldrTphdCbPx3 BB3Ek2EhkRAL07el3ExtwURAvLmA X-Google-Smtp-Source: APXvYqy8Gx38YkDMAbvMdzOHtlE9SsBvspHfMzwhxW2ceB2dguT+ryfkAGUFi5dxGzi7g/mCD1pIDQ== X-Received: by 2002:a7b:c347:: with SMTP id l7mr3367557wmj.70.1555696437990; Fri, 19 Apr 2019 10:53:57 -0700 (PDT) Received: from localhost.localdomain ([37.244.238.255]) by smtp.gmail.com with ESMTPSA id e1sm7600651wrw.66.2019.04.19.10.53.57 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Apr 2019 10:53:57 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Apr 2019 19:53:37 +0200 Message-Id: <20190419175337.1388-2-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190419175337.1388-1-onemda@gmail.com> References: <20190419175337.1388-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avfilter/vf_lut3d: add cineSpace 3D lut support 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" Signed-off-by: Paul B Mahol --- doc/filters.texi | 2 + libavfilter/vf_lut3d.c | 91 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+) diff --git a/doc/filters.texi b/doc/filters.texi index 606d682e84..aaa9163d89 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -11683,6 +11683,8 @@ Iridas DaVinci @item m3d Pandora +@item csp +cineSpace @end table @item interp Select interpolation mode. diff --git a/libavfilter/vf_lut3d.c b/libavfilter/vf_lut3d.c index 1b6a191b3b..50ea5a8545 100644 --- a/libavfilter/vf_lut3d.c +++ b/libavfilter/vf_lut3d.c @@ -523,6 +523,95 @@ static int parse_m3d(AVFilterContext *ctx, FILE *f) return 0; } +static int parse_cinespace(AVFilterContext *ctx, FILE *f) +{ + LUT3DContext *lut3d = ctx->priv; + char line[MAX_LINE_SIZE]; + float in_min[3] = {0.0, 0.0, 0.0}; + float in_max[3] = {1.0, 1.0, 1.0}; + float out_min[3] = {0.0, 0.0, 0.0}; + float out_max[3] = {1.0, 1.0, 1.0}; + int inside_metadata = 0, size; + + NEXT_LINE(skip_line(line)); + if (strncmp(line, "CSPLUTV100", 10)) { + av_log(ctx, AV_LOG_ERROR, "Not cineSpace LUT format\n"); + return AVERROR(EINVAL); + } + + NEXT_LINE(skip_line(line)); + if (strncmp(line, "3D", 2)) { + av_log(ctx, AV_LOG_ERROR, "Not 3D LUT format\n"); + return AVERROR(EINVAL); + } + + while (1) { + NEXT_LINE(skip_line(line)); + + if (!strncmp(line, "BEGIN METADATA", 14)) { + inside_metadata = 1; + continue; + } + if (!strncmp(line, "END METADATA", 12)) { + inside_metadata = 0; + continue; + } + if (inside_metadata == 0) { + int size_r, size_g, size_b; + + for (int i = 0; i < 3; i++) { + int npoints = strtol(line, NULL, 0); + + if (npoints != 2) { + av_log(ctx, AV_LOG_ERROR, "Unsupported number of pre-lut points.\n"); + return AVERROR_PATCHWELCOME; + } + + NEXT_LINE(skip_line(line)); + if (av_sscanf(line, "%f %f", &in_min[i], &in_max[i]) != 2) + return AVERROR_INVALIDDATA; + NEXT_LINE(skip_line(line)); + if (av_sscanf(line, "%f %f", &out_min[i], &out_max[i]) != 2) + return AVERROR_INVALIDDATA; + NEXT_LINE(skip_line(line)); + } + + if (av_sscanf(line, "%d %d %d", &size_r, &size_g, &size_b) != 3) + return AVERROR(EINVAL); + if (size_r != size_g || size_r != size_b) { + av_log(ctx, AV_LOG_ERROR, "Unsupported size combination: %dx%dx%d.\n", size_r, size_g, size_b); + return AVERROR_PATCHWELCOME; + } + + size = size_r; + if (size < 2 || size > MAX_LEVEL) { + av_log(ctx, AV_LOG_ERROR, "Too large or invalid 3D LUT size\n"); + return AVERROR(EINVAL); + } + + lut3d->lutsize = size; + + for (int k = 0; k < size; k++) { + for (int j = 0; j < size; j++) { + for (int i = 0; i < size; i++) { + struct rgbvec *vec = &lut3d->lut[i][j][k]; + if (k != 0 || j != 0 || i != 0) + NEXT_LINE(skip_line(line)); + if (av_sscanf(line, "%f %f %f", &vec->r, &vec->g, &vec->b) != 3) + return AVERROR_INVALIDDATA; + vec->r *= out_max[0] - out_min[0]; + vec->g *= out_max[1] - out_min[1]; + vec->b *= out_max[2] - out_min[2]; + } + } + } + + break; + } + } + return 0; +} + static void set_identity_matrix(LUT3DContext *lut3d, int size) { int i, j, k; @@ -704,6 +793,8 @@ static av_cold int lut3d_init(AVFilterContext *ctx) ret = parse_cube(ctx, f); } else if (!av_strcasecmp(ext, "m3d")) { ret = parse_m3d(ctx, f); + } else if (!av_strcasecmp(ext, "csp")) { + ret = parse_cinespace(ctx, f); } else { av_log(ctx, AV_LOG_ERROR, "Unrecognized '.%s' file type\n", ext); ret = AVERROR(EINVAL);