From patchwork Tue Dec 12 13:56:18 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: 6715 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp4105659jah; Tue, 12 Dec 2017 05:59:06 -0800 (PST) X-Google-Smtp-Source: ACJfBouRQF5OgmfRaL9uqWqoJqpVCEPWhUDeLoQkqtHWXKc1x5lbg2qwE7F3xkx5nDoS1kzCwIxm X-Received: by 10.28.202.11 with SMTP id a11mr1916939wmg.77.1513087146567; Tue, 12 Dec 2017 05:59:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513087146; cv=none; d=google.com; s=arc-20160816; b=kMy4pNto/2C0shWB2/lnRZe61HFbyvX01BbPpuG/VXUraDuS8yE/Nc69SwsAqrMhiS hBmnwvaqH/blX3oOESelo5BzHoCKunnnQiqaQWV1rmS+EEwGkk90844NS9VxEp0pHkZy 541JMPHdl76CwrFK5UMOgjtH04v5CnZl8nv6OXmSoV14GNyu4tATpyOWl/m5gkdb88eA HpCBExB+T34qDieNy6toZFaMdYg1csUGhmpxOXpNeYAayAJRUv8TaxZ3mUIhh7FKTuQM mWSRfUP2Zl6x+G7znpwnpo3WulRuKuMtNLnqhLqyAV5KmQO3JpET2cfONRu4zsi7YIWT sQeA== 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=cVN4MJb7wM+JuRB+DeJAaWJ5pWAwtG1UpzFBQNEheIEGsz5vWGtNe4Dc2if2Enzmeb KPqPVDmK/AGRx3MA41j9LFS1BYxLGrQh2rf8asKLg8T7Jn5d68B3/CtAPlxvs2mI0VA1 Z1V534FS0us3khO/e/zlRzZj7CSsfq2eNbAcs+0Nj+A3ry3SsbmEB6WqmVKWKfSwoQNz qA1Ki41TlGPW4AuFySgkI5lJwmpOFdaQu3ZhNpPAjK5ttXkGUJim6yxW4noE5GaLfjU+ g6D4rg/lM+fadFbde5TU5csFUSgMbmYbnte9+8LsUpnXYl1WM1L3mlO4i1qnAWrCvEdU V/Uw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=mkQeno/W; 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 i13si12617674wrh.109.2017.12.12.05.59.06; Tue, 12 Dec 2017 05:59:06 -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=mkQeno/W; 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 8CAB668A6B5; Tue, 12 Dec 2017 15:57:22 +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 4292C68A693 for ; Tue, 12 Dec 2017 15:57:20 +0200 (EET) Received: by mail-wr0-f196.google.com with SMTP id v22so21253929wrb.0 for ; Tue, 12 Dec 2017 05:57:28 -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=mkQeno/W/kKW384cyKkDhaXL2tajx6e+Ux39lR/TL62tNUyULShIOjxoM0RsdfiEbg Sf8n8pSnDvXf3t2GSu/eNLIu+VIS2wrnYbIAmL+utVLjVtQHHaaqL3iIUHkeK7O39qeV F1eGQPbo1Y9rb/H9uZslE+I8v/2Fn4Yn0dhrCs8rQF8wy6/g/FM4fg6VsE557pU0T9tM pwQnGYjzcfzvS5j+Pzi09HwbJWtxNb5e96+/tQXjaGxNaLDAI7u9uLvs/bnjK2kjc74y Mpw1A4BdbhQzGBE9NKl4mRM6/XqR8GTAx+y5Rn5kiDwxgeZ5GuAqx2E/qENOybJ/YYVx Ctog== 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=mIczEzJ5l0zdAGy7GkX1EcBP1/YOZp9cMaels7FN/RLh7GrysczsBUxwsH1I93MmZ6 8W9/3Pi/yg19yxShQPFL9njiypiWYU7mQqvGXpQOKKc/bIAjOiH8V+AgNR0Yl/sN5goM 2E94RAabL1nkZeF3/OkUTvE1NshY0GDviC3pYGj93OQcOAdpId5czrd6v5bPRd+m5WBS KpP1OqrBLTXKd6JJtjs4n1/uu+3CrmEo0wKbyrBbYAy7RJT1kf5CO+UYlaBbEWyWrZDq +SSjXuqF/VTmytWGJhI3M/M+CiFKLKL+vUzWvMY+VHSh5Fo4Fm2LveM9smbsjVluAg8H 71ZA== X-Gm-Message-State: AKGB3mIh3R0NWZUGxvyOsBL9F/jXkVai9iIRCWtQ/PiXKRNFnF0fc4bh b+AdThD0w8FluBlrqmBXTnJ0kg== X-Received: by 10.223.151.212 with SMTP id t20mr4200242wrb.2.1513087047699; Tue, 12 Dec 2017 05:57:27 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id l25sm12628397wmi.35.2017.12.12.05.57.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Dec 2017 05:57:27 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Dec 2017 14:56:18 +0100 Message-Id: <20171212135621.30835-20-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171212135621.30835-1-onemda@gmail.com> References: <20171212135621.30835-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 20/23] 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);