From patchwork Tue Dec 12 13:56:01 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: 6723 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp4114639jah; Tue, 12 Dec 2017 06:05:17 -0800 (PST) X-Google-Smtp-Source: ACJfBovTR8mC20P/3o1PGNW3NupM5dIt5ir1QQkmV9Voa0WhlMTz2Dcc7hDBMRp/6ef4U5ETcIdp X-Received: by 10.223.151.136 with SMTP id s8mr4138896wrb.94.1513087517737; Tue, 12 Dec 2017 06:05:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513087517; cv=none; d=google.com; s=arc-20160816; b=f4uW9/4K1oJn6LhcefpgwP0vCLbkj97bOf1J+VaPI021BHMMRfeMNq2UAKwmkphuO5 WUCNnr54kvw4wty5zuEcZsgQCfZZ/OeoC5O++mJ5GKMgrP4Jkblvaaml08lqwLGeqlXL W5WXQB0TmUWMP9DQR0KGQhBZMjyR6B3vY1nJ5ZrPfyMyAO7VZkbx1Qzf60ywN1k825cx Lxij+Mu/DM0JSluR07zW4wfI/gETYbPb9i/CyzUoIrpaJmZZeZyW/p82lJ8d9ONiyfoA 4wUjYdoD61hRvLYLGNq0glU3gJL/0hYL+dNh7hPY2m9jrCsam1sShxujSuMt4GchQWIB ZmFw== 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=lp7AVPOa6ABzARdr1hPaVBUoihIwKIhOjYMN3lsXhQ1S6H47Yf86LnxJ88nhxau7NV qDKQcxPPBX2N/HR63rVdN6KYerQ0IUI3z0tN/8vhMm3isOOA2fs7YYPQFSG9ww1sI5QJ 7rHBnCmVrhKEYucAHjHxELV1VDGp2njVo4Ki/YWrsJ0rHcPJvz4ZR7coMAR37qxqBoTO gJ6l7F5bLXEgaXpLLzDa7HyBtuNpHSc/TqRYgOkgfKYe0ikXO3s/kBLegKgJEu8VlCfb wfYonTuzqAGUIAk6mhBu5kJiRVjrjgj17DZQ0waiWeIC8c+GijIUWjUtI824wHr2mwEN 0ueQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Lhq945Tw; 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 v6si7086717wmc.130.2017.12.12.06.05.07; Tue, 12 Dec 2017 06:05:17 -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=Lhq945Tw; 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 592A168A6DA; Tue, 12 Dec 2017 16:04:59 +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 F327768A40B for ; Tue, 12 Dec 2017 16:04:57 +0200 (EET) Received: by mail-wm0-f66.google.com with SMTP id f9so20633053wmh.0 for ; Tue, 12 Dec 2017 06:05:06 -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=Lhq945TwyNtN54z9JWJIQUmsSAmLK1Blxq30s5ivt1pq6ctiIpXb382h7OPHDneEFn y3tDuir4O7K++mc7vhlA3XDDDRD9DNMQvV3fMVTfnq//Z92xg6oMkEUpFz+B9teDSpNF IDZESujhoxbnbz7o0iQi3lm/S2y866qC7KbeLobT4lWXIc84Lhtd62Z/OVatuICqy0Jp ZePYP7+JjuvxccCFVEREI/eDEUjVt3rFMH8pH0i8XQBXmj3lyZAsWLMRuD5lnRs2ozco wJMVF1xmAf6FNcklGg9glwRml4yrVyiXY+j1Gfx5ZWyJOXnfuJWuCi4CAsiCeNsJNdaR v49w== 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=cCPUVgBjc1Ga4rwat1Zn0qaWTwReFCR01QTL5oX8GOSu3jVVGcfVeIKTeEcmMMuNlk ijVKXDyCjp0JXpRHnu8h+DeuDNYDoM9aYSaw1lO1dbY7IZE4RtuGQ5rRM4mui9b7YBzA NU70TCDc+w/XBrV/PMuari8gD64z2HlBOl5Q78qRJq9ky7Lme9NXVshOwDbhMm2t4iqb Lx45R6ICQiJDpL3L7S7FFl6zwfm08ALLb/sUx39W7yXm2SNFeQnRLuw1QGFj9MFQuqxh SAnPfXTJsx00ecMdvtBEzxWvA9FJmDw8Jg9ct208ZNQB1tniTDnkm8Lgff4zJBqSEs9W A2jQ== X-Gm-Message-State: AKGB3mLv0NlMZtQjXG/w9rMZpI44Ds7UBWY+UkMKcR/yUV4sE9A38idw h9nWxwl1QlfR7eB39CGtcHq/0Q== X-Received: by 10.28.17.145 with SMTP id 139mr1727907wmr.66.1513087028030; Tue, 12 Dec 2017 05:57:08 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id l25sm12628397wmi.35.2017.12.12.05.57.07 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Dec 2017 05:57:07 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Dec 2017 14:56:01 +0100 Message-Id: <20171212135621.30835-3-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171212135621.30835-1-onemda@gmail.com> References: <20171212135621.30835-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 03/23] 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; /**