From patchwork Sun Dec 10 14:06:47 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: 6681 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1719542jah; Sun, 10 Dec 2017 06:07:49 -0800 (PST) X-Google-Smtp-Source: AGs4zMYvUlONkQ40daQZlJ/6C6elO/YZzhRTMRQiFWFN2YAkOy87M+Of7GN2wIkZT1/SESR0t/76 X-Received: by 10.28.46.67 with SMTP id u64mr8286960wmu.64.1512914868972; Sun, 10 Dec 2017 06:07:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512914868; cv=none; d=google.com; s=arc-20160816; b=IgjgnL8plJezpbAq1U9AfdTnNs1NiHzhLk4ec0UkNhGPdksOpG7Lvo/HD0/m5Odiwf mQD6R0OIdpIF5I8Oj+cWCIoAkRt9+Gin9iTemfkbf2pgbtJ7xA+rm1wH9yvQ29/bv8iN 1HZ2nLkk7J/upldgh6tmJEZWCf1SZ5uuGXoIv+YJqMbWO0WvgdJQqkXCCtE/nEmCUQiF HMAluaepXsuRv1EbFBMgHze6MqiCeK+O/RhxF808v9krPK4zmd1yJftmF628X70bstdf z70qFUZYWKoIBa4RwYL9Ddl+hkqGVSJPGYTg33Y5vee8tAxL7xzx0xcQs6qf0z+eDAKZ dXqA== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=fkpmyi5Ai5kbrHYljn8XnIBndUphw1FGY1UvwST7j1g=; b=cF+tw0LRN6J8sfjSEZY6ly5D/zLfeFx9LDLugYBfeAb/q8d7G+R5GZzCWcE2ZGF+Yo F/SOlWI1l3bTjr+CZZOfGTUQct2KRjpLZdWMPPm1Sz6nrQPUQOCo8is71UiyB4OmB95z ZbGWWn8/P0nyIjsQE07j40xIO5KSfsvPlN9aOSJpnk+VhjuwbBgBcxp1C7RT4zBsF1US xzayMeVKKJDkdJQR0KhpArUUl9WiYWOPv/lxaE1qVIazqCANSEfiQBSCugxAiWJ+DOHz 0rymJNG9d+tJTZ5mb/JrFVxA+zkz5Yn2v8bE/taGPijZpfwCijKGRys6Xu09jtpV8gft hG9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Fz3ZwwFp; 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 q29si8673401wrc.474.2017.12.10.06.07.48; Sun, 10 Dec 2017 06:07: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=Fz3ZwwFp; 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 697C868A251; Sun, 10 Dec 2017 16:07:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 571CC68A457 for ; Sun, 10 Dec 2017 16:07:33 +0200 (EET) Received: by mail-wr0-f194.google.com with SMTP id h1so14939151wre.12 for ; Sun, 10 Dec 2017 06:07:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=LytPAz6da4spyV0k3qVPsgrbqOvD4vCw1e7Jv5QevpM=; b=Fz3ZwwFpGmSF2Y1wpG/tcIRptz/Du/dPFJ5861ea66200ZGsoFUp8UjjbuMI2R+2Mu en2udY9eoAXqKqdEH/FBQp87e2Rac0jTDfQIjLAOUwNIwFGoVTSBjHgkWRDcvoP9N5bD JgzBA0EROaqyen336vmsUBjuT7nmZ8lpdet7UySu8gy6ghI8Wg+d4wyvE83Q/+CsjLV9 AkoO3kpeBIN/gBDny9TvRqkExcavf4KSwx43tgdl09wGFcvAFmuoDSpdQWll7+mb4XDm ECOimgGbhRefH85jd530RkfMvKoYn6Uw/R7AJfwRn7GyzxHtcG8RuOU7lyH2G8ikm/YG gVzA== 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; bh=LytPAz6da4spyV0k3qVPsgrbqOvD4vCw1e7Jv5QevpM=; b=acWFEon/BboLgBJ1Ni9dUk8ng3gApaQsPRJznRTAIR0fim8/EqpH2fhE8URaXmrD7p fLNpjDGExhEuzYudnqpb1V5C2aX8R06s6KM20H9fGcc5D2oWRnX8VSyAq1p5KIELQR7/ bYsz5NTb2+aQ2oZvX3zfVorw3JU8lxrIxNybxoPzc+D2PUkZOADDs0X66Jhz2OWZ9Kxb nzcktXrsMeUCCRmKTJLJuk+56N+GUivsjC+rd//ScsnLMyfrLkU8Em7rJYeLqF7WpvWi QVvTcDzE8pYqh92fseQgjZ+fTb0/eLiqS7TtZUg7Kb3cSA4TvdyN5wQyCaKU2+kdHijZ rbFA== X-Gm-Message-State: AJaThX5MMO62Vy9WONXkWmHb6Y50vp0qCknJLIQ6brQ1FhNfUunHahxT 71BhY/8kIFi1R56kFjutY2fASA== X-Received: by 10.223.131.70 with SMTP id 64mr30051872wrd.114.1512914860028; Sun, 10 Dec 2017 06:07:40 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id m134sm6851813wmg.6.2017.12.10.06.07.39 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Dec 2017 06:07:39 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Dec 2017 15:06:47 +0100 Message-Id: <20171210140648.27537-1-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 Subject: [FFmpeg-devel] [PATCH 02/29] 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..40ad28ffd8 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -584,6 +584,8 @@ struct AVFilterLink { */ AVBufferRef *hw_frames_ctx; + enum AVColorRange color_range; ///< color range type, video only + #ifndef FF_INTERNAL_FIELDS /** 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)