From patchwork Fri Apr 19 17:53:36 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: 12819 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 DB8B6448AC6 for ; Fri, 19 Apr 2019 20:54:04 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B59CF68AA12; Fri, 19 Apr 2019 20:54:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C7D0068AA00 for ; Fri, 19 Apr 2019 20:53:57 +0300 (EEST) Received: by mail-wr1-f42.google.com with SMTP id o12so4445766wrn.2 for ; Fri, 19 Apr 2019 10:53:57 -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=iFTuSOb8lj9DKUTy2H5iHqqsLw5WPNXvVBZHbKqxu1g=; b=OZMh9wOzeTOgQlfsH5l7bwjaA9Lf7+Q1A/g43NLIFNQKDafN52Tbl4/nbc03oMXyRQ ZMYprdx+hxMHaHvkOnEqu6+rRm1HajOP7R51SbatgFzmVg44YBXzPbAONnpX9k6bdDi2 +w0N68GgmObgUNpTL3XbUt9PmBNqoACUm8PpEOVHUmLO3YVQS7HbUZlLwIN1+hJIBoG/ jvriIquY/3LmsFtWroIFZ4Mm2duzR6Z9533UgGcnH4zdvlwtIP9hPDq0ThgGi/oCUKMN Yv/cgtgzw6Bt/59fpZFD7YKsKpiD/5X8XiYczEkObQpgeQ6yHgs/aC5OAFGJcy1Nhjmx 84lA== 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=iFTuSOb8lj9DKUTy2H5iHqqsLw5WPNXvVBZHbKqxu1g=; b=nYz8jSZp0lnYHAVLCpdA9gZQrHBEjo1GF5O8wQjzZ+AwsINX6SZgmoKOMntPt5BgiD GIE9NcuJOGciujgwu99Z6IEdkQu/Z/MrwfcKg/3mofqvUecCuPEWwmdBzleSC/BAzbbO l+imGkXHo+uhzCzwFUKiCN5XSOeopW2xt/pHF7ze+HJoqQwfsZNMYA7Azc+KfeXOKPL3 7XHM5TBrWhCHVjcBVoA+pNnLYrsbWhPBCLXl3Wme+w5VpwX4aCtFtPtPln+5y1LF23oT HrvXG87+UBh9YiSe0knOHD8MXIGzPD0JYtysoIgSuAH8WVpQAO5zBgbRH8fGop1TdgQy FywQ== X-Gm-Message-State: APjAAAVFyZaqqIiQz6/ZcKarZx7kVKEN5NKnhSKeErRBHzITSCEfe46a aYUViGeDMy9cst8FWoNGRdi1mDG8 X-Google-Smtp-Source: APXvYqzkeKJWy/hhcAn1laLn8ebCPsjBbbCDp2zHz8Ai3KtX3OwugDILcHbZH4GoJhC1W7hb4bQg/Q== X-Received: by 2002:a5d:5745:: with SMTP id q5mr3976568wrw.118.1555696437098; 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.56 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Apr 2019 10:53:56 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Apr 2019 19:53:36 +0200 Message-Id: <20190419175337.1388-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/2] avfilter/vf_lut3d: add cineSpace 1D lut parsing 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 | 77 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+) diff --git a/doc/filters.texi b/doc/filters.texi index 4dd1a5de85..606d682e84 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -11639,6 +11639,8 @@ Currently supported formats: @table @samp @item cube Iridas +@item csp +cineSpace @end table @item interp diff --git a/libavfilter/vf_lut3d.c b/libavfilter/vf_lut3d.c index 93053ed263..1b6a191b3b 100644 --- a/libavfilter/vf_lut3d.c +++ b/libavfilter/vf_lut3d.c @@ -1019,6 +1019,81 @@ static void set_identity_matrix_1d(LUT1DContext *lut1d, int size) } } +static int parse_cinespace_1d(AVFilterContext *ctx, FILE *f) +{ + LUT1DContext *lut1d = 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, "1D", 2)) { + av_log(ctx, AV_LOG_ERROR, "Not 1D 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) { + 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)); + } + + size = strtol(line, NULL, 0); + + if (size < 2 || size > MAX_1D_LEVEL) { + av_log(ctx, AV_LOG_ERROR, "Too large or invalid 1D LUT size\n"); + return AVERROR(EINVAL); + } + + lut1d->lutsize = size; + + for (int i = 0; i < size; i++) { + NEXT_LINE(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] *= out_max[0] - out_min[0]; + lut1d->lut[1][i] *= out_max[1] - out_min[1]; + lut1d->lut[2][i] *= out_max[2] - out_min[2]; + } + + break; + } + } + return 0; +} + static int parse_cube_1d(AVFilterContext *ctx, FILE *f) { LUT1DContext *lut1d = ctx->priv; @@ -1400,6 +1475,8 @@ static av_cold int lut1d_init(AVFilterContext *ctx) if (!av_strcasecmp(ext, "cube") || !av_strcasecmp(ext, "1dlut")) { ret = parse_cube_1d(ctx, f); + } else if (!av_strcasecmp(ext, "csp")) { + ret = parse_cinespace_1d(ctx, f); } else { av_log(ctx, AV_LOG_ERROR, "Unrecognized '.%s' file type\n", ext); ret = AVERROR(EINVAL);