From patchwork Sat Dec 9 15:37:54 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: 6626 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp808170jah; Sat, 9 Dec 2017 07:39:12 -0800 (PST) X-Google-Smtp-Source: AGs4zMaZSUGgLYm2urya09IzB6fZEjaeLYw1w+euBX2x8u3pB0qmWSQ5GlsgD8ZXlQyckeEDv386 X-Received: by 10.223.134.230 with SMTP id 35mr27453744wry.74.1512833952314; Sat, 09 Dec 2017 07:39:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512833952; cv=none; d=google.com; s=arc-20160816; b=K7w+iNU22YHktlT5XGweW9Q2pX9zLhEmMCbw23P+NmgY6meuBwK7faD7hMFgJXkcnq JpMmUOqYBoMdFZ2F1BavkBop6go3nM6G2SrQGeEzT93Zx5Hf9L2Z68z83XSzrSXuZuL/ jLeeMVjjuDhY8rW9uBVA/xKJtLAQO78Pgnft7USurALaCNolc2Xg8wIAiJm82KBfTI3w JcJFOt5xclDiXR0Nr6bbkcjnmeCobWjeiwvtQgeECS+6QQBuJ3h6z+zhs/uAWjL7f83q 48jtdFeNbshkH7BfBs2wY5iXa2eWhrqBO5i38FlA02LMs+U+U7RrbT4edaJiVMvhb78O LvPg== 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=jg5JW6KHMx3h/tgWoZN2h3E8aZfTsW1yyYmhvryGifM=; b=pWR/zE4hLczstbR2VXAOoKJI4Rs+aw7jB9sKHn+zpTKc2xny7uqzMZ7n+C1kKctfgD vZWZFfVIDz00/sPU9XUIxsihZwJvAWiNcHNwUmwIcH7LutSnqLnPjXEB1Tu50I4TAwOp xJB2vVXSnbhgJ+k3eWNQHmhe3K3J+ZtMTh8ykswmxsxS5Uy+pbjAdq84nPFzWKvhC01R GyFTUuq3oWj7hl/1pDpIv9VB8zPHbFeTpbLOIwg06nTK/dOBN2iYCkgjw44YmP0ReO4D G7JtMa69F8aLolbT0Y/JgTDDlAw8g7i3oecQ9BgXqLKPz6edVeYkwtRc46vVscIylAka NsBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=tAkI3/Hk; 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 v6si6767088wrv.495.2017.12.09.07.39.11; Sat, 09 Dec 2017 07:39:12 -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=tAkI3/Hk; 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 5F0A868A437; Sat, 9 Dec 2017 17:39:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EF6E868A1F6 for ; Sat, 9 Dec 2017 17:38:56 +0200 (EET) Received: by mail-wm0-f68.google.com with SMTP id b199so3777945wme.1 for ; Sat, 09 Dec 2017 07:39:03 -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=h+DqGE8DqbdMfIz0ayu3vWA+FFhNJU9XhuQ0PPj13D8=; b=tAkI3/HkQVR4FtBaeEI2dHZJCyYmPrgLY2AXyPVZbOlijQJH9fEqzi3Eh46K2hu1iW WGI6BPYthHKHFnH/Re+adPoeFaSHghuQ6N3bOSH9WKl8et9IdliZDvyYTc3YO2pCse7K 8Pb0EZtuAAnOpILEQENCoDmKSpmY6kg+fuIirO11wBV2cy3A9VEqvLE7mu/N5O8Gbb8J 1cCdAM7pa/Ij5vQtGqGEyqL218kL3V7SQzocgcL3+JP3PsYEH2eeIkiXXTPlWDUTMly8 C10t/INqrFxQtsP6jc7k4o9MlrJpImRllOWUaUDlllUGd5wzMZOnGpRa73z9CWCl54Zq a5YQ== 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=h+DqGE8DqbdMfIz0ayu3vWA+FFhNJU9XhuQ0PPj13D8=; b=tK0DtSuDXUbgjRlFkO+Icd9j3MonQoimoJ/jcazkdiu9Qkwl7an4OxXq/5fnyrwl+V 5priXvrSp5ii0N5Fmjnvi1WCJxyyxz6d7EsFnIV+6JPgxQl4MqtkCd4sTnFJCpNsvgxH 7pzkleZt8WRwEpt6NIa2IcrQ/UMns18IKJ077G8KrJ8WtczWT56mtLnfY+giZMzGxOYF WMaTVdrsaP0+nKUxSYyS1kFxa/owARqPbOGpK/keey3HpqE4RXPfoh/11+5bvkTalP8e ZiDlw03HwBsLdTa7iSNrFhY3budByt9BRKOEBcEywhrkVSwd7nc29PDBb2n5eloGlXgy i2jw== X-Gm-Message-State: AKGB3mIkmxVjgrp4ONofMGLFKsWoqHiaLiUGyIej/JfGXBfmbc8wmFeh xWJ4BRwaLQYPQLA9RuurO0agTA== X-Received: by 10.28.32.203 with SMTP id g194mr6152221wmg.13.1512833943273; Sat, 09 Dec 2017 07:39:03 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id 52sm14654536wrv.8.2017.12.09.07.39.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 09 Dec 2017 07:39:02 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sat, 9 Dec 2017 16:37:54 +0100 Message-Id: <20171209153819.19007-2-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171209153819.19007-1-onemda@gmail.com> References: <20171209153819.19007-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 02/27] avfilter/avfilter: add color_range to AVFilterLink struct 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/avfilter.c | 2 ++ libavfilter/avfilter.h | 2 ++ libavfilter/video.c | 8 +++++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index b98b32bacb..4a579bb49d 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -336,6 +336,8 @@ int avfilter_config_links(AVFilterContext *filter) link->w = inlink->w; if (!link->h) link->h = inlink->h; + if (!link->color_range) + link->color_range = inlink->color_range; } else if (!link->w || !link->h) { av_log(link->src, AV_LOG_ERROR, "Video source filters must set their output link's " diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 47546c15e5..a5f4df74de 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -448,6 +448,8 @@ struct AVFilterLink { */ AVRational time_base; + int color_range; + /***************************************************************** * All fields below this line are not part of the public API. They * may not be used outside of libavfilter and can be changed and diff --git a/libavfilter/video.c b/libavfilter/video.c index 6f9020b9fe..8f12cb7080 100644 --- a/libavfilter/video.c +++ b/libavfilter/video.c @@ -43,6 +43,7 @@ AVFrame *ff_null_get_video_buffer(AVFilterLink *link, int w, int h) AVFrame *ff_default_get_video_buffer(AVFilterLink *link, int w, int h) { + AVFrame *frame = NULL; int pool_width = 0; int pool_height = 0; int pool_align = 0; @@ -86,7 +87,12 @@ AVFrame *ff_default_get_video_buffer(AVFilterLink *link, int w, int h) } } - return ff_frame_pool_get(link->frame_pool); + frame = ff_frame_pool_get(link->frame_pool); + if (!frame) + return NULL; + frame->color_range = link->color_range; + + return frame; } AVFrame *ff_get_video_buffer(AVFilterLink *link, int w, int h)