From patchwork Tue May 10 07:33:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35714 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp3284218pzb; Tue, 10 May 2022 00:34:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzsx8CU0B49MKkaTRGtY4I2jfn25xeTDuOBtk4y7WzhaMFV1y8pOdL6u1nRAfTqt03Alkh9 X-Received: by 2002:a17:907:628c:b0:6ee:70cf:d59 with SMTP id nd12-20020a170907628c00b006ee70cf0d59mr18632060ejc.402.1652168064601; Tue, 10 May 2022 00:34:24 -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 m14-20020a056402430e00b0041d76eaac95si17053465edc.54.2022.05.10.00.34.24; Tue, 10 May 2022 00:34:24 -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=luAtQaoD; 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 63F5D68B070; Tue, 10 May 2022 10:34:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2020.outbound.protection.outlook.com [40.92.91.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B496368B070 for ; Tue, 10 May 2022 10:34:11 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Hxn8BoFwShTyoprHpwZeKTB9uHf4FCr/T7HuLmqJU3CPQFFtizC2cpIWPD8Lvs0NKzxl28gKRm+Fv+FtJAb0csHOFXVkIMEOsW6S1auUwXSUlvtFLFxFK4klFFZtryczhHl6Jh45b2zW1LoTo27KFbub5fvMcscOb3jryLYrknMgHC4peMEPpXxaLHv6IuSziD1pzFKQikoxPhL5Xmk6YNrgChOcAYM4hPMNnxaLHjVi5sMKoPuSfFr68JKYJ/XsliIBYToohCwGtdWUS7GFGTeY5uNu/w7mXv1ysqNf4vHFK5cMlTtLg10+dumbppjuSTwlnRsIquRrKwKc7x4Spg== 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=2RZ+H/PRYHIFw/FUZJvupbi0bJabR6OoZW1DdnND2Bs=; b=mSw9GVXEoW5tBJzJ/R8ego00hBTIaZIr87Kvj3nAuNR5L3jzf8yvnbl9q2nfyGb3qd6XOvo4ICT8wpyfQRDXLYqJ1lw6Xt0N0NrwsMqu8B9MFoLUe0VZksK8EzBKXK4VsvKwqn5liTsh+13mpMf0j+KmneYCv7shZlEUWczsrIKGtO2vhbNsmtHNS97Fa/yQYNL/sU4rlKyvU1o5Tskppu41paOnorRPUw2glPKt9Y+dEZJZJ+Slih+Q+mDr5pIVWj2WkskhYAUUAjvajuHzoLRzymvRmZsbk3NWIFgS2xpdeTOvrsZ62l3aUFjKxUnS4mucr7iSr2IVRz5LxterSw== 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=2RZ+H/PRYHIFw/FUZJvupbi0bJabR6OoZW1DdnND2Bs=; b=luAtQaoDru4x4oSRN229qYd2/kHVpPkeWzgxrrPMvM53WxJfihsE/SDrAbYDU3R8fodOHfTl/S1gDyk+3BzGS2E+9oQSeIta1ZoBB+cp1cZfrJZzG/AIniV/TNgSIeYwtw4zQz09gjFm6DG0Mp5gEE0IK9aIc9ygutSomBsJMQTbx/XwvLwTxGIU4/5a8iD/WQtRkJIl3ubOr1tnHIm05xQ9oa3Mroz4ATfP2rYGqrlHC63BX4xlplJb+IrEFTbrCkJlKni4QjVbEFG93e90MpZ42xJkDbLqKLMNPMaXGIn7Cio5Abs9go7nEV7SHgQDyXkgWhzkHpt8vpxdsIH5oA== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AM7PR01MB6564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:1a4::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5227.18; Tue, 10 May 2022 07:34:10 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%9]) with mapi id 15.20.5227.023; Tue, 10 May 2022 07:34:07 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 May 2022 09:33:57 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [c7q040UYKnhrwHbHvVEogex980L4FEk8] X-ClientProxiedBy: ZR0P278CA0004.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::14) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220510073357.480674-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 09f97c3b-ce97-4804-70a7-08da32577728 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiS5HkHrfABX6xWp8dcQx8IrNlk8QtqeLTcjsYeocukcl7bmuONs7egm47menL9I7xPIYP9uJbhXMln9OH6MfoTMCw17WK4k/JxaTN2gvGDGKxzbCIGXnqODuC9dVnxk7nUwhEJHlLhzUE40QYbSnBC4aPUK7Qt6F7hZyZZBAZIRWR4HKJ26TIw6ACyBwDcubTn+fCbboGyJsQ18cDbWfwc5eaCJAvHuMVTni8HkIBQn4mG69jfJEsbHF0p54QmGNePdysH/CqhmJIBOFtqB1eSpzQ7ACWFEdokyJ/qArxkTccHBvMxk75KZ3KpzZMKk5CU6aHuggc5JO/ZKFO95RdcRVEOxvCzpsNtH92DhglsoNqsJ2tpj53MY9ChC8frvzpUDDYNi9dC72IWl03v+C4v8iUqK0fpcIZFcNzXhWlX783M44eiBT7/rumDKVMd34MawR9tpPIPQRQHfdF+CyyStJiglrbSp73m95CC1IQ10Tw7PGKq2E64RMhXuV27UFILvG/8C9l2Y23X3ybNnDzTJRPLZOuB7FLEVtQCvOvwVxOStO0JxE3tzKxTzyRQlq51u4aCUUUG4zy9LOGwDCxs+T9w8UZZdhIjQTJRrL41U9Up9x2HUHwe2MlThQjz3CXuPEPkARA9KtQRKBNnjcQkrelFKNS9nV8O2WFAnBpafuJnVw1KEz+C3PYkLuxXvGmN4ubBv7EyocO9kzR9iVokn9jjcOCtg8A1NMUQ3y6pDnqQulCzso5vyUOy+22QtyJs= X-MS-TrafficTypeDiagnostic: AM7PR01MB6564:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aBEHYPDN6Lmg1EaRIHnFA1fUv/LnfEwxD9dls5sLT9C+cNsLPMlKyURpPqKxpq1r+poOIsV1YUcpltrkbNhAcVXlTogcWLd3nBplb2JiqwUKA0FD6GRE5iOZU+WJymjccUVpAwa61yOyRbXZu/RPehlmVumNJ8Kqiy80jbWld5fl1UZ/WpuQZ3YDGvvtlgGE2+s7ToX500c0UB1gbDiTP+OdpWNvhuMpAqWMs1uQm9U6CvyNvVz8GF3HpeA+GwXD6QrfGO3C7NAkPz/QjYqY4KHTYygcosN3AE0E4sjqmgWKw2Ukn2O3Pi4anAadid8QhbKj9fkr44tB0Toxtv8c9A3AUXArd2Pgq/WJkAVhRdmJBIOO7FqO/OMOQD+i943ByRM7FNdZbZjiZMb0p2hvuX4Af6+t0emIrXgtukoaFNE8L42goVP87sHyqL/B5Xgm7SUECy4DSchwzbMAqEWYu0e8Annn8qvSvBgJws/X/Js/NXFHPIQKSMPEIbL57ipzVI1kLzSifJX5cINt2sLRtBL+w4JOd8v4l5i4pn5es1kCfa/TRPjiODiH2ysiAi7fjvdGh0kfwmz7LlNu+rplAFqkrDeoJFHLINjXN+8Bg3qwt+YCqKrMVw57ICsBnb28g84uoY7VvW8ew0u8A64okQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: k4Kkxxmq1a4M+pTHoLTdoz4QevmBKu9c/5Pt0prBRP39Cc0AieKRyBUkg1/Kg31vOIiel7q4siSVT5+kiz1m6YNB6lT2Y1znwHnDbMy0hj5l8Sn3trv2ENty6pKP3ScRHsH2AVHAVnItvHyXpNsnxEY13mf7njLNGbHXEk1sMBxtCeExa3HJkaBLrP/+mHee0EWNQdaEZZuSPktCv+Vw8D/tQ7f/JgZ36J7BZtcQQG7Ae39MLQfsPJNFqmnb7OoXi2AKVE/tejZ/nSGJBkZN2kgE/ju6HHvNYcpG0FjCaHKt7r8y5L3KKYdtf4vwxSLgoBMNesMPES5TJZC3hq9ShjKX2I0FRDTHWDQLFOn5bpqL0lhGOGcyBD7ZMHGqjdzMu7DeYvmeRA/bMP5RD9pqJkQ56nAntGTnbcBYC0TE37T0xA1ai7wEN1UEPpuB3xhgVaGUaRZNRZ8WkUshhvxeUGAy+s9c8X2TelE048saazyD+0o3w7l3jnaLvSfu9+pxGQqnp65/5F+PsE8ayUVEL44sQKlw2Ly1x8Wjr3Kcj0HWoUTFiq5v4GZ69dMkSNznm2IO4lgvg2LIaijlG6j/fixUF7NXAQ4sPhFA96lrxHTpbfM7E67bhMTlyhNsXgOvpSFrZtjJZq1rJb/Uf/8lE7mNiABDPXM0xOD/esKjw7CKe4elbOXKaj3iyeQ8qGisfgjF2S1rzIXQ/A0XKQ9z12hpPAZF5RwsAbwYvd16m6wzU9b9m1aoQQA14fnq/a/1MqTzS3Thkr/eflgApvEZuiZQgekib588EnqyplDbYXeKORpdm1q+lvlYV/R6Y6TNxouDJs+PND6Wld2iRc1ZGv/AwTKYrIwDzd2t59nUE32I7T1zzr9yKVY4fPRucKqGFEfopBPjhMq2ifuu2wT8T5mFBlmvtaIFzwKbqAVpHXFCP1MX8S6XFZW9b7K5JsjwTw4lf//LtX151SbLVZIPAu4pJTSlrSAmqnDOe47BRzxcbkT08HdCbTezhAQralO341NRVVp2ET2MdWtzRFueLRK/M8W1SutiNxSCU2ZWGXFMJzSyTKM5Bzy0Ry1CWyVDsGuqB+CTMfb03p356peOiUQO9FbK8jZpEAiccnITHuzH7OwgqQxOG3dggUXcPc6cq9WbDt9IvT5E1XIoeovrw8OiJ+jaMwZe31crV2re1iOGdLcjbSYvuscsW9/P3m1nywoQTIPJKnSqEiua2xNrW3nWcyu2O3LcqTbL7Dsciba/BWL0deoAAsNzXfq3lNcU4w9XMuaegsekoBb+gvCvLhGkH468TJH0UlL25XcbBJ4ZBpPwN/zPbAPN/Xm5LNxDaM31Q1HPZdLyX/G6ve41fH82As8xGyi+l2TcW5/ABrv7kDWMSKzmLZUhVSzRW2WJG9rnSZTE7OcD/MPZuGEC40ywclf4GpaQyOQc0m5AQPLmYQbuqA1FYcStKL5SX1KYyiiSG1pxNKdySH8kBbU1Pw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 09f97c3b-ce97-4804-70a7-08da32577728 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2022 07:34:07.1528 (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: AM7PR01MB6564 Subject: [FFmpeg-devel] [PATCH 3/3] avformat/internal: Hide BSF stuff only used by the core APIs 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: uV09bWQWkVqq The general demuxing API uses bitstream filters to extract extradata and the muxing API uses them in order to transform packets into the format desired by the target format. Therefore FFStream contains pointers to AVBSFContexts and lavf/internal.h includes lavc/bsf.h. Yet actually, only a few files files are supposed to use these, namely avformat.c, demux.c and mux.c. For all the other files, it should be an opaque type that they should not touch and that they need not know anything about. This can be achieved by not including these headers and using the structs instead of the corresponding typedefs. This also forces translation units that really use the BSF API themselves to include lavc/bsf.h directly instead of relying on indirect inclusions (a few other files also use the BSF API; they already abided by this). Of course, it also avoids unnecessary rebuilds when bsf.h changes. Signed-off-by: Andreas Rheinhardt --- libavformat/internal.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavformat/internal.h b/libavformat/internal.h index 5363c0c355..b6b8fbf56f 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -24,7 +24,6 @@ #include #include "libavcodec/avcodec.h" -#include "libavcodec/bsf.h" #include "libavcodec/packet_internal.h" #include "avformat.h" @@ -212,7 +211,7 @@ typedef struct FFStream { * - encoding: Set by muxer using ff_stream_add_bitstream_filter * - decoding: unused */ - AVBSFContext *bsfc; + struct AVBSFContext *bsfc; /** * Whether or not check_bitstream should still be run on each packet @@ -232,7 +231,7 @@ typedef struct FFStream { * inited=1/bsf=NULL signals that extracting is not possible (codec not * supported) */ struct { - AVBSFContext *bsf; + struct AVBSFContext *bsf; int inited; } extract_extradata;