From patchwork Sat Dec 16 10:12:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 6818 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp471292jah; Sat, 16 Dec 2017 02:19:35 -0800 (PST) X-Google-Smtp-Source: ACJfBov/WBJ6IcTFgkCEhp8d9pLU4k6BawohoKgXR4Pt3nPEgI2iwjs37k40jp051r/G6ewZKOsc X-Received: by 10.223.185.79 with SMTP id b15mr12397680wrg.58.1513419575702; Sat, 16 Dec 2017 02:19:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513419575; cv=none; d=google.com; s=arc-20160816; b=iH8FmRmNV39gDl0VaAbNzRAzhhjK8L4Gp4CIfMTMfuSF/Feb8AP1gn0f1HDui/3llT XInR/7ebHlcaetQRrO7aqF2rLeRRQrOxHgQ4yQo5VGlOI/TKmyEOeqGxj216RHS8fwqx /rdmQRMWHScboYeCy8tiU4j3aQ1N77GjeMUp2odicq7zjFblJpswW6kuaILNnS8be9Hh Wv0liMd6yCMdsYwboqX2bnSNAG6bKXBUnE7XK/bIoqOYEvdt2U5LGfi3K5TGjVUk+mZF PMMXqpuk6DdxnhMuFA3yszrNQitK+ZSFMOb4uRhbGflJBJXo9MUuml5j+pPTvPkeO8Pu 77iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=iisIzpa3ziyz+LBerUQBQT9+Al+mDi7cxS5FE8Ys+CY=; b=e2oP5Fy22sbdi8gcVHzBXSzCPpFmg8q+MXHggDtXeuZgPrL4V3p3NJqGTzQpX1okcI Rm+aqy4+2TqkIEsJ5UCzalogK5WD4cGlY6aSu47C5TpYV9POB2J9LC/Pmmt3oNWmuaDT JUCyizpFa0VAlYDgLNf88QlARYwtwHCiJCSsUC3O33JHTr5zWplOS/Tco/8pAv5uDWJs 5DpKvNipXRNxjcUVpvXWBvOMqyRE4DP6SfqTtjLyOBqnDz7VXwwESZnXHYJc2k9Hip22 VAgTrtp2fhjAViNm2vXWQFCcz5eLeV+g2w4pQW1A9EeJA5JrDFHjTl6F/aa+FKoLTwRW +EZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=RGGe108h; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h196si5828722wme.60.2017.12.16.02.19.35; Sat, 16 Dec 2017 02:19:35 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=RGGe108h; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 38CFD689C96; Sat, 16 Dec 2017 12:19:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 662E4689B03 for ; Sat, 16 Dec 2017 12:19:06 +0200 (EET) Received: by mail-wm0-f66.google.com with SMTP id f140so21590417wmd.2 for ; Sat, 16 Dec 2017 02:19:15 -0800 (PST) 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=BGtO+sAqSsfhQWxWzhgwY+yfK1/X3G8958Zwpuj8sGc=; b=RGGe108h9LBgzw7Jvq/V+3o7n221J7DUb6aK9Eyt2XuQGH5SoHVeULXN52N/NTET/7 raLoup4U3RIcEuy123jsHpFX/vZbepiNHHspGoahhfmxZn5XPGVNRzZnrDQRD0kSAVYU mUrKETVGUkOMqSpq0ni6TcDHRJRDUTYVelhLQZAYhYC4MlZvbo0hK0jdbmqP4hqJjUTR Yidb86Q2ZAGzqvL+u2ms6+Jqs0RiFyW7Iu0Ekj7Nj+YRYkIM/8DKoePGkfvGZuNn6xKZ cQGwWVD67xrgackm6v6Y3XTKkgue3OpnaorYTB0/mngBFefeblQ/Qpu1YBblZdXJ8V4K AUPg== 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=BGtO+sAqSsfhQWxWzhgwY+yfK1/X3G8958Zwpuj8sGc=; b=YY2CNaOcZ6+OffEw7Uv8d3UoCJMk0vN1intRkzESHHjJ6OahcxEoREnPjKaWf1G/nA 8FJIVux9P+B1BPS/jcAoh7zsjUGu3oSESy7ehidmIPgc+ujzNbbUXjMp2qHTvT9UYGRr x6iwIPUpEHrMfeMyh4AK3cVUyyVgfPvm/u2/w3D+Wn61JWp06ViZ6kmMs8qxYWlbR5lt Yc5XTZIuxdCR9Bpa8P/jFrbpj/aEKFhBtbNryv5KEIWZAeaky5XzK2mli6RWGc+lgmy+ XgiQcX7h3PfGjtLTe82MHQ96zZHKvDqFWyWxLYwrcl3lYkBiEThfPpsNzOTDZyqdW8ZB k/Bw== X-Gm-Message-State: AKGB3mLFldfEOp2s+47w336Et+sDs15ccVSANbOU8JlA3+6LTJvyFXw6 kl1j8nrKB7e5RNJjZT0JAJY8Gw== X-Received: by 10.80.138.34 with SMTP id i31mr20204226edi.193.1513419212299; Sat, 16 Dec 2017 02:13:32 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id i6sm7100034eda.6.2017.12.16.02.13.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 16 Dec 2017 02:13:31 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sat, 16 Dec 2017 11:12:23 +0100 Message-Id: <20171216101245.26977-3-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171216101245.26977-1-onemda@gmail.com> References: <20171216101245.26977-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 03/25] avfilter/buffersrc: recognize color_range as additonal parameter and set it to input link 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 --- libavfilter/buffersrc.c | 18 ++++++++++++++++++ libavfilter/buffersrc.h | 5 +++++ 2 files changed, 23 insertions(+) diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c index cd56f8ca45..51a1a9fb49 100644 --- a/libavfilter/buffersrc.c +++ b/libavfilter/buffersrc.c @@ -52,6 +52,7 @@ typedef struct BufferSourceContext { int w, h; enum AVPixelFormat pix_fmt; AVRational pixel_aspect; + int color_range; char *sws_param; AVBufferRef *hw_frames_ctx; @@ -109,6 +110,8 @@ int av_buffersrc_parameters_set(AVFilterContext *ctx, AVBufferSrcParameters *par s->h = param->height; if (param->sample_aspect_ratio.num > 0 && param->sample_aspect_ratio.den > 0) s->pixel_aspect = param->sample_aspect_ratio; + if (param->color_range > AVCOL_RANGE_UNSPECIFIED) + s->color_range = param->color_range; if (param->frame_rate.num > 0 && param->frame_rate.den > 0) s->frame_rate = param->frame_rate; if (param->hw_frames_ctx) { @@ -279,6 +282,11 @@ static av_cold int init_video(AVFilterContext *ctx) return AVERROR(EINVAL); } + if (!av_color_range_name(c->color_range)) { + av_log(ctx, AV_LOG_ERROR, "Invalid color_range parameter provided.\n"); + return AVERROR(EINVAL); + } + if (!(c->fifo = av_fifo_alloc(sizeof(AVFrame*)))) return AVERROR(ENOMEM); @@ -309,6 +317,15 @@ static const AVOption buffer_options[] = { { "time_base", NULL, OFFSET(time_base), AV_OPT_TYPE_RATIONAL, { .dbl = 0 }, 0, DBL_MAX, V }, { "frame_rate", NULL, OFFSET(frame_rate), AV_OPT_TYPE_RATIONAL, { .dbl = 0 }, 0, DBL_MAX, V }, { "sws_param", NULL, OFFSET(sws_param), AV_OPT_TYPE_STRING, .flags = V }, + { "color_range", NULL, OFFSET(color_range), AV_OPT_TYPE_INT, { .i64 = AVCOL_RANGE_UNSPECIFIED }, 0, INT_MAX, V, "range" }, + { "unspecified", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_RANGE_UNSPECIFIED}, 0, 0, V, "range"}, + { "unknown", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_RANGE_UNSPECIFIED}, 0, 0, V, "range"}, + { "limited", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_RANGE_MPEG}, 0, 0, V, "range"}, + { "tv", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_RANGE_MPEG}, 0, 0, V, "range"}, + { "mpeg", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_RANGE_MPEG}, 0, 0, V, "range"}, + { "full", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_RANGE_JPEG}, 0, 0, V, "range"}, + { "pc", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_RANGE_JPEG}, 0, 0, V, "range"}, + { "jpeg", NULL, 0, AV_OPT_TYPE_CONST, {.i64=AVCOL_RANGE_JPEG}, 0, 0, V, "range"}, { NULL }, }; @@ -434,6 +451,7 @@ static int config_props(AVFilterLink *link) link->w = c->w; link->h = c->h; link->sample_aspect_ratio = c->pixel_aspect; + link->color_range = c->color_range; if (c->hw_frames_ctx) { link->hw_frames_ctx = av_buffer_ref(c->hw_frames_ctx); diff --git a/libavfilter/buffersrc.h b/libavfilter/buffersrc.h index 0652113f2b..7129db6bd9 100644 --- a/libavfilter/buffersrc.h +++ b/libavfilter/buffersrc.h @@ -114,6 +114,11 @@ typedef struct AVBufferSrcParameters { * Audio only, the audio channel layout */ uint64_t channel_layout; + + /** + * Video only + */ + enum AVColorRange color_range; } AVBufferSrcParameters; /**