From patchwork Tue May 1 19:40:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 8729 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp4905422jad; Tue, 1 May 2018 12:43:56 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqSntej157qGIYMP85dTsGsaH0aMlsr1/tKMLcIKGxofJt0Vzifj2rO+Z7j853ab67E2wnG X-Received: by 10.28.230.78 with SMTP id d75mr9124544wmh.101.1525203836247; Tue, 01 May 2018 12:43:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525203836; cv=none; d=google.com; s=arc-20160816; b=tP4vy/JNdvhXA1QTt2/LNxaSIkb17lfBdXjVzJJwLAiBTwWpwvaRh+mjBwYsjKwA6a KPD2nLAH8qYD0A71c4tWAtnja3wqkoFNj2Pe3BgOG4L/PKUr7tnyNFQ5sHOjcOSvhHgC lnMFmn9FcC5BOYFAUz3oE/Ya1378yRsnpiLUhgbiqNRRLAj3IEMYyRWk9248+sxPbZYx NZHGKHr3HJmHYevblwKYkxzGSLVfhLW55Lb7HhPxMcLdAcakcfTv1zbiVpaEGpqLXr33 7skrGQa49giBEog0FF2YXGemrzkKbGTCaOGJzLYd1/JdwLPtyPtz7lQOR0ryDQpphyuu aMRA== 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=DxagpuZ3gm1ss+VcDxzmrTik92LTEDKz/lebQUiwSEoaqhVQK7DvEyuDKT9rm1IIS7 vZjHV1DXudLrgGTXMmHeLxOHrIXS6X3sI3uS8OeQh4ZJ563Ipnpof2sEqbSGbPO8tPcE dVWVLcpyK7WiUkD5vtuk7Mu2rAJdFnOAu851vEr3AjSDX+I6RmNpFCKsjgjGR+fP+ebI jGRrqruvUNDtEAwVPgT2mmMj/a9TRgDkpgNIsaAr70MUBfa0vA08l6Ydi2eh5qpAPJTK hA5KnoMfuO0q030Dz4MPC03jYXa9YDgKjvsaF57yUpMC8lWXrId9+t+PblEtk14WjC0m ScQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=nimUy7LO; 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=QUARANTINE 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 y100si7384837wmh.21.2018.05.01.12.43.55; Tue, 01 May 2018 12:43:56 -0700 (PDT) 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=nimUy7LO; 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=QUARANTINE 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 1897B68A47C; Tue, 1 May 2018 22:40:49 +0300 (EEST) 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 5CFBF68A46F for ; Tue, 1 May 2018 22:40:47 +0300 (EEST) Received: by mail-wm0-f67.google.com with SMTP id a8so19194588wmg.5 for ; Tue, 01 May 2018 12:41:20 -0700 (PDT) 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=nimUy7LONDDCiywhUGNQZK7EpFG84AxgO+tSJjGR6o/CHvH4YSMMuzqOqlbvMAP3fL JiH+huFRJnucR3W6hJSAXcMjavRO/KctbRRHuJx72r0/3gX5Mm41nahWBEvRzxLemQpN 3nvJf5lY85V5OEeKEtz9MXU136H1smI3P2MGZSj9RPTLQGFY3D7HLD43zMTxeqF+AyOT xBdmOt+ufMhNEuafQq4xD3lkOAenXzAKixflvptH57gLDsiXBSSsn2xlKjM4qqKt3v/D XflszmXQfxj5VXA+mKz7x4jZACjyt74ZS7vSvQJkBiDflDNAseJohjXJDwSlovGE4w9t 74Uw== 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=YTJd5oCxDWmJqNTl4+/t1lFMI9vjbnD0VdTkzBShrwpNw0gMJGq46rU7fXsijuPymN jD8N12UMivRZ0hmKlwmdtRR8BmySbz9oEHnzuvk2VCGLEXk79FGTHC60uX9NxyL5ZDTy Xnh8JAv3CNW4gRLgyIuzSgVszQo0wPfHhHiChTNGimI2Bu/eEjGJKP4TzhvQnbQFMMV6 bnSC3dkPjuJiBynbYTnvTzWeEFEl0Owiq2AQ6ENky3vpPgFv7sezMcE2hNJCBabWzk9v 0WC9dkRc0jR1d1SleZFMOJKOiRQ4iNYvhRp2DD46rYJRw6f6bEYPWWMvaMB84mFTLZbG Smpg== X-Gm-Message-State: ALQs6tDE0XylK67IzQFeeyNuNAqdn1Z81OSchNpuNthApAlnGqh6OCoB G61SO1QJtGUZ1taKQlzGzcXLiA== X-Received: by 10.28.177.197 with SMTP id a188mr9621843wmf.121.1525203679424; Tue, 01 May 2018 12:41:19 -0700 (PDT) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id h12sm11839115wmc.7.2018.05.01.12.41.18 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 May 2018 12:41:19 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 May 2018 21:40:10 +0200 Message-Id: <20180501194013.9552-21-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180501194013.9552-1-onemda@gmail.com> References: <20180501194013.9552-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);