From patchwork Sun Dec 10 13:14:09 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: 6651 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1676012jah; Sun, 10 Dec 2017 05:15:39 -0800 (PST) X-Google-Smtp-Source: AGs4zManyUnOGGBr+DVhPgZEAlrE2jgtbpjPwlENbx1V7UPitcb2LOcm5MGQqpCwGQ0nrT8rbNcO X-Received: by 10.28.153.150 with SMTP id b144mr9040862wme.93.1512911739493; Sun, 10 Dec 2017 05:15:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512911739; cv=none; d=google.com; s=arc-20160816; b=XFI3BxRfWXgs3v4UEeeJ96g5to0GYgggZdCgdmeBgmv32a7ozjiidLckazNyOhmn2H jc1LvSbZrMNeUEyNfMVkUrIcM9kevxA7L84NslhIdt/FX/jrFSKoFNg6R40ggxWj/T4y ZkuWy7U6Gyvv01eaFPRKSLOIb4/zqK55OXq4EwjEQocvCjy5zDvSYfHxgaUD9Spkfmp2 YOoZfeJwokrJ3oP15mJNzyOkfJR/SqEQ9UWLSQeouhXQ09A3EK+9UHOkwhV67Jr/6PJm xkTorscY2ckila0y+FXs0Nl5w25Nu5TC9uahMpQQUgiHRB5Qt4Pk7tgphRW/z59ZFy29 OuMA== 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=PKctG9iCv/rDMNm/Y0hcvMynQvToS0A5fchSxDtltPk=; b=dJiLUbnOinsm38hZpzFS+VA2CzHzcKk+NWaZvQb06Q0EKqpHa2Adc4h7cqgfGfEIvb 7K0xE1z6AkH4fjYtFKQ3GkdVlFsKzpXRDbVtYxxbNhnpeEFmjZ1Nr7SLQA4eoBV6Q2xQ KHM7kPqSzLQ7XY45kPOTEYJTbm09GxBNA9mA3VXAulxqBneNhS+8Rwirbz3xriiQqOZB u4U+e6meHd5wL87avdwPJd+7ETPmnkhhG8j9kwqtyO/r8MctubCIP0xxAmIavz1KJCYx TUk0ZZNEfLL8IA/mUePuGYQFCHZHKi+6/rJsOwiGPOUOsjDTuUNZbijWId2YVLIoc3xM HEqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=RHGI7svL; 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 103si8935034wrc.215.2017.12.10.05.15.39; Sun, 10 Dec 2017 05:15:39 -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=RHGI7svL; 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 BA4AE68A15D; Sun, 10 Dec 2017 15:15:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 87564689F21 for ; Sun, 10 Dec 2017 15:15:18 +0200 (EET) Received: by mail-wr0-f196.google.com with SMTP id x49so14876112wrb.13 for ; Sun, 10 Dec 2017 05:15: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=RWyghvjL8LJWxeyj45QY3ThpCQ8Zwvoot7fNP0LYG/s=; b=RHGI7svLXTia6BeyWlnzLgEXQBiHylSTt0caufETGn5MJt3khfKIztsKhRMmSHzLpz fgMB6Ig7LCncUEiZlJkwvSqDveu+fmIAWuDTctG6AfKq6RQBYcDBy8NoY2qLPXSsFgu1 KH/JJiQjtduhTl2rrSbL1FmH3CVeElASWT0Q2vwSfGdJpc5Rs5qAauH1jNQ4SSL74MdL ZJPU2ZpGDzuN4OQ/SN63yFEYqsMMTy+S6C0Cl5IJkbfSnCcIz5ebxZfGtK0UyEDd0hFN 3GSW2GqP84pkTJNY+8H8kyBou/0fGjn5VOm4rQmGkm/FwUs+UZraySMbqjV/TkQXujAP LhXQ== 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=RWyghvjL8LJWxeyj45QY3ThpCQ8Zwvoot7fNP0LYG/s=; b=K4eyf3JSNnI0xa1/pWUvmI74dLOMdIlAXjqglLg4FA2voVGYSRMpYfToBZhcMASc72 5XRNxIO9Vw4DxjOeXOGfcDtu6e/Z4z+rclV7GILeqmryQ3NPx81BaUDXGmeAwDVxpSCL ysZOmeRPYqSffXsoAEjGz1mCVE8k0ZWPJQa17dbBXP7STYz6ElkBQ5oLwJn4QPuZsANr nrjkzpUe23Hr0yFYl8LCRs45Ltm7mDXy5GiRfni/XFf0RBVc0/ZFdBbHaLeuuDexxy8r BHUHs4afFQW7EjhlwON1ySs8q5TmCNVMpL5I2AeY/brYw7JMgIN4ZIbmUW9I3wW7Ozz9 BI7Q== X-Gm-Message-State: AKGB3mIR/EfDrwejQ66Zz0q7l2Llq5dOf0x87EhaTBr+gksJ5YR/HbE1 HP11SX1oeXPkxv92GycqbJOMxQ== X-Received: by 10.223.133.149 with SMTP id 21mr26275333wrt.266.1512911725223; Sun, 10 Dec 2017 05:15:25 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id g78sm1129877wmc.30.2017.12.10.05.15.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Dec 2017 05:15:24 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Dec 2017 14:14:09 +0100 Message-Id: <20171210131436.15791-2-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171210131436.15791-1-onemda@gmail.com> References: <20171210131436.15791-1-onemda@gmail.com> 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..7ab7c38027 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -584,6 +584,8 @@ struct AVFilterLink { */ AVBufferRef *hw_frames_ctx; + int 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)