From patchwork Wed Dec 13 10:59:19 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: 6735 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp5263520jah; Wed, 13 Dec 2017 03:00:52 -0800 (PST) X-Google-Smtp-Source: ACJfBovwBwd5Kq6g3G3vkb/KLmlzx+6bjYKVYJ231YjMJ5FifJnAeqHqysmRrDOlg9GugG8pL2i7 X-Received: by 10.223.189.5 with SMTP id j5mr1860167wrh.172.1513162852648; Wed, 13 Dec 2017 03:00:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513162852; cv=none; d=google.com; s=arc-20160816; b=h7V7LSjl4gUAUuBSDjzqmqMxzFlCOlKPoSu1Vy8b7qDvXNJu1+03R/SZQvA3ALLfYy cC/DkxaAyYU63SwbbGddGIS9VrZg8gd0HxI4l8AXzMZD7qtsawGxeenkf1T8/5VJMWRG BgTy4NLjHj6OpPQJ9VPe8k8+lArGC+ARR4Ok651PbMPwzgSVDlehjKDBV6Fjh+xGjeFS hizcxWbixBR69ktBgvMZUjFxjqnQfpUyv4LR5sQtzo3rXhBibiSpkBqktMP/Hkxzkbut CUWmRm1Qe6PlyMqD3q5R7Hhd2/uMH6jhrf7ZLnC20Us9OzM0SJJTVFzHzOWRCopoy31r XLCQ== 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=J8Kpwg7Z2C5Jm6cf8bq0S/gQIZyYtRCMHQYUR9N6ro8/wuwVXlYi+EvvaprBcxArWw ilUMrg9KP2aWgOM2juMLpEry5XbL70ejSlIwKRD8TQWFX1ma2deRhOotPlkGRNliEkvu 297jaffLaYyir4dekEDmJ9F6VOJSn8iLSDTFC0oI4e3T0Cjrcjm559E6e47cKD4N3qcM 29gq9VvrJW24WcO6K+KiW4V619bNh7kzm2pE6ssJ7zR7jTqGXTlf6lXRiK9G3+YnbTcx 78s7AiYg88/gdwP9bukzadPLQ2CgHREMXcvSQ36U+UCtB+ZuqkDOH5WESpOD3d3FfeVN NkpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ObsuMfn1; 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 i23si1056013wmb.208.2017.12.13.03.00.52; Wed, 13 Dec 2017 03:00:52 -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=ObsuMfn1; 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 4955868A101; Wed, 13 Dec 2017 13:00:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 27D2068A097 for ; Wed, 13 Dec 2017 13:00:18 +0200 (EET) Received: by mail-wr0-f193.google.com with SMTP id g53so1722718wra.2 for ; Wed, 13 Dec 2017 03:00: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=BGtO+sAqSsfhQWxWzhgwY+yfK1/X3G8958Zwpuj8sGc=; b=ObsuMfn1y8YBmyCqSfR42UgNW9PUR/zwJ58Tgb9eneE/JkBJY/jDx847cjuNGNnj5L C3d7cFy1jSOCHIy4Ksmdx2hk/p2yIKiC1SABDYAWNKlwuON5k0C0L6UhBMGQ0wKZn0Mj NpXrqT0vNwp2dR6LzGi4s4V8mKSMUX600tkNX3IjsCQIC7PE4COoo8YBUagZ3SpGUPvb 8g2ySJQs26s2Y63RXK/swuKSdZCRAW+hdIC9q3riC0v5z6W+i4AWSmHshy1RP8j4P4R0 9nJLokEj6qRFL2bc0LE+1OmAKP/j9nhWTyJKCE8XqutGF7TDLt81RnMrAHX0qJM6rsmt cpig== 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=ijZfuqJV5+WGuUPsjd5FbV9CRLkAS6KA0prRHjmHKCqZ8Y6E+7UAf47nFfo0XLDHOS QyKRBiR3iTN7/mR0k4xYPpXG4LtbpMG4Oa80FkVuxCv1gJO83KHY0b+Adwfmn1KezItN Fvtwzh+GXxbxl9kyQ7Gz9VOEFzm4gXtwTlnbAWVoofbGbGWB9RaYyXI/M1kLW+lE9m1Q 9KrWUBCs7KdharAFEu10ZsQyvFkxY6pViZ0TKwhIfw9PEcEA6iJajR7+a4HKar48GSTS SdwsnCUZsvwUArYbOR8vI5NcMqR/GhQnWzU/6Xj34bbtJyJyXn5t/2DiuSO5JC0RMqYf MBoA== X-Gm-Message-State: AKGB3mJXcRpTz1Q5jl8E3WfaFENVz8l56mlAsYp8qya33bVoHGFtL5OS tbGrnK1NwOndTNoJ/ykoEpebDA== X-Received: by 10.223.143.50 with SMTP id p47mr1943312wrb.104.1513162825858; Wed, 13 Dec 2017 03:00:25 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id w21sm675961wra.30.2017.12.13.03.00.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Dec 2017 03:00:25 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 13 Dec 2017 11:59:19 +0100 Message-Id: <20171213105940.32103-3-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171213105940.32103-1-onemda@gmail.com> References: <20171213105940.32103-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 03/24] 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; /**