From patchwork Sat Oct 2 06:25:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30883 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2405770iob; Fri, 1 Oct 2021 23:25:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxF8wVzo/9ka1s0rtEV1Tt1vlK3KCH3c3844qSUptu+ePwkOFVQWinyGwmon2hjorV7n7d3 X-Received: by 2002:a50:bec8:: with SMTP id e8mr2185803edk.231.1633155934812; Fri, 01 Oct 2021 23:25: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 s11si11093182edh.137.2021.10.01.23.25.34; Fri, 01 Oct 2021 23:25: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=RtdGI4SV; 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 5903368A43D; Sat, 2 Oct 2021 09:25:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2088.outbound.protection.outlook.com [40.92.90.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 72ACD68A408 for ; Sat, 2 Oct 2021 09:25:25 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GtD1v6pRTQ6irbp8MVBfT06KU7GUvvnLJwNovDT3BaVZi9mw/vO+wy6oc4SaURJTCxs9Cta4suLbgGZZRHQiEEONTRkrDKiIRmv+iEtLp2ifRQz1tEHG6lrHUOzARB0z347JQuiqACtOKlMAOuN+Utm9eWlAApiHRvQLBREQHE3TaPUpVF+Mf0SUhVJ4x3V1QsDnfKkstRPT98yBWEvTN+VXR5ema+teZ2LTN3uX/l6nLqj8c/K68pFHsjCmjFQnOUyJRpmZyB3Lyds7PzeHmkmnvjz18/c1b4UTXYOdDiKA5pLeL4Iakh4hv0bB3AYUU7XStHiaPQhDYyC/jB5bxg== 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=sOqpOK6mxkWrfUY82pNFUzKTEi6xuYZd6UXDdERk804=; b=V5HTsKarq47LBFX5wXXmci1XTQb2Da1CphA9w8/Ga6/aKJ7tTGIg6gNj4IS0KzDVGVrxn02D+eAtktX1g10GFz+vPSlwPx8z6ZXqVBAuePByw3xnRTq9+CC7lwGpEGCse5H/jCpYNidkIjVPajYhqeQDe26QwcZrNyN/0lTZIEdQro+w6B24uaEALSr1bNtmBTOR+0Vr9vt0aAIxjdXvTCnX1DX9Nx5I91ykSp1FttQ2z0gyYPnDk1iX+PeUqYpsgKibWRZGw4Nr0D97t1BZQl3GqS9msGE2g8pQiHqlJSGZ5oZ4cnxBAvm4gWghj2EgaZnnQWn8FlZPxkozFF0c3A== 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=sOqpOK6mxkWrfUY82pNFUzKTEi6xuYZd6UXDdERk804=; b=RtdGI4SVpe/m4LXj1DEhrjJxebSiOXtz2+ZdV/IKHSyrXRKsp4bs+H6OSRzIW9Xt+y1ZMlwo4X6IpCRhQ4h1YbU8/Dy3MEycZNmHKuCgCSgFjuwEDaPGzCnPI/qxB7aGzfFpaq5vtfBQmFO2rf2TZmwLEAirW4hkQuojWpKDlXjpxpQLLjhElKTepQLwb+czCAG+/IRzTlefkEIsTexIusCMbBiBi1Ad7gmJxlJJTQ8mIi3qprxRCGzasqe4xUTpmhZ1vO4n2gewwGXG0BzqMtqm+w3vqD1qrVzPiYubEUkglRR1pAFmrnmFlNsP1DHFEjRq/tJVY33gKZEdFV0qoA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7301.eurprd03.prod.outlook.com (2603:10a6:20b:2eb::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14; Sat, 2 Oct 2021 06:25:24 +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.019; Sat, 2 Oct 2021 06:25:24 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 2 Oct 2021 08:25:16 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [NzkO+yYwR0vyw+fydA8BYQFmEoAmenA2] X-ClientProxiedBy: AM6P193CA0052.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:8e::29) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211002062516.2981835-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM6P193CA0052.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:8e::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.16 via Frontend Transport; Sat, 2 Oct 2021 06:25:23 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7efc42f7-1ad3-48d5-5349-08d9856d6ab9 X-MS-Exchange-SLBlob-MailProps: f36zkjAOy3UdB8jfRN/nC6QCeZ0FlLLngoiUaDEO3y40WuuUXREMAL8RaU8aMX+5gxaH23jcXp7QnIm1gb9Sk9xfBjNCaoE36YZ91eNbwxT6A5MPAleojOOESy2wlqC4Lun3LZjJtyIz7+ofljqtyn48V6LDO3BZOGihZhfS7+CeerS35EFBn0W5wSwml9UX5xrp85MeSkhBaQAzxP0t+JXiDq+0xnxTbgRxVjcpDMic/f9ISWfwmxAZ1uroZlPJXZh5NsA+qOvda3rOixjK7DQha8bJLU7QHDJEscMivnxjg+Wxu4FFQokwUhxdtYk9TlqV/61BULhbr/4a8ChNJ6mMbuu5qR2VtnMoDX34kstCNSz6xAv9OphzRHcO/Dh8PjqqR+Lm/ta8QELIp8QDp5EBsNgs7bKTNw+fKihNI9kycMhuIcSBkkPtUL3ZuH9DZIhWRnj9v0oO8zbRmIJTFdGPaDCpmRfqCWEit4wW227yJ1qKop79J0h065zS/p7UCvt1f8YiyLVNAW7j7YymxZA2IRskh2G7W9Ap8HMEQD+7wJwhKF8bPChuCvXjk/YQuwaiAm/iIv9VwbUZfw5bRPh5eA8oLYZ679qS5sOorE4k9Apj1mrqfqm932nhljQhjtWV/B324exSxjZmQJn/inh8IDsrtR/OBoAUW6gjSx7Ugptd6PMvI1tQW7DH27No9sgYU8Qjl9RVjbZS5riKVfMFB/nwieGn6wWYTwrmJEo= X-MS-TrafficTypeDiagnostic: AS8PR03MB7301: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: G+IACaoHI+nmgeQR1k8IKBSpwmCfmg4bsnQFPVqW+HFbzXAxz2Qqtq2dcwykMk0AF79vnfIwDBlJJ5PCznd+luePK+LamismebZLGsK9nQmkc6et9s5jeyKhbGgtQrJs8rjlA0JW2aRmIAK3PAWkPXfh/2CjOVuyDRkHowsZreCkcqkN0lU/5iqvVykdYthw6ANYcgdK1QuLMVLlGrM2XR7W8PCFYTP7SgHivVKaFK9WrZBVJ56hx9I/a9/JgBaFR9EA6fLrfDL9DexwmEM7kN4XYoePX9RRDXNffdAxCMEzb1kvzftV9ZJ7QBr1PN/eguTDFkKxbaPT7HhXXnt2RRzea8X41L3LuqkdVPxQLvWvqjfffU4K9BcRYr2epMCfLUAZFBlya/HFksN5bmKM9wdm+UfW1Ts9xnKDBQsz4B2BGjv0vFsKJQUdJL18s2DB X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Df2M7NV2kbhAqQE7qiYo9XqabLMl514FvdBJ//888yXPearwmO8p4/RQ0eyaDOybBO+zTPcS1OSzx2PZH9wcT4Bl1kBX7Kovqaoqi2hHPyRBQbdK28og0TeP0I8ENNec2ldbzaI0siB0vO1XRQOpxA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7efc42f7-1ad3-48d5-5349-08d9856d6ab9 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Oct 2021 06:25:24.0196 (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: AS8PR03MB7301 Subject: [FFmpeg-devel] [PATCH 2/2] avfilter/avfilter: Make ff_tlog_ref() static 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: js8Jdsk+Sfag It allows compilers to inline the one and only call to this function in its callers or even to optimize it away completely (this function is empty in case TRACE is not defined). Signed-off-by: Andreas Rheinhardt --- libavfilter/avfilter.c | 4 ++-- libavfilter/internal.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index d70db1b283..7362bcdab5 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -47,7 +47,7 @@ #include "libavutil/ffversion.h" const char av_filter_ffversion[] = "FFmpeg version " FFMPEG_VERSION; -void ff_tlog_ref(void *ctx, AVFrame *ref, int end) +static void tlog_ref(void *ctx, AVFrame *ref, int end) { ff_tlog(ctx, "ref[%p buf:%p data:%p linesize[%d, %d, %d, %d] pts:%"PRId64" pos:%"PRId64, @@ -1018,7 +1018,7 @@ fail: int ff_filter_frame(AVFilterLink *link, AVFrame *frame) { int ret; - FF_TPRINTF_START(NULL, filter_frame); ff_tlog_link(NULL, link, 1); ff_tlog(NULL, " "); ff_tlog_ref(NULL, frame, 1); + FF_TPRINTF_START(NULL, filter_frame); ff_tlog_link(NULL, link, 1); ff_tlog(NULL, " "); tlog_ref(NULL, frame, 1); /* Consistency checks */ if (link->type == AVMEDIA_TYPE_VIDEO) { diff --git a/libavfilter/internal.h b/libavfilter/internal.h index e7c154aff0..116d5fcc96 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -230,8 +230,6 @@ void ff_command_queue_pop(AVFilterContext *filter); char *ff_get_ref_perms_string(char *buf, size_t buf_size, int perms); -void ff_tlog_ref(void *ctx, AVFrame *ref, int end); - void ff_tlog_link(void *ctx, AVFilterLink *link, int end); /**