From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 86D7548B99 for ; Tue, 6 Feb 2024 08:55:56 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8E8A668D13F; Tue, 6 Feb 2024 10:55:55 +0200 (EET) Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02olkn2102.outbound.protection.outlook.com [40.92.49.102]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0D0BA68CE33 for ; Tue, 6 Feb 2024 10:55:49 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hJ9ubFUx1sbqnCgBw4ecEopY9lg1t7w0mZMdJVMQXRKsZrLplw1DYZZdKqSwCEArof5jNHZeqFXAYsOR92bLvC6slub0fwfzlU8JB6rpRoxlTogl81KszEKYqkqjPzElVcT8mgLeKfW1DQjt8K0qz/wGq6vnSegBZAijeOiyi3IhuIEIF5YYr6bYrfitCoZf9vZejuOCn3Zi3MrrnraTMpC9wNhQIZN5SUNHbw2HnNdUpxt1m0IiOUpQhE/syN8gvH4cy8c+CQxTVDegfHYd+8NcAv7r1xJ/kEFLjiPjbMm108R4zeOQ+aKtXX0FaS16maUrvdlskSZwLi2miMC/AA== 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=KjKPTbkzolZ8AmKj+TL29MdkxhSX37P0/r4/XNNVTrg=; b=jmRqdBo9ABclr/E5aQ+QadEFKhNcg6VaSnrCwe5eu4h9r6GMaGFmOH+vJu61hp/l1anV+0oMH7Q6A8TbJQ+WaTVytBSZagTb3IPRW4XsRG08g47gRKuJFe/VuFtjY4dF7KwtNR2wnnMRFaVhZEKc4g3J7qWw/iiGJaJ41ogAZPsGjpSG2CqlETGSEclAz0N0jo59q5pvhiBE4wnCgUrVupOKytqDkNIRihZgsDOxTkCR/ELm5sE7zv6wGpmOqW3M4UNWR3JOak8ie2Qc36AVzl86/DND4R5U3+bwETHWkWNhrhBuwreceHnRI1sR4EiA28avuP2AixjF84HIvR0dug== 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=KjKPTbkzolZ8AmKj+TL29MdkxhSX37P0/r4/XNNVTrg=; b=V6hHPBdsn6Xg2kgDXJIuR9OplsQ34Q28XoYacdXoyE2lF49Oo46HGGkWY0ZHxmO25CBkELxZDrNq2GTKZbHHZUcj7HMSY4/G6v0Rx68jmXCiYM3DgCiWE9+RK7HKisZbsZ/TEVXhf72ItaRvgaOZBe1U7/g7iSvcrI0tZ5+PzDnywjDv7EzUyCj2ja6rLYu3j0jvGnVrtitz0dOCjXiPMbL5PeBKL4C5eUQFSMaAYY0ICRnShr58Ex86HjQCeGtODO4QU3jycOJqZR1k9uyJZv/YzUX8QjqE430VT76nGY5GYhBRXl7jzDxKVjYYM1DLAJpRjMpJPU0oNz4d+LCdpQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0209.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:178::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7249.34; Tue, 6 Feb 2024 08:55:47 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7249.032; Tue, 6 Feb 2024 08:55:47 +0000 Message-ID: Date: Tue, 6 Feb 2024 09:57:42 +0100 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [sGZ9BM1hadPGu91W6ArVjSwvBkXe6srEWRfGFjWMs3I=] X-ClientProxiedBy: ZR0P278CA0034.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1c::21) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0209:EE_ X-MS-Office365-Filtering-Correlation-Id: 4122cfcc-0f53-4137-986d-08dc26f16914 X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnqmcPDF1KAd/mmqN5uWR7ypm2YWnxMNI7rHBfqHm62PcT+h2AQdk6nJaQtYTDl3wOH0zX8nFrlRaihIRvDAOYoH7aiB1ezFwHGGaNC4NvbwKvhljqQFuyblIDedByEK+rsJRZOrOhNLk2XS2KErhzN3IM3HQaoQv5qgr2fwllaDlIOokFi15P3PYi5c9XFyy75H+6T6S1hx6vgb3zs4wir+B8CJRxknuUeh0O3ESUZcwNPV582WfSgpeytJUqdeOwgoTa6Yqk7LBOYF2a+sUzTBcir9CxAhnsSJGlTzR4v36SsKsKNmAsPaoXPph3oGCbDwZd2pAWMk4fOjwvVqyZ0j53Ri1TPb5cl6yD5xjIYo2r+Dzy79Vj0Q1CUwRWCYj0l9pnS8y1MSOqRDO/y5NOtSDR3qWP2tD1kv1TMVHGkmPxse9OYKRq+WIfqvC/V4Fo6mOkjD2SCLT6lNgSt+kFul6fd+6L7r1BnguGtgypLywYEhlvV0AIa+mN9NqMDMs5Twxq1B2WqUSc6b8fkimvOGu+Azj+cIcV0ZuHZ3EKSP4XwHTCcbU6FGarNuvOMVJxHMj4Vo4/9v2jZ8wz4d8X0vLeSRNzSONk9irsgtSTwy9Fmbgz9CfYB3HpwS3ycl1m2gArk+ctBb6sqqNLHxdO8NDDArz0lZQR+UpwR1WJQHbrYfj77zQ7l8tXWYQJ3PHtxtO61maSAVhAXOOgGkuKruCngoS52+ABM0oEsS3x/Hlh9wKVIvpAgzDiWqh+/vr+w= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NTmnyjaEpfj35b2TT3cDtACZau9I8zhdC+VAAkiKVwLK5C1oiFCzPd47wkT98nve2VIf2ZE6AJvbhbh94mdGCBwJK9H70QLDXbpX6PbGSbIcvVLnLQuBFrNietQAGXFJa2q3mh1WoK/dhi0ZnWRcbpQ9pkY7ZmSzI2x88D70GkPVntN5ib6BeJxQQ9DdnhNRkKivP6CFv/qqZrFscv3CE8a4xWJYWitecH02obzwURZglx2wCYFVcPobw5nn4ko2FxbToy8/Nwm3WGk1MfCb3YcKMs0S7u01itx4RV1hRZaltMUV4mYDmQrNAq9Y8kujyBTm4MxPvBh8k+CopkGxpNSL4XVSHsRLiJ+nLRhZDKCmxzEjgRtHQqMl3azdwSkD3YTg8GchU+iXFw6hhJ4oWHpPLIcpjJ8ZhY5DZmLFCA1KUsg8qDdi/S63eH92rSfKuHtEJNhO8nrTqSjkhjtNTgLqDeWPDukhL+PpFB0lfZ5Mc1eNVKUED5xRwIZ5kgD6CLmUl0yos84pVr/Dg8OHFzO6KLrR7n1TRgbR9Y5CrGhAxIbJIOiuuH/9Ntzr2PHK X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?SXN2ejNKQWFFU1hFUWhMMitxTmp2NnEvZW9oV1B3eTFwaEFpUkJGT09rMDZX?= =?utf-8?B?OXdFc2JpblRySXd3a1R6ajB6OFcrMFRUNXlUMm1YRlcra0IzdFdZUUVyb2gv?= =?utf-8?B?dG9RcUMrWmNHQU5GNlRWTjExUFVnU25HTkJKa1hrb2s3cHJhVTJzdno3VHdW?= =?utf-8?B?eFAvckhNUU1yUElLMFdUdXlHQk9TYVJsWUJOc1F0UGk2OXkrRFB6SHJNSmtl?= =?utf-8?B?WHQ0TDRDcUQzMnljbjZURHgvU1ZqK3pjUEJCcCtycWcweitpNTVqbFZXRFpl?= =?utf-8?B?bTNZSVJlcDNQUlRDSHVIemNWMDNUVHRmT3BDR0ZQazI1T1NZRi9BT0Y4TnU3?= =?utf-8?B?OUgydFhZSTVteTdpSnpJR3k5THVxWGpNWVZ0NW4wWDRyaFo1cTZaTm9RRXV3?= =?utf-8?B?Wm5oU2pYVUZBengxWVM1aktWaEF2QUV0d01sTTJqVkFUQzdINWhJQnJYdlhZ?= =?utf-8?B?eXBBdEdaZ29LYXZPb2Vhazh1bklRZU42V0VRMGRMUHFydWZsNDk0TklFKzU5?= =?utf-8?B?Sk1xWWFPdVZ5QmN0ZEZFcmVxdDJ3UjN3VlZNVVduVHVVSXh1eGtZRVNlalBi?= =?utf-8?B?KzdrRmJhbmFteGZFRnVJeE1meXRGVWF2dlZaVWEzakRCaTA5Z2FmbHpIa3Rh?= =?utf-8?B?YXVHL1NKQ3o2VldjUEs2RTh1MEVvNnlYNldvZzYzc1BFSUVRa2MzSnU0WUg4?= =?utf-8?B?dFp5aTVITENIeVlTQ29vWFRUdkhqUTN6OFhQZHQ2L2l3bjh4SjUzaDkzL3lV?= =?utf-8?B?ZFpOaVo5VDJQREZ3R1FhY0szTGJYTmgrdDVCa0FKaVAyWDhZUzBlT1Jxb0ho?= =?utf-8?B?eWNlVS9sQlpvVEtvWFNrNmppWXBXN3p1dGpVUVJsOVFpZm9WQWE4eWhDY0ZP?= =?utf-8?B?WjZlNW5ZcTRDdFZjblZBT21XTGg5RDRjckc2aUVoNEtTUVUwVnlKK1RKcDZx?= =?utf-8?B?S3ZROHEvMkZJN1lPUmVKTW5IK3Jqc2ZiN01vUk5wZVRvcHpCR0I0KzdYT0R1?= =?utf-8?B?ejZCc1N3L3NmT0paZnpqZm41U1RCbXNXQUtFaTJmTUdPNUMzalhIR0ZraU4x?= =?utf-8?B?WG9UTkpIdmt1UHJ5MXlaYURCRmlUOFBqWVNacnRNU1Z4TUwzNGtpNklyYkEr?= =?utf-8?B?cGF0UWZycFBheGZ3N3Ewck9hWEFuaFhxQWFiZUZ5N0JmWVRycDRDbFlWSkRJ?= =?utf-8?B?NEk1UUdOWDBOMElZcVRXRmNGRkxzdFZGN2x6SDhKN0ZxMktvMElhNnZRMFpM?= =?utf-8?B?d2Z1V2xSbjNoeVNyWUV2cG0yWFJOM1ZjSkM4RHhVNDlON0VRdFNzSDh2RHJQ?= =?utf-8?B?VWZmbVRXcEd5UHM1dEgrSkhJTVRlK1QxMnVrZU9WKzlrdXZvQW5LRGQ2ZXA3?= =?utf-8?B?aXcxR2RRSjZtVEZLMzZIQTc4clBLWEJiOW5oblVYbFNBMmEzODBqcEVaaGFY?= =?utf-8?B?UEF3MUV0N2V0b3BoOXdzSjIrZ29QY200WE5BeU5uQ3JIa0lyanF1d0M3eTdG?= =?utf-8?B?eVhVR3NZQmpkeDB0YmtDVXp0M2l2d2tUMFZCVzJqb29DTlZxT29YUDAwYnd1?= =?utf-8?B?THBuK3JpRjROVkt3eEMxOEVGWXdSUTVRaFZhcElURmgyTmQrYklVUnNPU2pW?= =?utf-8?B?VisvZFpMajREVWZWcXZ2Qk9QM3UrYWZrVEtoQzFRRkZGQnk2QzBHQ09jQ3NK?= =?utf-8?Q?i8x0l5dI5q48/9XQhyrH?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4122cfcc-0f53-4137-986d-08dc26f16914 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Feb 2024 08:55:47.3722 (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: PR3P250MB0209 Subject: Re: [FFmpeg-devel] [PATCH 1/2] avfilter/ccfifo: Inline trivial functions 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Andreas Rheinhardt: > Besides being extremly simple this also avoids including > ff_ccfifo_ccdetected() unnecessarily (it is only used by decklink). > This is possible because this is not avpriv, but duplicated into > lavd if necessary. > > Signed-off-by: Andreas Rheinhardt > --- > libavfilter/ccfifo.c | 11 ----------- > libavfilter/ccfifo.h | 13 +++++++++++-- > 2 files changed, 11 insertions(+), 13 deletions(-) > > diff --git a/libavfilter/ccfifo.c b/libavfilter/ccfifo.c > index 6ae61a4b15..29108822be 100644 > --- a/libavfilter/ccfifo.c > +++ b/libavfilter/ccfifo.c > @@ -24,7 +24,6 @@ > #include "ccfifo.h" > > #define MAX_CC_ELEMENTS 128 > -#define CC_BYTES_PER_ENTRY 3 > > struct cc_lookup { > int num; > @@ -89,16 +88,6 @@ error: > return AVERROR(ENOMEM); > } > > -int ff_ccfifo_getoutputsize(const CCFifo *ccf) > -{ > - return ccf->expected_cc_count * CC_BYTES_PER_ENTRY; > -} > - > -int ff_ccfifo_ccdetected(const CCFifo *ccf) > -{ > - return ccf->cc_detected; > -} > - > int ff_ccfifo_injectbytes(CCFifo *ccf, uint8_t *cc_data, size_t len) > { > int cc_608_tuples = 0; > diff --git a/libavfilter/ccfifo.h b/libavfilter/ccfifo.h > index a3c302b6b2..565a837a00 100644 > --- a/libavfilter/ccfifo.h > +++ b/libavfilter/ccfifo.h > @@ -33,6 +33,8 @@ > #include "libavutil/frame.h" > #include "libavutil/fifo.h" > > +#define CC_BYTES_PER_ENTRY 3 > + > typedef struct CCFifo { > AVFifo *cc_608_fifo; > AVFifo *cc_708_fifo; > @@ -88,7 +90,11 @@ int ff_ccfifo_extractbytes(CCFifo *ccf, uint8_t *data, size_t len); > * an appropriately sized buffer and pass it to ff_ccfifo_injectbytes() > * > */ > -int ff_ccfifo_getoutputsize(const CCFifo *ccf); > +static inline int ff_ccfifo_getoutputsize(const CCFifo *ccf) > +{ > + return ccf->expected_cc_count * CC_BYTES_PER_ENTRY; > +} > + > > /** > * Insert CC data from the FIFO into an AVFrame (as side data) > @@ -113,6 +119,9 @@ int ff_ccfifo_injectbytes(CCFifo *ccf, uint8_t *data, size_t len); > * Returns 1 if captions have been found as a prior call > * to ff_ccfifo_extract() or ff_ccfifo_extractbytes() > */ > -int ff_ccfifo_ccdetected(const CCFifo *ccf); > +static inline int ff_ccfifo_ccdetected(const CCFifo *ccf) > +{ > + return ccf->cc_detected; > +} > > #endif /* AVFILTER_CCFIFO_H */ Will apply this patchset tomorrow unless there are objections. - Andreas _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".