From patchwork Mon Aug 2 15:39:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29199 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp1679549ioh; Mon, 2 Aug 2021 08:40:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzkcqgxaNAb/vWFw+kPidowESakn8oYBdGlLT2tc1Zy5hFcTwlSXaxT7IYZhOcNHN6LVHHv X-Received: by 2002:aa7:c7d0:: with SMTP id o16mr19896700eds.75.1627918818988; Mon, 02 Aug 2021 08:40:18 -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 z15si2166324edb.227.2021.08.02.08.40.18; Mon, 02 Aug 2021 08:40:18 -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=t82IaQPw; 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 891D2689D6F; Mon, 2 Aug 2021 18:39:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075102.outbound.protection.outlook.com [40.92.75.102]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8374C6898E0 for ; Mon, 2 Aug 2021 18:39:45 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=chmJbvkA8P703JagD4uKqFc+Yaya4lF99criFnEaRtRhjtM+ZpCAy8qqNB3MNXyS+HFqSn5no0BxB0Z7MafGlyG74WlQTa6DoS+YQifRiS6fOeig+bxdMKz81RK6DUN/5rlOhJFQrs4DnNN0zzRcmY0usEE4Yv8dFsQFIQj4iXoORCZwk6LRfz8WbJeiporvlcYw0DmRU7Sld/Mcwj2NwgQwmWr3eGU9IGYcUhkZN2QkQIFdYJ/JCmege7uDVcjx4Mlf9oAc+FlFWG7NKS4sl/IWmpek7KT8pL+s/+G7+2+BfGUYGNkPUGEkX1JDApUl9DxB9EWanDzKlC4J2HSeeg== 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-SenderADCheck; bh=BeCDQVrwRWIyGab5sm10ps5hlJWYhXQZSkw35Du0XIg=; b=gSN338sluYDJtYcbho00ETrpuPqXTM1qw9BKVaLbeDqBpvdifGBl6kGtIviq7aw6+BzlrAy8qSpgbCDhNbWH2AuonalxyjzEQSeIguV0FqjTAS5YT3cDBhK1rOK9BAx0LczIqa3dTjrDD40ZvIgKA+7AnCRFJkYDeE7YkAv3EYWZIMReqBWYOV21hanUmObFHKYYjCfMSLmznunOv6W9pvHxk0ZPy5q0Y1ipRw6hhyiXV8IHRUbfqu3q4z58Y4J4AWUDUNjJ+ZvNEUCQZt4ReADeigVGll1v2rtyQmkQGOX8LQd6QcQwuT4NnPg/q8Y+7oDxI+KEV2zBY61msBVcYA== 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=BeCDQVrwRWIyGab5sm10ps5hlJWYhXQZSkw35Du0XIg=; b=t82IaQPwQzEozK+yPM5sAiDiCQiuqREed6vmy0/Zps+VWkhe/qjtBtdD6Vh3ZMXDECtu/Ditp1CASFxmDDIwgu/pdGq2cZeNJFWsH/WJ+Scpb0sCUssHaly9gsfhmBPL2ZhLVbJQ3X+GZI7eaZTzW6JSaCqhMDBflJAadoLpNMf5ae8ImeayQSnP7aGE3tFCsBGID4s6Jjb6BXEgz13k7C+n5d6A3ye7kwlM0jN1RPwY+iqCRLfpwTn7aWZanGfSKRgRJGfS7wuej+kpQhVTOxpMRXkjEh06wrZfTcT32EPJx2TcBREilNh6ULdx284GUx5SfeBxw8BW5VVqOD3tRw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR03MB3092.eurprd03.prod.outlook.com (2603:10a6:206:19::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.19; Mon, 2 Aug 2021 15:39:37 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::c9b2:14f8:d555:6f2d]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::c9b2:14f8:d555:6f2d%8]) with mapi id 15.20.4373.026; Mon, 2 Aug 2021 15:39:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Aug 2021 17:39:12 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [nQ1KKMY+UMinLYBZPr5f2zMfi+5GSf+4] X-ClientProxiedBy: PR3P193CA0056.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:51::31) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210802153915.1234499-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.94.230) by PR3P193CA0056.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:51::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4352.31 via Frontend Transport; Mon, 2 Aug 2021 15:39:37 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 97717b11-7cf2-4a8c-4fea-08d955cbbc21 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUytrrqT4o9623wQ4EiyPTqpaoYkn/Ii1ogFUE3nwI4O2d2Q7ow+CVAjcHxw5NW5QnkXw0J84STK0NzTkhPYb/XFK4nyLzamxjcZ8E0R5i/bMbW/VKlJhwgr5Mg9XJiqfd3tMnK5P4NT+OrWL098AiFhfA6Bq3atQafqAY5JZsM2+jJUzfU+IqZ8Bx6LsCsnDorI2P4IprRT4K5skaePR4Y+PA1I0oTMNf4l09rZD7vey2NGAAEE9989Uj3IHn8bWyp4ylZCb1uiXSiAV8mYK6ajb0838axfZH3Nroytq3dQ59awxYvq2G9Qs9m8i9Ym5dTfjzGI7xVIIbPxK83Zs7iM8jUbSpsLlvgcTyB6aAqnTWcGydB5Sg8C9F2g2c0TP+IyqPijJchuAM3LotMC9tYuVblsAkYVL9GvVnTgP3qxRVRcJs4foxjub1PfaRv3wNrJ1IVJbCvSXD9o94YaxBUIOP9u8B9vgW23NaSF2hsu/qMWDVawdWG11yWmE65oRzcrfcayPKz3FSAjdV3xCDOwY0cylm+S2SUVlpWByFdnYqIgQAY1otxpN92fe3wZi6hPCrtFj1VXg/I+o90Kg5pfz1MY8/UT0FNLyLuqaRTYiz3DIoYBCFIK30wyjy2M4+f3EH8dppcdJU/INmpr7LASsraExsKzMXPelt9HIqP2OdSHfu0imidLtR0d1kvE9+hScQ+WVBA24pGL0pIhJ7SnaoYHWDSwJI= X-MS-TrafficTypeDiagnostic: AM5PR03MB3092: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +P67266HTF+DX8ZqXfDk75Q8FTCpgQDqhYg+SoKy1chD61IcbgBCJlgfr8IL5UcFDzC3AyHLjwUa+mO8+LwigXxUby2nqzek6zp2vPNubo7aHqt9hdaBgzg+TWzsmfZHl0i57g2PpXT+cSfEELTQQUwBpGBAZ7IO0yEFGBM1WlINJ8B858pxIGiWvJDh3/hAa0muF/gDIWc6R9GCRBXDtzfMOQpR8ws/UsajDAe6Qvtt6Ve/lnsKBozbmgW6m58VPqxM4RRABc1kfp1uUX2bGUmgGF1BzhzvJJjVomfIYUE36VnbzTzewWzRo3ejI0M0ZGugjG03Btjukc7LehOefAj6mu+VCHMI4kfNkShlKWYrku8z18H6DzX/LD2SrYM4aGGU4R15f8DWyt7R7nOmonNXcGPLxVPUa6UJza7hZnM8XvSBoaAfXDa52AkMBXNc X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: CMTW6QBxDWohDOvSSwgEKGdZ3Wj/A3lZ4FXQd1D5sJHzRRK38mfuTKOudqn5ovfbxWajfZhdsmchJRwkdBvgirTidLLimMqZBvUwDLT/iJLUzyXnbF1o4Moll+Y559r3ofxLWkmMD/yecuXVO59OSA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 97717b11-7cf2-4a8c-4fea-08d955cbbc21 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2021 15:39:37.4957 (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: AM5PR03MB3092 Subject: [FFmpeg-devel] [PATCH 07/10] Move ff_tlog() from lavc/internal.h to lavu/internal.h 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: hvZT/ZItVcI9 It is also used by libavfilter and it is only natural to define it alongside ff_dlog(). Signed-off-by: Andreas Rheinhardt --- libavcodec/internal.h | 7 ------- libavutil/internal.h | 6 ++++++ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/libavcodec/internal.h b/libavcodec/internal.h index 1921515bdd..dc60e4bf08 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -91,13 +91,6 @@ #define FF_CODEC_TAGS_END -1 -#ifdef TRACE -# define ff_tlog(ctx, ...) av_log(ctx, AV_LOG_TRACE, __VA_ARGS__) -#else -# define ff_tlog(ctx, ...) do { } while(0) -#endif - - #define FF_DEFAULT_QUANT_BIAS 999999 #define FF_QSCALE_TYPE_MPEG1 0 diff --git a/libavutil/internal.h b/libavutil/internal.h index a33e8700c3..d8a1f2672e 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -198,6 +198,12 @@ void avpriv_request_sample(void *avc, # define ff_dlog(ctx, ...) do { if (0) av_log(ctx, AV_LOG_DEBUG, __VA_ARGS__); } while (0) #endif +#ifdef TRACE +# define ff_tlog(ctx, ...) av_log(ctx, AV_LOG_TRACE, __VA_ARGS__) +#else +# define ff_tlog(ctx, ...) do { } while(0) +#endif + // For debuging we use signed operations so overflows can be detected (by ubsan) // For production we use unsigned so there are no undefined operations #ifdef CHECKED