From patchwork Thu Oct 7 11:39:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30969 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp1386675iob; Thu, 7 Oct 2021 04:39:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwbccdIzDn4qZSzU5uRMTyBCEcXQJGBvAyUdeBoqxe/rQg4IXayvJchp0wECT3jKlNMt6iP X-Received: by 2002:a05:6402:2807:: with SMTP id h7mr2200860ede.58.1633606774924; Thu, 07 Oct 2021 04:39:34 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ds17si53646938ejc.757.2021.10.07.04.39.34; Thu, 07 Oct 2021 04:39:34 -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=@outlook.com header.s=selector1 header.b=MJ7q8k5y; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7DCC6680090; Thu, 7 Oct 2021 14:39:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066101.outbound.protection.outlook.com [40.92.66.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 880D8680090 for ; Thu, 7 Oct 2021 14:39:23 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OtEKzDDE2LbFKEY+9F59a0v18gKHcgGjNhS+mwZDfQGEB0Y5Won2MPN0LqPte9dq6gqrzSrUFFADAqVKJR2OlURAQgovbhsqmmeiLqtLKWgendxqOp5KqOxdqHrbGxaxeC70wKA3CkoOX+/76hPgog+/xr1qSSvio58PKWYhCqVowP3fGbrvcfvpHOTX6tbTKwYd5OD8SmVugsncLwYRAfPNPP5+wz3KfLG+tcWgsW+L09O5zjCDYjCGMMocVLeGxUpZmlHsnLNIH3sOeY072UGzkozIqIRDgoLwaBkumUne10KM311kKcgwqMZQUtf2axAuaDu+P9ga6gKkEnDXLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=/OxVWaOIh/OUi9lBL0ctUx98aOXTP2J9/QJ92jbLQ+A=; b=XJ46wbTsnjK1SEyiVSBiGprfwQjJyF7b9rXP6G3Vju2ci3JMyeiQ13gferCL8vkiUUvuci05kMvW+EOPSuB+GwQg+syZ5XR3qe650UHSz89ZU54ASD5FpHdsRVshSVhwcMcQrFuyyp4J+Obl+jRf5COCJ6J5lJnpLSkkl2BxwplhEA2VwmHnbCVhL/v6shDwJhITmB5vIHZwENpPjsEtifDiPqnSre+FqZZco1HEtK1b6NwpTiansAmK5hi3CVSEYek06RwvwgsZ0LAs2rpWiOMM3KIW/xgMM4QXdUrKcGGesGfapA7J+qsrz9Ez6TrmwN5lfozQTmKicsiDckyorA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/OxVWaOIh/OUi9lBL0ctUx98aOXTP2J9/QJ92jbLQ+A=; b=MJ7q8k5yO9xE0soeC08TfQ6VTL6W3J7WX9+ukUiTXdDo1OSd9irHR2abshyVXre7vbvFcmbHt/Iz99/tu1PVpGuz2I3xDRNSFbeLBdgym2CKOZOswXAtNEFgOfeOTMvcb6KAFI/A0GIib3XcBNK517S9U0f8ZKwONMFUQusYZF4LPWuzY6vXEVuVaYDhj4/+nq0nMAwpAxofjAS7V16SGZUmG2O6cwhzlGI2ShUhWn29XQAmTaDBGzBKUIoHLbYU7MDI7tqtqKA1Oh/2arE7KHTvm/mMiG8PakG1cYdHAFH1d7H03JmPf+e/XEotHPrhLWkZvbVCc0suV6wJ6hho1A== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4214.eurprd03.prod.outlook.com (2603:10a6:20b:6::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.22; Thu, 7 Oct 2021 11:39:22 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%7]) with mapi id 15.20.4566.022; Thu, 7 Oct 2021 11:39:22 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Oct 2021 13:39:13 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [2SOzQu0iR5b2u7SJ8usduR9syzPjxd+J] X-ClientProxiedBy: ZR0P278CA0118.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::15) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211007113913.911844-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.170.49) by ZR0P278CA0118.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.16 via Frontend Transport; Thu, 7 Oct 2021 11:39:21 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d2ee50e9-d643-42e0-911f-08d989871acf X-MS-Exchange-SLBlob-MailProps: f36zkjAOy3XbbBpNvm1g/7G4vT1kR4YePgyraz9QKR4UNXKdArVkopc7sUY+gjxbS+tir370OWetEMU3pD9K//iY3fHhGeNk6E5GvanJJXErd6WIBj38mHG7SNeOwNQ+VWHlBUvH8dZ41eSjy9WpNt0tunlbDuuxeIF2Tu6l2le6Nu2xSnna6EwnFfnZKJwcWEkFDyP/d/P/NgBo3LE44q5v5cVcYjcBt94cfXRY5lLMhslG9PD4NQRjDnS04clagICDfJoigPErslX3FH1wYC5C7bv7CUAiVHUyYvPxs4NHnuyyS38C4f3J01SJCvASx9I00amgEcc+d8CjtZzXEhMwdn7qyVRqMCeOp/KP/LmC5uTeqHACyV4L5RTsX4tOVC/IruDTvswbuc/ufgf1rAMJdtQFe/LaVhz2PlJDDbx0e9jPLQ1Wi20QatNs3gK4/BoJIfLtQFeMR6yDIITqHT+5HlchDak5+zf/v9DGRoz+/eqIPhr3hXMRz7xgjGzAe7tTOgx5+y1ByT/n1Q9NF7mfU/ZX9PLt1Rr9LR07gAe9X5LnCcUmP3zhun16Kz/kKIS9syRl9rZQUk3ffm+ZYheAb+C/GdJc4+pT6xmxv/Nb/8f0VxpnKua/tXpDzEAGgkGKzJzBJNkrT42ehW2xs74HvkO0M7aIi59LBF7scJrj4qVSZ5nCe9GkTvXVMfim4XL+m8onkyCSG64RGTwzqBW+XljkR+F22rPDZh/TQjk= X-MS-TrafficTypeDiagnostic: AM6PR03MB4214: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: J4u18Dd699r0aGkCuBp7LkazzHyBh02Cqk1HEL+xON57aCXYzISZTElEPBfpM6iP1E1qtNwbKSMj7Hikr+/KDA0xCUxoapSxwgQz8bhQli0wUNoiz+Y2XyCpquYRtU5xeuO3OemEdGmonvCQikebDNDOERrY/3knjr6S40Fs1eISRc+J7+iwJTihxZh81eA7O5EefKyLPBdkyn4eV/iTfCWKAgoyea6e4qAco/eieLR/RqyRi9x0orNzVtTlAQPJbj7i8nZfjMfujqF8n++r0x4Lg0gD9g/ZGIAS6lTjOALGAzDhGHm9tKO9r3fF1F0pSZ8KaGoWKBPudyVDAqyOaCLLpcj8ogZTkBrCL1H1vKK6FFg5I9yMtJ/KDGPF7gaAHo+wisvNoJhoJgKNw3VtrmFI2/TUDfYrwrQcaC+XULBYS8lZkXosu0cD61Ubw9de X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ueq7dp1ZSYnt3k/clUg0Expybyju7ZtTOOIouvpaEaBbAa4O6J8hPC0Rpe8vbl5ylWEmWoMfUmdDYb0c0bXI/9FMUIq2PnN0UyKCcXnWnBFFTRejMRYdKGQOOToLHHq9S4bGh+0xnkIKDEmW5+/4kQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d2ee50e9-d643-42e0-911f-08d989871acf X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2021 11:39:21.9120 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR03MB4214 Subject: [FFmpeg-devel] [PATCH] Revert "avfilter/vf_idet: reduce noisyness if the filter has been auto inserted" X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: SVVXFPj/EsS8 This reverts commit 723c37d3b7b5555f23bfdfe3e5c3599543c06332. Said commit was in preparation for auto-inserting the idet filter. This has never happened; even if it did, the code is wrong, because it segfaults if the filter instance doesn't have a name (having one is not mandatory). Furthermore, it is documented for libavfilter to not assign any semantics to the name, which this check violates. Signed-off-by: Andreas Rheinhardt --- IMO the proper way to distinguish auto-inserted filters from manually inserted filters is by adding a flag to AVFilterInternal. libavfilter/vf_idet.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_idet.c b/libavfilter/vf_idet.c index 8e7785fc55..0f3e78c4ec 100644 --- a/libavfilter/vf_idet.c +++ b/libavfilter/vf_idet.c @@ -335,20 +335,19 @@ static int request_frame(AVFilterLink *link) static av_cold void uninit(AVFilterContext *ctx) { IDETContext *idet = ctx->priv; - int level = strncmp(ctx->name, "auto-inserted", 13) ? AV_LOG_INFO : AV_LOG_DEBUG; - av_log(ctx, level, "Repeated Fields: Neither:%6"PRId64" Top:%6"PRId64" Bottom:%6"PRId64"\n", + av_log(ctx, AV_LOG_INFO, "Repeated Fields: Neither:%6"PRId64" Top:%6"PRId64" Bottom:%6"PRId64"\n", idet->total_repeats[REPEAT_NONE], idet->total_repeats[REPEAT_TOP], idet->total_repeats[REPEAT_BOTTOM] ); - av_log(ctx, level, "Single frame detection: TFF:%6"PRId64" BFF:%6"PRId64" Progressive:%6"PRId64" Undetermined:%6"PRId64"\n", + av_log(ctx, AV_LOG_INFO, "Single frame detection: TFF:%6"PRId64" BFF:%6"PRId64" Progressive:%6"PRId64" Undetermined:%6"PRId64"\n", idet->total_prestat[TFF], idet->total_prestat[BFF], idet->total_prestat[PROGRESSIVE], idet->total_prestat[UNDETERMINED] ); - av_log(ctx, level, "Multi frame detection: TFF:%6"PRId64" BFF:%6"PRId64" Progressive:%6"PRId64" Undetermined:%6"PRId64"\n", + av_log(ctx, AV_LOG_INFO, "Multi frame detection: TFF:%6"PRId64" BFF:%6"PRId64" Progressive:%6"PRId64" Undetermined:%6"PRId64"\n", idet->total_poststat[TFF], idet->total_poststat[BFF], idet->total_poststat[PROGRESSIVE],