From patchwork Tue Dec 12 13:56:00 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: 6722 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp4113285jah; Tue, 12 Dec 2017 06:04:23 -0800 (PST) X-Google-Smtp-Source: ACJfBotbv88UCmvgTmo+MJZXKN8tk3tyNafJbtETUwMzhPzXam1YsqmpIMqdUVEEwtamvEBYwUax X-Received: by 10.28.65.136 with SMTP id o130mr1982869wma.33.1513087463479; Tue, 12 Dec 2017 06:04:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513087463; cv=none; d=google.com; s=arc-20160816; b=QVkPTgmUt9nyAHbZBIOsodiqH635S4kZFKTqvM/3MPRGbYpG+JnKp/QKvlXH2mB/3Y exczTAvdvAZKoc39fJQlTbQuz8ZiUjbQKnmKRYgVCpipJ1ETBbuomoTOQlGZncuGGSQO MV+uvG18PHriBta0XaXFj1HL9Y0uy9lNJC9t4Pxmn+vfVIPn1x7X4bJue0IXsBn9bmQQ eo19SL7e3+mPaSQFCFyvUDAkeW9bFR+c0tBV2wDEVBrC/zDxmkeVFcSOJ5ctDlz13GkX I8zl+/wr+S0kCNjSOKFXWbIGRATKdgpOXP6dGjghG+jD6PZV7h+SKXiOeOQmDjBdmzSa LqYA== 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=uIs/+lT4ZBsUWxNeFfUIFlfL3koV1LFfqleJJUtVeTRm94u4kUyNZYdacWLtAuazQN pLDY3wE2dKo3hX+MUt9l5EJRGDzPXAlN3sdDYtFLI0+J55qtn2rdHLrwSBldwbnMvnk9 3itNXYa5OvYdkwgDaalbasPu9GOonLaOAcl8ydf8xVmIsrAo5/05BASEoygCj9Rzg+fr OU27fsAP2DdZTlUX/hPjsGB8YiJ6LPqeIM4Wlv12p8Ni0DZy8LiuBNTby1R7PbaLWrMz Dye4j3g9TIH8btaMAgekx8WdEYKcT46sJPeNZImSfAgH02jzuQN19+825JlPjAw1e1+w vZNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=vBb+o9J5; 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 s14si12637068wrb.284.2017.12.12.06.04.16; Tue, 12 Dec 2017 06:04:23 -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=vBb+o9J5; 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 E1DBB68A6AB; Tue, 12 Dec 2017 16:04:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9D6A168A40B for ; Tue, 12 Dec 2017 16:04:01 +0200 (EET) Received: by mail-wm0-f65.google.com with SMTP id r78so20963110wme.5 for ; Tue, 12 Dec 2017 06:04:09 -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=vBb+o9J5LytGjAzskwaUCKJJKchdzIsRkYgmwPozLtz/FdoRYaTwNbZKoU3lc8Aeu3 G6pPEbnSBpbfQKxMg3WEE/tEBzUeI7vpMFmoEia7fjfqLEK6dWyOftleBUgZMWAPsmTt F8wSlvzVGLB7KiDFKQyqRgrkD9HlRBQcLUaKHie4AvqQRk0MaoJUDXSmi5IiucBAjdnS UJtugBzskAK4fYeYazjO5jtFK7VK+H2rTf7y1hngdjlGazE7d/gCojErMvnbDyQ2hjwL zb2lWe+Cxpqr98lbszB/n5fnhvbLb4ytpa7dkb2NQV7KRO0JHnuBU0EvQKyaQ3V+xWv8 cYCw== 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=eFmMkjSH7zbe1xKdUBFSoA6Roa/cw0mVvAeDqzdjMi1Mh6/0kjXKVDoHXjc6FXFDA9 23xPmYLgV3ea2NYZcJG0yUALND0YVpdBErgzy/kOlcFxXg/cz8926qpiwKm9KdTYet2Q SwIszV1W2Dj0yQxVRihHO7k6vQ1spfkMplzDKd+qEyblkUeMc0Z70Cl+Y/byL9nkx0Dh 7YmesFcWMlqJ0G8zZCXMWHvA3pjQ/g9pueNxfLStaNLD/fDsSLJQ4+yWQRU8rZ1bfTfP bCeOewlyGkBECkqDbXjjCAvUgADgslwVgtYaWlQuuRl8gQWenWfEI3bAGdpssVzTMlAt HONg== X-Gm-Message-State: AKGB3mJeC6MixVbhN75b4aLF8M0WOoHyVN6pReRDtoMxJrc3OBYAi/du RVqyeql4vwhsdxO7W1GF/3xr7w== X-Received: by 10.28.192.24 with SMTP id q24mr1762149wmf.98.1513087026942; Tue, 12 Dec 2017 05:57:06 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id l25sm12628397wmi.35.2017.12.12.05.57.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Dec 2017 05:57:06 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Dec 2017 14:56:00 +0100 Message-Id: <20171212135621.30835-2-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 02/23] 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)