From patchwork Wed Dec 13 10:59:18 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: 6734 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp5263308jah; Wed, 13 Dec 2017 03:00:42 -0800 (PST) X-Google-Smtp-Source: ACJfBosFBs7TJYH7sgvcGQuTP56dIDDtr6S/3jPmu+7OxWAGXOmHQVM5XdyxG8YeWVphPX2DfdJz X-Received: by 10.28.183.132 with SMTP id h126mr1784824wmf.17.1513162842410; Wed, 13 Dec 2017 03:00:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513162842; cv=none; d=google.com; s=arc-20160816; b=uMPgg7HMY5Dzl4SF8h1eEQeldYNxGWcIIu+OQE9WyiFkQRLSTsbMfgFsYogX1VUH/G 1jwsn0x5tmWN0xdmO3acHnOt/CSLO/LD9JvNUuMD/SvO+F/hekBBHGxg2xST8NuNlafz bONzVhDkcCsi7i5SW4EoZXiUR+QTF8gON/mY6V/ZkIjTaLOp6YZP0Es5RbEoIJpHjZPC 6p0QRkcUs+eGzsEBUginoDyV15+rWLDfWsr0bX1zPAMvZx0zWU2nHr3+VGDnCEABPHos Q/A7IVZq/KpSrKTQ5MjYcsoLh55fXehsrzJhf6+x9lPKCvAyYvsT1pjufkkDB/my2GWJ VDkA== 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=fkpmyi5Ai5kbrHYljn8XnIBndUphw1FGY1UvwST7j1g=; b=H58/gZar6aXwcVhAuwRtes5Znk1j2IJOvwl89lZDoEOOSixwDO3Dh57JkpIOgxOA4T 3Eu1H7gt/qYKcxd4MqjzbZauI+RqVhgUzclkU5bsngauL4gDG8kJ1Yw3kZ6KGFBZ78MS oZvSkQMi3ABkAuBmRO1smWPu2JAUsNnqzzqp2/YtMNXKFnZ3BwyjRrdBL8sxS6S5YwXT xs9aLgyGJJ9fSBU/QbPhODam+YO7crnHGmCpRXS5nv/BNGMd62RWnnZ0inogkHV361z0 crtsr5fzy/EzBGRYN9TO0ucmzektjVUgIOxF0nOQV7SO4BU4qGGpntWv5LAPhzeexqZR kvlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=aE381dCL; 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 b81si1267848wmb.24.2017.12.13.03.00.42; Wed, 13 Dec 2017 03:00:42 -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=aE381dCL; 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 D416568A082; Wed, 13 Dec 2017 13:00:22 +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 D023168991C for ; Wed, 13 Dec 2017 13:00:16 +0200 (EET) Received: by mail-wr0-f193.google.com with SMTP id v22so1732844wrb.0 for ; Wed, 13 Dec 2017 03:00:25 -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=LytPAz6da4spyV0k3qVPsgrbqOvD4vCw1e7Jv5QevpM=; b=aE381dCLjhZw9MNXApajfHsu7jiloGt0rXDZiDiI0N1wyRDo/jzPZwxbEdsJ+yX9To T/5GgsDIybeL7RbrsB3dxRkUnaDw8ZFA9VXrK85OYmYGRzXuIHhP0KInpCe/4x10kLHE T+6bR2QscjyctTydxdnQbf1HCWV2bgYI58qYO+BnGlmT/ZILVH8qHiW1KZvkyRX/h1/9 lSRvxwRdH2UmmcO6HbrW+SIXAgstGaEKb21LAcjWQhi/SaiCV6IVyulW0nJjf/kmtlaC Ce82QXeluhbwn7OKYlmvTLgze3SF2e2JELim9ND7Dx74cRMT0CXRvEiekBgUc4l73BJ/ YFQA== 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=LytPAz6da4spyV0k3qVPsgrbqOvD4vCw1e7Jv5QevpM=; b=PlXDwXryi7cT5OXgLDSCO4F40Jj5cu7mN61OC1vPsr5tycc5uAhVp3Y59ZA0QsEcLO wYfm3Gotx6JaG0Fv8x6BcJ/oePlp+yxLLimX2gIXshsE0YF9K9YAE91di3hINGVYLqTN JgKpe2ObLNw+7KBUVCSvIYpWDzxXy0yemxaJNJ3+iqKB94/+bUW/yji3fTFtLNUpRFcW k9cJFV01AbIXukszwPXmPdJdTkyVoTtQGGw3a/vdmSBGu5iYo+owvxZ6Y1iFPuHhnXlv 64lixvCL3Cms4HEBlxL13PKF+gNypXNVT+Lgd9hKJ0tPqktrQeI+kE6spNayuatjIyCj knwQ== X-Gm-Message-State: AKGB3mIv5sfsSR83pnztQALh74dFrgMWoPG5T3zXEK/bry+zKXvON9A6 Je23v/Z0+CZRlMfob8diDeRzQg== X-Received: by 10.223.143.66 with SMTP id p60mr1792259wrb.99.1513162824497; Wed, 13 Dec 2017 03:00:24 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id w21sm675961wra.30.2017.12.13.03.00.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Dec 2017 03:00:23 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 13 Dec 2017 11:59:18 +0100 Message-Id: <20171213105940.32103-2-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 02/24] 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)