From patchwork Sun Dec 10 13:14:10 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: 6654 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1676116jah; Sun, 10 Dec 2017 05:15:48 -0800 (PST) X-Google-Smtp-Source: AGs4zMa4DXjfpZireIfTwCSm/XX319LKuYIEMd/HfJBD0C6F9jNyUDlCvHxf7FU2VtjSqmpf4k4j X-Received: by 10.223.173.129 with SMTP id w1mr31238290wrc.19.1512911748404; Sun, 10 Dec 2017 05:15:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512911748; cv=none; d=google.com; s=arc-20160816; b=C3uURcEW2hCWHpCMxi6qgaY9JYdYcWcktJReziyY5E4g0rqjr3VUCcHoUmkvNw/B9b 6IIhLQ8YSb7DZvd9ohhSM3e1A2REYroDMnSTc64qIeOI8gjlDzi6H3rTSvuE0lxaN1Kc 4Tuhf9QSzynPUYkrNeQlC11WAQ6zMHAXTV/DeZ9J2Flj79jNXZAwqPR/Nt7d/v/HAifU S1UU970wT0n96x35N4vnQ9gTDwfl7ZPjJTA/1kDxo9XSYCYX1sbGiwFjFg9P6HSWTDPi nUlSlgAmTZNXaHox8vwqhQ6tr5kKyQf+Lrridzq5x7ahHroOo+owxSjIx3eO8Iovdwvh Rq5A== 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=eNBRLfEjp6LBUOP4CwDrzeq59zutv3A8PZck7Eo+g0A=; b=mO5lOetEbGshCBmGYJLrbIdiMag/qKC+gbw4R7aXqaO9f7j/Bu3pur7eojnqE/N+vY AevnQ84ho1+62LGtHEzBe6sdKh4IXysM5d+r4DiS2a/Rj1BFtIy7vhiDNCkr5uqS0WUZ bgaPfGqy76OZ8ySytvDSuNzbHMvon6kJVMqUtUupsQWhR2S1CobXb9QEM44IUYl3jIAk o1llq38zDmy/bhi+FD5njXTlxBAWRJy+KR47EuG6xvLIG2/Yf54Vcw6S9QbOpRlpyd2h O4KYnCUvdgl7lSz7ndQ5+yB/+GHOrMA7lJxvmUYupJIF15FkvDGssLTLlEmMI9sJGRvC DzsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Y3eNKhqH; 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 a47si9176900wrc.305.2017.12.10.05.15.48; Sun, 10 Dec 2017 05:15:48 -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=Y3eNKhqH; 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 20F5B68A4B8; Sun, 10 Dec 2017 15:15:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 81D506898AC for ; Sun, 10 Dec 2017 15:15:19 +0200 (EET) Received: by mail-wr0-f195.google.com with SMTP id z34so14877297wrz.10 for ; Sun, 10 Dec 2017 05:15:26 -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=R6b9B0I+ui+GUUYlzQBji2IRjO2dF+JvlpEFL27mik4=; b=Y3eNKhqHEkljdNt1GjoxWq132+CXfd1DO1KjjD0lx3tUuOGpLsc2oBaJOUwrIDxUC8 Y15cczIpgjHGkZn9XUFiBYNpT/VmK2MH9TnM0XmKAFlk9d04DISPJZnrCmkdQfZetViw tQFYhscRZFpeeI2yLS518jUGbNNMUpS4wNhxXsT7AFdwxt4zTuMy3oEZH3yo5AqgEX9r vxa2qkSPIiSCDTIzBAfXUI4XIoh+EFMsD8ULR+3VV1J7O76wwvImmw507JCOspCtpA10 bwjurEU4MsMGpCR4wHpCE+0MNbw8h6Jqis0JJUX2qTSL3tiCJo+pr74hVHAdSbb7Ryno HAVg== 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=R6b9B0I+ui+GUUYlzQBji2IRjO2dF+JvlpEFL27mik4=; b=SqFmwsBGA2yPjJdnShu86QHEa73nWKJgXWmsQGYFB2NVSTvUL5VMzEZRApY6qKArPA DopizKQ8iQi9VaDwhdc7ONx51FoxSun9A4bHYSKHY598wKMqR83mg4HWI2CRez2hP7EK M/1hqY9Tk4kvDLHFvnI+OK6mF+5uw1jGN1eufUXVLMdDZU9kxNr830FfkbMjMMGacXY6 y+dBDakrLEq1V0w8U4j5tg18K0gKZC4yWbQeq89HoVYPI5J30D54EfcM24ZMOoMb/E/J +hlGgjv/Vt48xwjNs/RlsIJGLZgxIaiNP+lH+oXmI12h8BqJgSejzOJ3wioWXwgcuAig UoWg== X-Gm-Message-State: AJaThX65LlFtEAHgsz/sJrZ34IX63m/uV0hvvVE3gl9rMyo/EFFF2sVs +158a+EuKDTH6zE9M/5Um/Tfbw== X-Received: by 10.223.184.173 with SMTP id i42mr34020881wrf.31.1512911726190; Sun, 10 Dec 2017 05:15:26 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id g78sm1129877wmc.30.2017.12.10.05.15.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Dec 2017 05:15:25 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Dec 2017 14:14:10 +0100 Message-Id: <20171210131436.15791-3-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171210131436.15791-1-onemda@gmail.com> References: <20171210131436.15791-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 03/29] 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..9e6d07c7df 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 (c->color_range > AVCOL_RANGE_JPEG) { + 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..cc32d532c2 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 + */ + int color_range; } AVBufferSrcParameters; /**