From patchwork Sat Dec 16 10:12:42 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: 6809 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp468029jah; Sat, 16 Dec 2017 02:15:04 -0800 (PST) X-Google-Smtp-Source: ACJfBovpWNyNCFFKWKg/GCawivAcf43UknQcQ/QtF12t+M7NVagHleryZfbNxhZgztcrrGrzajxK X-Received: by 10.223.160.40 with SMTP id k37mr11634013wrk.66.1513419304174; Sat, 16 Dec 2017 02:15:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513419304; cv=none; d=google.com; s=arc-20160816; b=YN95dyFwylSok3LDwWOEp/fFDMsJz06adMG8kxy2hixyaqIj+YzLtLySftx+xM3caa xUbqIeImEtuua6u19xnz6H976RNDi0rnpmbpIKBR2/tyM52DApUpXcMx9H6DQ0I2BsJH hZsFkXDrpLoZASesAnABdADqqLpdJWJHtwItVA57Ax2F+5LPjleSszKpJhx0K6FZ6C5A 8IAQU6TXUxx08PuR1bxcQr9FILJCKxca+8G84Qz82ZXZy1Z+BVlMHgQ/hidOq6WBPJpL UcHJdaYvwokF81vfFtmyQn/wDlLSU1i73mEBlkPfWAMhGklaEvgmAFS7XAQrsYssY9um rohA== 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=cG6fFFXmi2qHewoeFjniz/U1amtYF8brgOFDDS2MZdRvNy6hJyPpTxrUq7zTC20DpL 0wddtlUITE4FMS40fJxt90yzRlqnMlzkaA5uRBB77QACPMDa5NNaZTXg7fGpV+7jGG+I FCkoKcw6nFqdyku1fdfh1HaXoNSIh2a1ptFTTAupxa9p7TJ6FT6jz259m1WDHcsG3XTE JGs7MCHNR97x4CjHGpgvdyhIm8FpJui2zxYAlHFNkDbnA2U9bp9spOWnxm67P2ntqMsp qTPZzd0tUj3M9jURKwiPqmwgQcYtoUdvTrri2K7i1YTqYQ9oDOdKQGlR/U1lGcE8i+1e 5JsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=BD3I9kaE; 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 b62si5808143wmd.116.2017.12.16.02.15.03; Sat, 16 Dec 2017 02:15:04 -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=BD3I9kaE; 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 DE61A689B17; Sat, 16 Dec 2017 12:13:46 +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 E081568995F for ; Sat, 16 Dec 2017 12:13:43 +0200 (EET) Received: by mail-wm0-f65.google.com with SMTP id f9so21743843wmh.0 for ; Sat, 16 Dec 2017 02:13:53 -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=BD3I9kaE/tSwUfMh598Wc/XoBXZsv/1wCXh03fF/IFJHvCIkuWJPQEajePvO6BuTHp Orh7jMppj7ZKIWO+z/+eh6ElyWFsTgPsRj3tlbEAMkItd808Vy/pJtxjRFOIkSPX3VA1 7BICGLNJcGZC6YiUnmAnhrw5yXRb0fbERYONPkF78VYd6RhVLQ7869gjShiL7o3Noy0y XtcD7yjS5RI7/V7gfBYDvqPh9pb7scrKjsDrcqioBVKfoYwFtzc9+kufWaVmzmpVEw6Z KYNPe/yojJmEQMded/jDi+nOMYqWia5/nxC5YSvdVyX5C5wJ75QJ+LARoUEBVs2nLX8+ 0FTw== 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=KNSn1o1nbi+u+uzZFIap7vKvZfkTQKvfrFCYPSdxBdeg91Rmarjq9lPc8d8zz1UQlm xQa46lPYMtNNlvf3W2ov4DCQh99fOm3KRIXbcHO7jcIIOISiDH5SNNxi/cGHbnM8C7QR aeVBMxE+LiMg9X8jnaOqWxcNTQ4UeRvWr0oVumkFPkvP2nQCDR5uF4D+0VF2LUUMM1C+ 0Ju7izjcs22SyCV1tAg68sxsfRIayIOqTRQmzFy+5eGVBNxd34VUmSIKm389mDYXgtIN DeDuTIizeWU92QDmrBoZD21++MNhTHbPaYSSjOMybv07xil6wncO6v7EVQWu6VLecB1B rlMQ== X-Gm-Message-State: AKGB3mKccsQee3vya+E951NrzY4tHR1lhMDcB054Jgnqfo+ePloupGiG TXpE7T8OEQBwy5kziJ6c5hySaQ== X-Received: by 10.80.202.200 with SMTP id f8mr20996007edi.54.1513419232892; Sat, 16 Dec 2017 02:13:52 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id i6sm7100034eda.6.2017.12.16.02.13.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 16 Dec 2017 02:13:52 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sat, 16 Dec 2017 11:12:42 +0100 Message-Id: <20171216101245.26977-22-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171216101245.26977-1-onemda@gmail.com> References: <20171216101245.26977-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 22/25] 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);