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 C9EBA4A8FE for ; Fri, 24 May 2024 06:59:35 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C2A4F68D521; Fri, 24 May 2024 09:59:32 +0300 (EEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2101.outbound.protection.outlook.com [40.92.74.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 110F068D306 for ; Fri, 24 May 2024 09:59:26 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ERPZ97N7BrWQTFrdz3M9Mc8RaFU1YTVu02+WqfN7I2WZftOENSKyZW9DWBbXIQIk9wjZgWJFlNyJ7+bh5RQCfwXXa6zc5gHwYsoo7lHxJJVjHDYodbIJuo4/+LG28sn4V34WFh1W75+IDm4AP2CO7dBEuZb3Upm/b1qTJyY9wEz9tTofozqilrQJ6zAJXCv/l7vb7FoQBLLM1oxuSfN5wzpC/UddCqPmsB8VaM6pCVShlVskRqPI51jEOfTsmIQmh+ENm+6jCW6J52WWDU0cp+aDBG/cvK/edNzjmxmX5Xi/dH48wwH4Sd5c8vPpw3i3am08DORD7ex/srxIUv4AyA== 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=R1aB8Zu3QO4Z7o2W9stxe4lNT2eCtGA/eLaIk5W7xEg=; b=hPrmvncdZeuxoV4+W7d1BQyLEvwcEuyj2+1izvjQcnO3JjySwawXzfvYomV2NjkmNBr/sECKZLmub/WoIx76gsXtF/3/gbqDLNOPXELuAIiDleVOJOWaYeCX55ijfi0xdQYaoFv4MR19BtWO1sNYKEDBoPKqy/9uC64ecSt1wMYq/g13YGv6ZUTLQMlRoCNtggtwN56M24FjD5YQVEj6zXynoEFb+iwO2NbABl6YekcWBbgF0CJWa+APoKlJYaoxYRdOUbW9/U0JRkqwCVGVa3Cv/i7MipndLxhLlC3cMEAoR/NqEeW6p9VBoUwqfrNEMwmU5ySMOT/Zix3I6ulvBQ== 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=R1aB8Zu3QO4Z7o2W9stxe4lNT2eCtGA/eLaIk5W7xEg=; b=HVJfjVpMkIZmZvtzoUCgH0jZ6F4pf39OUt0FEjX96UJSI74LudCYn+UYy5hXyhfFQFwqhbjhbH1ykpN6LtzQgTHSm4jqgC4CJzAQj26Bjp1QRLyUS08vJbJxlkxmgJYNYwgKK5q3V1N13oTFH4tLPat6q7SGhoPYTGJmVz6fFYcFT5AgDL0YXZUe3tDX3KIAvkp28V6F640fxTalDVs+yADziFTUJvSzGXsIhBEt3T12f0gnVdaoeL+ZIaO8pVQCl81eteD8Yg1YTWvNrR3gwPATtBUqAaqzbG234grtHmQ9VxEDB6nHjxHbixOfCnb1R17NX8EOJm0rWU3+5KI2LQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0043.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:3da::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.22; Fri, 24 May 2024 06:25:01 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%3]) with mapi id 15.20.7587.030; Fri, 24 May 2024 06:25:01 +0000 Message-ID: Date: Fri, 24 May 2024 08:24:58 +0200 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: X-TMN: [vuRU+76cZOIK1FgeHNwuBsauV3wVnqdNVVRvxZQ7RHQ=] X-ClientProxiedBy: ZR0P278CA0205.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:6a::12) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0043:EE_ X-MS-Office365-Filtering-Correlation-Id: 348516b9-c911-4477-749c-08dc7bba3dc3 X-Microsoft-Antispam: BCL:0;ARA:14566002|461199019|3412199016|440099019; X-Microsoft-Antispam-Message-Info: E+y/uiUjz0fwLy5Zs2NUBDx5BgmjN1yHkYTxgrKGHeVjHxG1Y+PP5WaB5p4iS9EvOTf+Brzn3SA8uFpdEHkdB75LaDdjaNsqfQeJs4QsH4AklCVKVWH5Otf0a3rGofPSgusW+jc/5jtv91QhTotwdtk4CzC1a/xjC1Bgm7PIjNAYXRc+lXvaYPTTF2OKzf1UbgRWIMSoZTkiyAxX4rjT4N5hV5v9/uaGIJH5D+/7ALab+7+1uJyS9pgcUYY11kyW0uxEsxrrUdavPaWR7EKgA3aFM3EYOKOhHchektz5/v04AoG2vjklJKPWi8l4uaTmTMjqQgW+D7B3h44d5oYL3S/9bGKXvB9iGcVbpm44f4xEEbP1h7d/DWOO/EbFtXIOxJ4B0qd/a3GNzkx/U0KRYyuHaGDlL755ih2l0aq0C1gkxVPreycjkOtC9Oig5uEhBqyQdmbWGdfMQQPyAN1t71jI07v/MKKDLJLkLRTwmFGTs1zg+jRrlZbM+OZ5azvyj9b+XlqqyYcIjLodRJqFuphJwTI2QwTGD+2rZunHWv4efxjR2l1QQUDXm/ETLNNX X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?M1pyVXZtNTlseUYyOXQ4RTNCc01ER0txSVJGb01kTEJRb3ZxTFJrdFRRVWNH?= =?utf-8?B?eUJmRThzZXVCNGk1RTBwTWlHT0twT3RsTE9OMDlJNGFMVEpIMUdhVVl5Z2Vn?= =?utf-8?B?b0MzMndoUG9CZDBBeElsbXIxdDJzNUFDOFV0V3dwUWYwUHBzSkREYWtPWHIv?= =?utf-8?B?ak15MEVmc2N6Y1I4UTZQRy8zM1pyRkpxMUp3bU5HZTBJR1cvK1h4cHp5U09D?= =?utf-8?B?V1hLbENMU3VCTDdZaGFwRmdXNHh5N1dUZyt0eDRQNnRXNzhPTzJmQzJEQjBv?= =?utf-8?B?TVk4V1JZK0d4cGZvR1hXWkh0VVFoQ3Eyc3VnU1pRQ01lS3RsY0V5UzZsM1li?= =?utf-8?B?T2VXVFBud3hqb1oxLy8vOUUzWEhhb29lT3NBVjYvK29nck44MVZCVmFSUFow?= =?utf-8?B?NzQ3eC80aTF6cSthbXI3T2RFRzk5YmcrcWo1b0J0b05nV25XZ3J5TXZWQzJN?= =?utf-8?B?ZDdRUEpycXAwV2dpZ0FIeXRTN2dKRGQ4QXltWlRSRGUxM0tJUW9oSHNLdzN0?= =?utf-8?B?YVFpY1ROUy8wYjVZYkNhems2eFpnbHV6cSsyb0xlNE5IWG1Uc3RnOTNqckEy?= =?utf-8?B?N29jNmx5Um96aFFPMmloSUFHK0ptKys0TGtjRnFRL1kyNmJXUGc3MzRBK3ZN?= =?utf-8?B?ajNhVitqVVdNbFZmZU5BbkJjYnRSSG9WdTRBL0VRbERVV0pkTk1QZEhJR3FJ?= =?utf-8?B?em9QLzdMc28wWlJvUlBzMXhna3FzMjNHTmt0U3pRUytPb1JjbVVpV0xMdU1E?= =?utf-8?B?VkR0KytDdVFnZFhPYmV6OWMwZVZBejBaTXh3cTZmMU9jMU43dWhEWkJhTnFN?= =?utf-8?B?UGYzUkI3Y2EwVUVqT255bTRMTzM4STZuU2IrY2hNb3hGUHFFaTRjL1RSMUQ2?= =?utf-8?B?Vlh3VzE3M2xiNW53S2EraWdIK2xqTmdoMTZKVHBrQm9wcHlaTlFtRmMwd2tx?= =?utf-8?B?TnFaODk0MTZqRkNXSG0zdGpCNXYzbDFzTkJZUzN6akRQVVlydVlWSnRaSEpV?= =?utf-8?B?dW9ZcXI2OVVyd2dBbm9tc01JVGduSHdMNGRDZ1hRd3doN3BjSUpKNEhPTWd5?= =?utf-8?B?akY1TjZEVXoxQnRyYVJhSlN4MUUzZm85bkxadkJIVWVvL3dIUTJsTDVUZDVU?= =?utf-8?B?TTJ5UnRnUCtpSWVlUitsUTIwaGovRnFLQ0ZvZ3ZJbDhhOUFIaC9MVFVzb0lL?= =?utf-8?B?VFE2cXduc243MUpyWThBbjY3MTVEVkFidzJzSDF6dXBabEJ5R1pyemxUNzh2?= =?utf-8?B?MFN6YnlDamswOW9KK0c3QWw5ejlRTTNxSDkydmUzbHo1VDdVc1lCbUl4cnpC?= =?utf-8?B?WnFId2pRRFA4NEVja3dhYm5jWjQ4a1NZVnB0d1JndllaS2NWV0dJTkhyVUN6?= =?utf-8?B?RE4wUlZzOG00T3JWZ1FRQ0Z5ME9ZU2E0ZVJaYmw3VXp5anpUT2ZGUUh5Lzdw?= =?utf-8?B?dzdHZzRMcEVUK3RvTWI5eEJtbmdSNHJ6c29sYi9URXBzVnRTRVN5clVMSm15?= =?utf-8?B?cTZjanprYllQVktuTlRuZ09YdHhMeUZCelM3RVV5M3JpSzRPUjB4ZkFvTVVJ?= =?utf-8?B?SWE2akhqbWlJQXBKV1VqUHdNaFQ5VWlpdlI3RUJ5aUNCcjlkWVZiQkF3TTFj?= =?utf-8?B?UTJkSHpSdVhyUnpDbUdtQ1VOSmE0aXkrUXc5ZGVYbXRpZlFZaXFMcHNlODhV?= =?utf-8?B?QnJ4YnRyU2xYdVA3ZVFLM3NzNEcvUjJiTVJuNTdKUnNBVGJJZ1p4YlVBPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 348516b9-c911-4477-749c-08dc7bba3dc3 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2024 06:25:01.2272 (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: AM8P250MB0043 Subject: Re: [FFmpeg-devel] [PATCH] avformat/async, cache: Use more unique context names 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: > Otherwise Doxygen thinks any text like "Context for foo" > is a link to the async protocol's struct called "Context". > > Reported-by: Andrew Sayers > Signed-off-by: Andreas Rheinhardt > --- > libavformat/async.c | 22 +++++++++++----------- > libavformat/cache.c | 18 +++++++++--------- > 2 files changed, 20 insertions(+), 20 deletions(-) > > diff --git a/libavformat/async.c b/libavformat/async.c > index e096b0bc6f..e0329e23ec 100644 > --- a/libavformat/async.c > +++ b/libavformat/async.c > @@ -53,7 +53,7 @@ typedef struct RingBuffer > int read_pos; > } RingBuffer; > > -typedef struct Context { > +typedef struct AsyncContext { > AVClass *class; > URLContext *inner; > > @@ -78,7 +78,7 @@ typedef struct Context { > > int abort_request; > AVIOInterruptCB interrupt_callback; > -} Context; > +} AsyncContext; > > static int ring_init(RingBuffer *ring, unsigned int capacity, int read_back_capacity) > { > @@ -132,7 +132,7 @@ static int ring_read(RingBuffer *ring, void *dest, int buf_size) > static int wrapped_url_read(void *src, void *dst, size_t *size) > { > URLContext *h = src; > - Context *c = h->priv_data; > + AsyncContext *c = h->priv_data; > int ret; > > ret = ffurl_read(c->inner, dst, *size); > @@ -170,7 +170,7 @@ static int ring_drain(RingBuffer *ring, int offset) > static int async_check_interrupt(void *arg) > { > URLContext *h = arg; > - Context *c = h->priv_data; > + AsyncContext *c = h->priv_data; > > if (c->abort_request) > return 1; > @@ -184,7 +184,7 @@ static int async_check_interrupt(void *arg) > static void *async_buffer_task(void *arg) > { > URLContext *h = arg; > - Context *c = h->priv_data; > + AsyncContext *c = h->priv_data; > RingBuffer *ring = &c->ring; > int ret = 0; > int64_t seek_ret; > @@ -249,7 +249,7 @@ static void *async_buffer_task(void *arg) > > static int async_open(URLContext *h, const char *arg, int flags, AVDictionary **options) > { > - Context *c = h->priv_data; > + AsyncContext *c = h->priv_data; > int ret; > AVIOInterruptCB interrupt_callback = {.callback = async_check_interrupt, .opaque = h}; > > @@ -316,7 +316,7 @@ fifo_fail: > > static int async_close(URLContext *h) > { > - Context *c = h->priv_data; > + AsyncContext *c = h->priv_data; > int ret; > > pthread_mutex_lock(&c->mutex); > @@ -339,7 +339,7 @@ static int async_close(URLContext *h) > > static int async_read_internal(URLContext *h, void *dest, int size) > { > - Context *c = h->priv_data; > + AsyncContext *c = h->priv_data; > RingBuffer *ring = &c->ring; > int read_complete = !dest; > int to_read = size; > @@ -391,7 +391,7 @@ static int async_read(URLContext *h, unsigned char *buf, int size) > > static int64_t async_seek(URLContext *h, int64_t pos, int whence) > { > - Context *c = h->priv_data; > + AsyncContext *c = h->priv_data; > RingBuffer *ring = &c->ring; > int64_t ret; > int64_t new_logical_pos; > @@ -472,7 +472,7 @@ static int64_t async_seek(URLContext *h, int64_t pos, int whence) > return ret; > } > > -#define OFFSET(x) offsetof(Context, x) > +#define OFFSET(x) offsetof(AsyncContext, x) > #define D AV_OPT_FLAG_DECODING_PARAM > > static const AVOption options[] = { > @@ -495,7 +495,7 @@ const URLProtocol ff_async_protocol = { > .url_read = async_read, > .url_seek = async_seek, > .url_close = async_close, > - .priv_data_size = sizeof(Context), > + .priv_data_size = sizeof(AsyncContext), > .priv_data_class = &async_context_class, > }; > > diff --git a/libavformat/cache.c b/libavformat/cache.c > index 5f78adba9d..5d71e56f3d 100644 > --- a/libavformat/cache.c > +++ b/libavformat/cache.c > @@ -52,7 +52,7 @@ typedef struct CacheEntry { > int size; > } CacheEntry; > > -typedef struct Context { > +typedef struct CacheContext { > AVClass *class; > int fd; > char *filename; > @@ -65,7 +65,7 @@ typedef struct Context { > URLContext *inner; > int64_t cache_hit, cache_miss; > int read_ahead_limit; > -} Context; > +} CacheContext; > > static int cmp(const void *key, const void *node) > { > @@ -74,9 +74,9 @@ static int cmp(const void *key, const void *node) > > static int cache_open(URLContext *h, const char *arg, int flags, AVDictionary **options) > { > + CacheContext *c = h->priv_data; > int ret; > char *buffername; > - Context *c= h->priv_data; > > av_strstart(arg, "cache:", &arg); > > @@ -99,7 +99,7 @@ static int cache_open(URLContext *h, const char *arg, int flags, AVDictionary ** > > static int add_entry(URLContext *h, const unsigned char *buf, int size) > { > - Context *c= h->priv_data; > + CacheContext *c = h->priv_data; > int64_t pos = -1; > int ret; > CacheEntry *entry = NULL, *next[2] = {NULL, NULL}; > @@ -162,7 +162,7 @@ fail: > > static int cache_read(URLContext *h, unsigned char *buf, int size) > { > - Context *c= h->priv_data; > + CacheContext *c = h->priv_data; > CacheEntry *entry, *next[2] = {NULL, NULL}; > int64_t r; > > @@ -227,7 +227,7 @@ static int cache_read(URLContext *h, unsigned char *buf, int size) > > static int64_t cache_seek(URLContext *h, int64_t pos, int whence) > { > - Context *c= h->priv_data; > + CacheContext *c = h->priv_data; > int64_t ret; > > if (whence == AVSEEK_SIZE) { > @@ -298,7 +298,7 @@ static int enu_free(void *opaque, void *elem) > > static int cache_close(URLContext *h) > { > - Context *c= h->priv_data; > + CacheContext *c = h->priv_data; > int ret; > > av_log(h, AV_LOG_INFO, "Statistics, cache hits:%"PRId64" cache misses:%"PRId64"\n", > @@ -318,7 +318,7 @@ static int cache_close(URLContext *h) > return 0; > } > > -#define OFFSET(x) offsetof(Context, x) > +#define OFFSET(x) offsetof(CacheContext, x) > #define D AV_OPT_FLAG_DECODING_PARAM > > static const AVOption options[] = { > @@ -339,6 +339,6 @@ const URLProtocol ff_cache_protocol = { > .url_read = cache_read, > .url_seek = cache_seek, > .url_close = cache_close, > - .priv_data_size = sizeof(Context), > + .priv_data_size = sizeof(CacheContext), > .priv_data_class = &cache_context_class, > }; Will apply 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".