From patchwork Wed Dec 13 10:59:37 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: 6752 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp5267405jah; Wed, 13 Dec 2017 03:03:48 -0800 (PST) X-Google-Smtp-Source: ACJfBouhadPezkNUQe944qiv1cEzenntUA7alnWQuIxMK6ZOfcu45oddjOR3NruxKN8l49CRxY8c X-Received: by 10.28.156.208 with SMTP id f199mr1772482wme.27.1513163028383; Wed, 13 Dec 2017 03:03:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513163028; cv=none; d=google.com; s=arc-20160816; b=nor42GJpUZ6CHkksuR9NEceTlsx01M6tn16umm8asf5hr40pi7Dlfqh9Vfa+JxQl3s 35uWCL289/CQWABqKNaohwl7+vZiebWGOFnlnXUWe5E9h08QKU5SlLfOSWGH3JmBofsZ RWyYZ6DCiZv3vAvZT7Ez6evDa4bxjxplg+0pHArIB1vUsEEi+DN1A3kBUfbylBySBJgq AVVPqvgeLCosXb8NMBXbv4gkV+Tg8lGjfkXFN3Zn8LR0vaHwwZQvJRvT8OG6CH6QRuBL 99OAOWsLRiov06v+JZfvG2Bs0jQ6gdeJm77ed2v4srFnt5xdQHdoyk4kwppcBrgge3wj YhpQ== 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=wiKfpzHNSgXPwLTDyjFUCBArWT/NldlEarDOPNRCMUQ=; b=FMYy8+ppD45igpXQUNNJU6qQ9pIDRdWfuYepkCQXt3T/7H2SOxWxnyUyPLO8Pg5gbR JHdC5MFBUk8xqStkRkSPfnVZ0IC8hk/28STqMvgnsWpBFI002K5gcN3ll20wHgzkA3Dx HTQJPIZduplMk9RzgSaKjG0MpCL6IUJzgTSsliO5YV7gRCtmnJzExQMu+V8Boahh+GsW NROEvXlq8LfZykPDOsXAZArbWO8ZTm+WCQQwK9cudG+LeTuYxt8KcMCTcsT+HIB7h1Gj 9aXj2ZkxiP5ri91ysBoTsP5D/9uB25Bd5s2RBJFyBuOK27XSS+qLBIMMyL/IYqo6f/W8 k41g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=selowdbt; 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 i14si1244730wrb.182.2017.12.13.03.03.48; Wed, 13 Dec 2017 03:03: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=selowdbt; 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 5E45068A5F3; Wed, 13 Dec 2017 13:00:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2F07568A197 for ; Wed, 13 Dec 2017 13:00:42 +0200 (EET) Received: by mail-wm0-f66.google.com with SMTP id i11so4195688wmf.4 for ; Wed, 13 Dec 2017 03:00:50 -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=1kcSIfcvauatOaOxIWsZNWi2SAc47E1DLkB92Efz9dI=; b=selowdbtznAzpzBTVBV4KY57ELlCWZslt0mz02vPv6yPlvL5uIDZkD1VLtpO4vlQmP 9rLCipce3Jy4CJFbRN/78oaBmYC5Oye85rheCK/rQEoePCAfUwBHOdng+zaAg6BuFqkg YUvPYsYU8tX3Reqjl7RWlQXzgFvnl6LOLvaE2lYEb9mskVocvAo+iLiSWsI9Mjh0qOdv h2RVSw1o3qVM7swfGSYieZm9MgGFchZb6l5W4nSTdASsCyTsIYcUg02Q6TYBH1EbouM7 ay07CozOEzMPa549WYXrIk+GtdynLNYeTbev4r7MJzKQ8S2uG+sKLMQAEu58IWMDkRME BZ5g== 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=1kcSIfcvauatOaOxIWsZNWi2SAc47E1DLkB92Efz9dI=; b=tUv73Hesh7sARq9nZUkWgSdopiMZVWZIDm1XMXSOrR/lbZjPXx2MD3WzeZr9Jb4UIN f/mSzxtn4Xk4w587JbmCuapE0aIU3ALpg36NRLrALFyy7C2lcPpt93ew2jMOcL/Ioc+L nKyOPHXL7vBiTY3uUY0BUfnxWJ/Zvw9hyHr+mpxx4+CJl+VhKa53E3qMQKDt8DyLGKN4 tHPlbA9BWp8fGSpfVAEoUaaVEWfZiI4+CXHcvXebX7ojb7ZKPqCRD62+qpmXtohbgdJz 57bn3NK37qnURV+jS3Ys/pFBiQKpDuejueoXm/8C01NTlUd5yu4blFqzZy6JD6NRPiiH Ni7g== X-Gm-Message-State: AKGB3mJBvmOHK4iwOZmiVKmZSqTiOq4V54ue1VDqBsSSnswtOyr7Hb/0 uri6PUkjFr/ME8e8MJudwc02yg== X-Received: by 10.28.141.11 with SMTP id p11mr1698611wmd.149.1513162849898; Wed, 13 Dec 2017 03:00:49 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id w21sm675961wra.30.2017.12.13.03.00.48 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Dec 2017 03:00:49 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 13 Dec 2017 11:59:37 +0100 Message-Id: <20171213105940.32103-21-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 21/24] avfilter/vf_blackdetect: use color_range from inlink 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" Remove YUVJ pixel format usage. Signed-off-by: Paul B Mahol --- libavfilter/vf_blackdetect.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/libavfilter/vf_blackdetect.c b/libavfilter/vf_blackdetect.c index 06ef9988d1..ff4b9eebb9 100644 --- a/libavfilter/vf_blackdetect.c +++ b/libavfilter/vf_blackdetect.c @@ -61,13 +61,6 @@ static const AVOption blackdetect_options[] = { AVFILTER_DEFINE_CLASS(blackdetect); -#define YUVJ_FORMATS \ - AV_PIX_FMT_YUVJ411P, AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ440P - -static const enum AVPixelFormat yuvj_formats[] = { - YUVJ_FORMATS, AV_PIX_FMT_NONE -}; - static int query_formats(AVFilterContext *ctx) { static const enum AVPixelFormat pix_fmts[] = { @@ -76,7 +69,6 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_NV12, AV_PIX_FMT_NV21, - YUVJ_FORMATS, AV_PIX_FMT_NONE }; @@ -94,7 +86,7 @@ static int config_input(AVFilterLink *inlink) blackdetect->black_min_duration = blackdetect->black_min_duration_time / av_q2d(inlink->time_base); - blackdetect->pixel_black_th_i = ff_fmt_is_in(inlink->format, yuvj_formats) ? + blackdetect->pixel_black_th_i = inlink->color_range == AVCOL_RANGE_JPEG ? // luminance_minimum_value + pixel_black_th * luminance_range_size blackdetect->pixel_black_th * 255 : 16 + blackdetect->pixel_black_th * (235 - 16);