From patchwork Sat Dec 9 15:38:15 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: 6638 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp810427jah; Sat, 9 Dec 2017 07:42:00 -0800 (PST) X-Google-Smtp-Source: AGs4zMag3E8K66q2EG7riEkZ5fBB86dvw3LCz7wXnyWxVIfX78/V3mQPWM4d2keL+TqtRREGj5Pz X-Received: by 10.28.127.22 with SMTP id a22mr6372521wmd.12.1512834119922; Sat, 09 Dec 2017 07:41:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512834119; cv=none; d=google.com; s=arc-20160816; b=VAZ2MiJtWs4QDqF0COZPB8BhxFp8hIUPp8gX2fkaUkaKDnENvEbpvU73v6AHdISnyn 2qGMUBqT8TqoShxzuXEyxNMKb2gIMgCDPscoQP4hpfERV2WE9pmB0MHBiroibVIx5cqi +Aw8qLLgDzIvO8OLixVOTylhl4OPoNT6mYmFpDPHvTUynL+X5y5DXHxAnThh46E2gEsA NYEPSSE1m14Pz4MrZT3hfcac0kJUccopBktM7EZ/5PdIvsPvzQviRYaRa5+qntj/J9h1 vlKZub+ZJRpuQaJgc0E0FYWrtgXSOPXT8Oqg5Yz7WXlgXFUx+zQjRnhdqQics/wdQe4T 4xsw== 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=oFQoCEldP1z6ydL3KcJub+Qo0XkF68giE2K3joui0hu15813X6mdFVla+3LCv3e+Gf Z8xWyr1TvjfzFotSaQn6HIxBJGvdtAlpwrgM/EfkbcCLDN53jUXslc+oFufZFPdodx6A viP/PvUWpjX7KVb5MwxsI1+ryb6/2B80qYAPCHc7fdyBY6JDWZIU7ZsJQVEM/nycW3IH maJMS6IqaGMHVrC8p53jIYqwemE6fHoW3qyRKEUp4xcR8XWydl3llwpX2tI4f0biK4UV XcoZmMSEQmToxZfJxHwQ08o2ASBoJIzUnsKp/SEVQfk8C8YESu4NJxuQqM5CSRVJfBK3 pbng== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ADfvIxXx; 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 y71si2791394wmc.167.2017.12.09.07.41.59; Sat, 09 Dec 2017 07:41:59 -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=ADfvIxXx; 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 83C8268A54E; Sat, 9 Dec 2017 17:39:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 55A9068A535 for ; Sat, 9 Dec 2017 17:39:16 +0200 (EET) Received: by mail-wm0-f67.google.com with SMTP id 64so7364150wme.3 for ; Sat, 09 Dec 2017 07:39:23 -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=ADfvIxXx2iJElj81UJ7P4MGx5NazoCXjbDz95bYR6sB448QaPpgzfKxbPTGiTnOAYL /Umd1IARruwjfk1SK1qlVKnz5nCNQoByJggm1GvfLWA/r010YOgEvL7KjupJ6e6kDUWO VPDJ1Zr7u23GhK60iBQTg2QE+pozafEcj3seaDLLKDN5FP2ZRPnIDJBEnJN84fUpbz7W QWr3ZUyphiwQLb2IprUVaAnjgTPwrcsnSHtgJTDZ7rRCxIR5GS5uCakT2oGgu/HVHsbD 7U2RJvZFECbA7K2Jz3s0cnqf20L10DEPKB9lGf/t0vKqVNJZ67p5hXIo21WVnaywo0KI XVqw== 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=kZ7JloRxjyFLAl86j/HwUWAxTXwiyzbydyzQXVXDMY76AId5gTPSY6JfLBBZj++x+G pCXCGY4wt9ozmhrIcYwxUIy3+mzTxsTsoHydRIx/ObXKsVAhaT0BumhZozYEoRua3Cx8 rN1JMAzx6aA4F5n1Tg19OzScdeJ20z4GTBo6D92oZf/qECT7AI8cPkQDEgzzJGSxx+rf bZ6I/NtlXFvpH7TRBdFWHMi6G4WxLhE41ftH7DXiHcU6vRjHvwCaxQU/6l6wgRYkOeoR yl76+e9wb3sA99CZC6XQTTj9OBzsx3E8ZO6I/PISxL5/kk1MMji3fJh+R+VDfe9zzYTt S8ag== X-Gm-Message-State: AKGB3mJXtIXlud9d0Xe0BobNXqYnXos3SqTPT4sD4FbyV89bUeQhuX8Q zlHuC/tLcYQk52D7DA5+/FipNQ== X-Received: by 10.28.110.26 with SMTP id j26mr6409200wmc.46.1512833962624; Sat, 09 Dec 2017 07:39:22 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id 52sm14654536wrv.8.2017.12.09.07.39.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 09 Dec 2017 07:39:22 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sat, 9 Dec 2017 16:38:15 +0100 Message-Id: <20171209153819.19007-23-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171209153819.19007-1-onemda@gmail.com> References: <20171209153819.19007-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 23/27] 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);