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 73B3849BD5 for ; Mon, 4 Mar 2024 16:10:47 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 037FE68D347; Mon, 4 Mar 2024 18:10:46 +0200 (EET) Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2102.outbound.protection.outlook.com [40.92.59.102]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C865368D28F for ; Mon, 4 Mar 2024 18:10:39 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JbKOHY1kUh8J74xV44yjy1QNoMSbf4VsFzFAUjiN5Lp/VQ8tzM5pxLOy9uxY4mCyG27RUm++a+S7Kh1Y0RlNY8HvepSUiaIguBuH2+r6unOcDn++waAyTzLrOb+/AhGdMlfVAftrdK8hExV3DpIjAaNVAobwAjm3HC/m4acNvwzfxdkhxZWFkOl2A6lu49DcyJXsfKOIssqDp4eAyx/qtUBfwR7updMscuv0JuzcPIsPaQ04kVzxatyzNPFmyBcE393960OvETJbI5w+3KMjm2UrudgAj2N73SWgsx22O3ZJ8UNfFqezizIONAbKyMk836C6ZUBVzncsEWbKnlU0+A== 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=qcf1fpSMPP+nPXC10KiWRB1e0brmMrB5LHX7/wbGeXQ=; b=PM5AiOOdTP0ETpcmqbQSyXhlsfmkqAfKg9ASjAPC5mjLP1gbecMdGMFxePda+fUm2sWkfeaJ6Z0ntKoSdbau2pjtUezKgM+yqwNtt5OYW+zqlV9FjRajMmzi+E0qBzmjv6z+X+ilUID+9uzJBW1uKpym9ZbXAjs9a/vR4wwfawmW7ltyoLMNXfufJiL5DFJ7FvO1+ISloWf0EdUFPFz5WTNwdvisFacnwjbOsscpNe35ojON8r7VIy/ua4yQ//SrJzXAZNjEyfa1n8if+8tGuUwYbZrQhNRhGGDUfkdP5G04+UUQg8tU61pCZ9Vntx+8cS9sYsWsmivByJwgfB8k0A== 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=qcf1fpSMPP+nPXC10KiWRB1e0brmMrB5LHX7/wbGeXQ=; b=Os9XVi5cHU+GGx85Er/m45gHyNayAR/23ip3Zy8hS40Emgq7KgABSrgOl16gM8mHLj1yzX1CnsK2nR7yBw3d9/3s58NtP33kVYippwLQ7CForY5i0WjjUbbp/B3WFvEfl8VpC1NljG38QBJo81/238RV3BbSjMP8mhdo4gGEydLgbwpZXSmv8IVXfdAZcxTIt0ypMIzTONdTIwyKRWrp2hfJjZBx9SbYM5klu97YIbpse/595ecbj/f/60RuDbVwbJSsep9TtqklZMQpNzRJYKGlR9m1cgnkC4fLY5O541HnnFgP/V52widgLh4s5lO5vGIr2IDvpVfZHUHD4qyHvw== Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) by PR3P250MB0152.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17e::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.34; Mon, 4 Mar 2024 16:10:36 +0000 Received: from DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::db07:87f6:7c75:38cc]) by DU0P250MB0747.EURP250.PROD.OUTLOOK.COM ([fe80::db07:87f6:7c75:38cc%3]) with mapi id 15.20.7292.036; Mon, 4 Mar 2024 16:10:36 +0000 Message-ID: Date: Mon, 4 Mar 2024 17:12:33 +0100 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: X-TMN: [XEDlKZIfBLRPS78hooboVwa7sLkIxmwlVHMBgJWqu7U=] X-ClientProxiedBy: ZR0P278CA0182.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::15) To DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) X-Microsoft-Original-Message-ID: <8c9f12b0-1ae3-4dd6-afed-7e115f5464f8@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0P250MB0747:EE_|PR3P250MB0152:EE_ X-MS-Office365-Filtering-Correlation-Id: c7d33619-2120-4358-8daf-08dc3c65a09b X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnobO8iTf6ZFRqDwZq/57cxG4prTfz7b/M/Q1T753C2X5FB72vziudwG0p6Q9Sf2gW8OOzNTQ5hQBccGg8DPlzWz/tJsMHcgwkrLz47cAc5o7NzSEMbJx98UHrYlKZ/CEf5nU4gxMKiZq/e9TFvFEma2FiMpUY+Wk/85JKNkXK+guX1F2vEkw3+bz2c2AtPQcl3Em40YNMDHWln9EA//iiZNXHDIJBjGhL3BcXg2ozOUysa1YEmC30GEZqKgmjbbiUxoHfGUs1GFMhfZZnDqQTYhqysYpK4n0H57lMrRfNqSY0TevuTg2lb6jec3fwXicCM8gunlwUWTxVevKENTtR5PUbRJ16iWxUAph0N9nbL/UiuD4s1ICwzDHNVwvJMkMA5btEFHStEgGm3e7/BAMrbQDmXVUYe23gnHDT9y2n60gbn+mb4dRjOlyrniIHl0aKat/pdrwzQ8MvVr8+pwV8Hn2UDusEe6UNums791uRndSwSZ+BED1yoSyGpkCE9La7ih0VKkEPjSiaIUDQi2ZB40Mupdl4Y6t+oRLwO2ccNZW6ca8MEiD7jZ8G2Wy2DRcaeXBXh3BmsASqJLQldq0YcbIAOs1FE1dXxuOLhPE3Q5XpjK5q9SqvcATk5BiE2LqdtRfPqvQWpXfQ3TuR5TN0d35f9Pv8pSpdzeyJ60UwUzB+tS6znBW7aGD39ltl01BZdG/PfyZ48mCx1YpQLAK19fhxq0yiJWAlLqry9QaBX322hQmpZ/E0Ua6zCIT2VeIQ4= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: txh31YWSP28mH75mk7nKylNwZvT1H0IMPl+ZvvYJMPf22iBUiDH+zMbNFJI9NsknZKtFbLbepaOlD1drES4BaUhacJu6dKBXwijmCwlvBR+OSR5f3MYOqHdXEvJ/o6XeXKg6udDBLoGhYlYtPnTC14zSDvafBteYdwzMVPgIsgiECaaPUZnBS62E14gsg5nghv6HVCWcECtARoKzqWlWBr3E7le8Ep1rSWWP/67VK2UHYxmUqbdUtXxlmrkxHr3PbZnVOhairICpGZUMhA/XI/1RlDLk79zGgfjl5xqbRLVxUnGHmDqrO7B0HE+qAZBMS4nM7tu6unV9Y+0vamoFxFHG5iMf772h+gBOSXUEYj4mJIfS20bbwHpbJEnx3ilVw0o4FErSbsTzDbn67kG4wWm1Vie66+s5ftoQathApIr3LXvITVMTG3eYXPQAhGuTbzJGF9Uxq8nmjHI9wHBbxIDcjmU1jbaa8OUvqzjY4PC5co3jUl92QN4PblBf+BavmestG+RZ2LS5AGdSL3dPCJTVmjk46cae3RC6BXAxP41G1HVZiyTtCYKYr14Mdd1g X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?eGd3T05qUE55QzZGcWFsYnpNZWs5MzIyRVU1QXRzbGlmUVZVVVU5bFBRdjBt?= =?utf-8?B?WHpUcis5Rjh2NjBGaGhiV01NOHJrZkx4REV2RDRkdnF2SFpyVHN6bHpvQ1NH?= =?utf-8?B?UkMwaU5Da2svQWM2bE5VK1QwT1cwYWRmdENlRXpuVHF0M3I5elRGZzZHclly?= =?utf-8?B?RDByaTdUMUFYQ2ZHWHB4WlQra3cwaFpNS3NnSGpDNGpqM0JMZ1Vydy9xM2hh?= =?utf-8?B?K2lmcVR5UnNzaVVUV3JmVlBhUmRoRmNIRWQxUFNTZkk3KzB0enlvWFYrcVN4?= =?utf-8?B?b2lZVit2a243cmtwY0JKeXF5QlZTNGREcFZ6MzcvWlZmZG1GSVlUM3R5ZlV3?= =?utf-8?B?RmY2TENFV3h2Mml2TFB6cDhUODZVeWdkclpzUm1aS213K253OXppd0kxb0Rx?= =?utf-8?B?M2djeGJVeEdkQ01VMTd4Q3htQlpMbmlQRG9aTDdJRTRLMGVmb2xicFZ2cUdX?= =?utf-8?B?akEwa0Jtb2t1RkRIUFB2NzdZNlpYM0dkVE5xL0V6QmFKZTdHSTZ4bVpXNmJI?= =?utf-8?B?WDJEandkQkZnUG1kMlBkYklQSHY0cExGYkZoWjlPcGE4aXN5R1VJOFR6cUsw?= =?utf-8?B?MVNudjE1SVI4b2VoUDdKUTlTeW1mY0lHaTJGcU52Y3NlY1M1QVI4R1l1TXli?= =?utf-8?B?VEhnaDdYYzJPSnBWcXZORWlGeVN2ekFTaGJ1QTVzVGQ2OXhFMERSSXF0Tmg3?= =?utf-8?B?ZllYM21VbThiVGJwd3lIVDk3bzV5aEFNMjVnTGp3NnU0UkZvb3VuUUthN3lB?= =?utf-8?B?NlBoSTNIbHg4UlRRNzc2QXdnbkRqcGZ0WnVNSEVDcThYVUxkS24yMUgvMlBX?= =?utf-8?B?TUdWU3YrSitqZ2xlMFRoU2VMM0RGbHNMRkNXWkF1VXZ3enUraUFQeUhweFpO?= =?utf-8?B?SklXcm1PMWkrenhxQUZIWFdPcXc0M0VoR2xKS1ZQMVNBL2hNQThrb0daVzJD?= =?utf-8?B?UHhFOCsyazlXaTRScGVSeHFWVWpFeTRmSXQxNndvRkJoM1U3ZzJyL3ZnMzhD?= =?utf-8?B?ajN4WEpZTWdvdWFSc3dWbVJYaWpSSFNvT1FuV3AzbWZUV0xXcW1WYVBiTytN?= =?utf-8?B?SjJUbk1MK2VTeFYraEF1SUpBZVZqOU1Qak9MSmVsZFdIRXhjK2lMQzhnakRl?= =?utf-8?B?UUR6SEEvUFBubnZ5Y0dDbGFtTXgySm5YeG1GWjVpT2p1R2UydUVaNmxrM25F?= =?utf-8?B?elBLR3MxNFc0UkJUTTB1S01OTWwyeDNTcE44dk03NXZPL0ZJS0dzN21xRnNW?= =?utf-8?B?eUpLL0IyN0d5R2Nza2tacnJnOGR0bllibk9MVlpPWmlKaEszZHNzaWJyR1R2?= =?utf-8?B?UFBrZHZNTFNxZHQ2Ym45R09ZNXdoRXpXOFJIbG44WkU1cEVKdEY4Y2F0YzZ6?= =?utf-8?B?QndiM0U3K1dpZTRjcXplYXVHWTQ0YldITFFmbk40ZlRKZDk2VW1QZ0NyRDRy?= =?utf-8?B?OFpORHpnMUFKaUd6bEFXWEI5NjRnWjgzZndTbHpDaE81Y3VIMWZJTWFtV1hk?= =?utf-8?B?V01WUXRLNjlDRzhHUDRvVkxsNGRrVEMwNERISlFHY3N3WDVuRjEwTHlhUWhK?= =?utf-8?B?Ry84UEVuK3FPWkViSkVWaGFWUjErMDZGZlNTQXhUcjh3NjZQT0lqOWVjSTlI?= =?utf-8?B?R2FOV3BhTlk0T2tqUXltWWRSejg3c29TZWtIQzk1V3RRT1BzY2dtOEJVblIv?= =?utf-8?B?dEZtYUlQRkF2VWt2eURiYlY3VDRSRzcwWUpZYUx0UVcvalV2cjRhUjFnPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c7d33619-2120-4358-8daf-08dc3c65a09b X-MS-Exchange-CrossTenant-AuthSource: DU0P250MB0747.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2024 16:10:36.6800 (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: PR3P250MB0152 Subject: Re: [FFmpeg-devel] [PATCH 1/4] avformat/aviobuf: Move code specific to URLContexts to avio.c 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: > This separates the URL-layer adjacent parts of the code > from the parts that are also usable with custom IO. > > Signed-off-by: Andreas Rheinhardt > --- > libavformat/avio.c | 191 +++++++++++++++++++++++++++++++++++++++++- > libavformat/aviobuf.c | 186 ---------------------------------------- > libavformat/url.h | 2 - > 3 files changed, 189 insertions(+), 190 deletions(-) > > diff --git a/libavformat/avio.c b/libavformat/avio.c > index b793a7546c..794ebd4bd8 100644 > --- a/libavformat/avio.c > +++ b/libavformat/avio.c > @@ -24,6 +24,7 @@ > #include "libavutil/opt.h" > #include "libavutil/time.h" > #include "libavutil/avassert.h" > +#include "avio_internal.h" > #include "os_support.h" > #include "internal.h" > #if CONFIG_NETWORK > @@ -31,6 +32,8 @@ > #endif > #include "url.h" > > +#define IO_BUFFER_SIZE 32768 > + > /** @name Logging context. */ > /*@{*/ > static const char *urlcontext_to_name(void *ptr) > @@ -60,7 +63,7 @@ static const AVOption options[] = { > { NULL } > }; > > -const AVClass ffurl_context_class = { > +static const AVClass url_context_class = { > .class_name = "URLContext", > .item_name = urlcontext_to_name, > .option = options, > @@ -70,6 +73,47 @@ const AVClass ffurl_context_class = { > }; > /*@}*/ > > +static void *avio_child_next(void *obj, void *prev) > +{ > + AVIOContext *s = obj; > + return prev ? NULL : s->opaque; > +} > + > +static const AVClass *child_class_iterate(void **iter) > +{ > + const AVClass *c = *iter ? NULL : &url_context_class; > + *iter = (void*)(uintptr_t)c; > + return c; > +} > + > +#define AVIOOFFSET(x) offsetof(AVIOContext,x) > +#define E AV_OPT_FLAG_ENCODING_PARAM > +#define D AV_OPT_FLAG_DECODING_PARAM > +static const AVOption avio_options[] = { > + {"protocol_whitelist", "List of protocols that are allowed to be used", AVIOOFFSET(protocol_whitelist), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, D }, > + { NULL }, > +}; > + > +const AVClass ff_avio_class = { > + .class_name = "AVIOContext", > + .item_name = av_default_item_name, > + .version = LIBAVUTIL_VERSION_INT, > + .option = avio_options, > + .child_next = avio_child_next, > + .child_class_iterate = child_class_iterate, > +}; > + > +URLContext *ffio_geturlcontext(AVIOContext *s) > +{ > + if (!s) > + return NULL; > + > + if (s->opaque && s->read_packet == ffurl_read2) > + return s->opaque; > + else > + return NULL; > +} > + > static int url_alloc_for_protocol(URLContext **puc, const URLProtocol *up, > const char *filename, int flags, > const AVIOInterruptCB *int_cb) > @@ -96,7 +140,7 @@ static int url_alloc_for_protocol(URLContext **puc, const URLProtocol *up, > err = AVERROR(ENOMEM); > goto fail; > } > - uc->av_class = &ffurl_context_class; > + uc->av_class = &url_context_class; > uc->filename = (char *)&uc[1]; > strcpy(uc->filename, filename); > uc->prot = up; > @@ -225,6 +269,17 @@ int ffurl_accept(URLContext *s, URLContext **c) > return AVERROR(EBADF); > } > > +int avio_accept(AVIOContext *s, AVIOContext **c) > +{ > + int ret; > + URLContext *sc = s->opaque; > + URLContext *cc = NULL; > + ret = ffurl_accept(sc, &cc); > + if (ret < 0) > + return ret; > + return ffio_fdopen(c, cc); > +} > + > int ffurl_handshake(URLContext *c) > { > int ret; > @@ -237,6 +292,12 @@ int ffurl_handshake(URLContext *c) > return 0; > } > > +int avio_handshake(AVIOContext *c) > +{ > + URLContext *cc = c->opaque; > + return ffurl_handshake(cc); > +} > + > #define URL_SCHEME_CHARS \ > "abcdefghijklmnopqrstuvwxyz" \ > "ABCDEFGHIJKLMNOPQRSTUVWXYZ" \ > @@ -347,6 +408,92 @@ fail: > return ret; > } > > +int ffio_fdopen(AVIOContext **s, URLContext *h) > +{ > + uint8_t *buffer = NULL; > + int buffer_size, max_packet_size; > + > + max_packet_size = h->max_packet_size; > + if (max_packet_size) { > + buffer_size = max_packet_size; /* no need to bufferize more than one packet */ > + } else { > + buffer_size = IO_BUFFER_SIZE; > + } > + if (!(h->flags & AVIO_FLAG_WRITE) && h->is_streamed) { > + if (buffer_size > INT_MAX/2) > + return AVERROR(EINVAL); > + buffer_size *= 2; > + } > + buffer = av_malloc(buffer_size); > + if (!buffer) > + return AVERROR(ENOMEM); > + > + *s = avio_alloc_context(buffer, buffer_size, h->flags & AVIO_FLAG_WRITE, h, > + ffurl_read2, ffurl_write2, ffurl_seek2); > + if (!*s) { > + av_freep(&buffer); > + return AVERROR(ENOMEM); > + } > + (*s)->protocol_whitelist = av_strdup(h->protocol_whitelist); > + if (!(*s)->protocol_whitelist && h->protocol_whitelist) { > + avio_closep(s); > + return AVERROR(ENOMEM); > + } > + (*s)->protocol_blacklist = av_strdup(h->protocol_blacklist); > + if (!(*s)->protocol_blacklist && h->protocol_blacklist) { > + avio_closep(s); > + return AVERROR(ENOMEM); > + } > + (*s)->direct = h->flags & AVIO_FLAG_DIRECT; > + > + (*s)->seekable = h->is_streamed ? 0 : AVIO_SEEKABLE_NORMAL; > + (*s)->max_packet_size = max_packet_size; > + (*s)->min_packet_size = h->min_packet_size; > + if(h->prot) { > + (*s)->read_pause = (int (*)(void *, int))h->prot->url_read_pause; > + (*s)->read_seek = > + (int64_t (*)(void *, int, int64_t, int))h->prot->url_read_seek; > + > + if (h->prot->url_read_seek) > + (*s)->seekable |= AVIO_SEEKABLE_TIME; > + } > + ((FFIOContext*)(*s))->short_seek_get = ffurl_get_short_seek; > + (*s)->av_class = &ff_avio_class; > + return 0; > +} > + > +int ffio_open_whitelist(AVIOContext **s, const char *filename, int flags, > + const AVIOInterruptCB *int_cb, AVDictionary **options, > + const char *whitelist, const char *blacklist) > +{ > + URLContext *h; > + int err; > + > + *s = NULL; > + > + err = ffurl_open_whitelist(&h, filename, flags, int_cb, options, whitelist, blacklist, NULL); > + if (err < 0) > + return err; > + err = ffio_fdopen(s, h); > + if (err < 0) { > + ffurl_close(h); > + return err; > + } > + return 0; > +} > + > +int avio_open2(AVIOContext **s, const char *filename, int flags, > + const AVIOInterruptCB *int_cb, AVDictionary **options) > +{ > + return ffio_open_whitelist(s, filename, flags, int_cb, options, NULL, NULL); > +} > + > +int avio_open(AVIOContext **s, const char *filename, int flags) > +{ > + return avio_open2(s, filename, flags, NULL, NULL); > +} > + > + > static inline int retry_transfer_wrapper(URLContext *h, uint8_t *buf, > const uint8_t *cbuf, > int size, int size_min, > @@ -464,6 +611,46 @@ int ffurl_close(URLContext *h) > return ffurl_closep(&h); > } > > +int avio_close(AVIOContext *s) > +{ > + FFIOContext *const ctx = ffiocontext(s); > + URLContext *h; > + int ret, error; > + > + if (!s) > + return 0; > + > + avio_flush(s); > + h = s->opaque; > + s->opaque = NULL; > + > + av_freep(&s->buffer); > + if (s->write_flag) > + av_log(s, AV_LOG_VERBOSE, > + "Statistics: %"PRId64" bytes written, %d seeks, %d writeouts\n", > + ctx->bytes_written, ctx->seek_count, ctx->writeout_count); > + else > + av_log(s, AV_LOG_VERBOSE, "Statistics: %"PRId64" bytes read, %d seeks\n", > + ctx->bytes_read, ctx->seek_count); > + av_opt_free(s); > + > + error = s->error; > + avio_context_free(&s); > + > + ret = ffurl_close(h); > + if (ret < 0) > + return ret; > + > + return error; > +} > + > +int avio_closep(AVIOContext **s) > +{ > + int ret = avio_close(*s); > + *s = NULL; > + return ret; > +} > + > > const char *avio_find_protocol_name(const char *url) > { > diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c > index d80b8527bb..8dfed22622 100644 > --- a/libavformat/aviobuf.c > +++ b/libavformat/aviobuf.c > @@ -22,7 +22,6 @@ > #include "libavutil/bprint.h" > #include "libavutil/crc.h" > #include "libavutil/dict.h" > -#include "libavutil/internal.h" > #include "libavutil/intreadwrite.h" > #include "libavutil/log.h" > #include "libavutil/opt.h" > @@ -31,7 +30,6 @@ > #include "avio.h" > #include "avio_internal.h" > #include "internal.h" > -#include "url.h" > #include > > #define IO_BUFFER_SIZE 32768 > @@ -43,36 +41,6 @@ > */ > #define SHORT_SEEK_THRESHOLD 32768 > > -static void *ff_avio_child_next(void *obj, void *prev) > -{ > - AVIOContext *s = obj; > - return prev ? NULL : s->opaque; > -} > - > -static const AVClass *child_class_iterate(void **iter) > -{ > - const AVClass *c = *iter ? NULL : &ffurl_context_class; > - *iter = (void*)(uintptr_t)c; > - return c; > -} > - > -#define OFFSET(x) offsetof(AVIOContext,x) > -#define E AV_OPT_FLAG_ENCODING_PARAM > -#define D AV_OPT_FLAG_DECODING_PARAM > -static const AVOption ff_avio_options[] = { > - {"protocol_whitelist", "List of protocols that are allowed to be used", OFFSET(protocol_whitelist), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, D }, > - { NULL }, > -}; > - > -const AVClass ff_avio_class = { > - .class_name = "AVIOContext", > - .item_name = av_default_item_name, > - .version = LIBAVUTIL_VERSION_INT, > - .option = ff_avio_options, > - .child_next = ff_avio_child_next, > - .child_class_iterate = child_class_iterate, > -}; > - > static void fill_buffer(AVIOContext *s); > static int url_resetbuf(AVIOContext *s, int flags); > /** @warning must be called before any I/O */ > @@ -1035,71 +1003,6 @@ void ffio_write_lines(AVIOContext *s, const unsigned char *buf, int size, > } > } > > -int ffio_fdopen(AVIOContext **s, URLContext *h) > -{ > - uint8_t *buffer = NULL; > - int buffer_size, max_packet_size; > - > - max_packet_size = h->max_packet_size; > - if (max_packet_size) { > - buffer_size = max_packet_size; /* no need to bufferize more than one packet */ > - } else { > - buffer_size = IO_BUFFER_SIZE; > - } > - if (!(h->flags & AVIO_FLAG_WRITE) && h->is_streamed) { > - if (buffer_size > INT_MAX/2) > - return AVERROR(EINVAL); > - buffer_size *= 2; > - } > - buffer = av_malloc(buffer_size); > - if (!buffer) > - return AVERROR(ENOMEM); > - > - *s = avio_alloc_context(buffer, buffer_size, h->flags & AVIO_FLAG_WRITE, h, > - ffurl_read2, ffurl_write2, ffurl_seek2); > - if (!*s) { > - av_freep(&buffer); > - return AVERROR(ENOMEM); > - } > - (*s)->protocol_whitelist = av_strdup(h->protocol_whitelist); > - if (!(*s)->protocol_whitelist && h->protocol_whitelist) { > - avio_closep(s); > - return AVERROR(ENOMEM); > - } > - (*s)->protocol_blacklist = av_strdup(h->protocol_blacklist); > - if (!(*s)->protocol_blacklist && h->protocol_blacklist) { > - avio_closep(s); > - return AVERROR(ENOMEM); > - } > - (*s)->direct = h->flags & AVIO_FLAG_DIRECT; > - > - (*s)->seekable = h->is_streamed ? 0 : AVIO_SEEKABLE_NORMAL; > - (*s)->max_packet_size = max_packet_size; > - (*s)->min_packet_size = h->min_packet_size; > - if(h->prot) { > - (*s)->read_pause = (int (*)(void *, int))h->prot->url_read_pause; > - (*s)->read_seek = > - (int64_t (*)(void *, int, int64_t, int))h->prot->url_read_seek; > - > - if (h->prot->url_read_seek) > - (*s)->seekable |= AVIO_SEEKABLE_TIME; > - } > - ((FFIOContext*)(*s))->short_seek_get = ffurl_get_short_seek; > - (*s)->av_class = &ff_avio_class; > - return 0; > -} > - > -URLContext* ffio_geturlcontext(AVIOContext *s) > -{ > - if (!s) > - return NULL; > - > - if (s->opaque && s->read_packet == ffurl_read2) > - return s->opaque; > - else > - return NULL; > -} > - > int ffio_copy_url_options(AVIOContext* pb, AVDictionary** avio_opts) > { > const char *opts[] = { > @@ -1300,78 +1203,6 @@ int ffio_rewind_with_probe_data(AVIOContext *s, unsigned char **bufp, int buf_si > return 0; > } > > -int avio_open(AVIOContext **s, const char *filename, int flags) > -{ > - return avio_open2(s, filename, flags, NULL, NULL); > -} > - > -int ffio_open_whitelist(AVIOContext **s, const char *filename, int flags, > - const AVIOInterruptCB *int_cb, AVDictionary **options, > - const char *whitelist, const char *blacklist > - ) > -{ > - URLContext *h; > - int err; > - > - *s = NULL; > - > - err = ffurl_open_whitelist(&h, filename, flags, int_cb, options, whitelist, blacklist, NULL); > - if (err < 0) > - return err; > - err = ffio_fdopen(s, h); > - if (err < 0) { > - ffurl_close(h); > - return err; > - } > - return 0; > -} > - > -int avio_open2(AVIOContext **s, const char *filename, int flags, > - const AVIOInterruptCB *int_cb, AVDictionary **options) > -{ > - return ffio_open_whitelist(s, filename, flags, int_cb, options, NULL, NULL); > -} > - > -int avio_close(AVIOContext *s) > -{ > - FFIOContext *const ctx = ffiocontext(s); > - URLContext *h; > - int ret, error; > - > - if (!s) > - return 0; > - > - avio_flush(s); > - h = s->opaque; > - s->opaque = NULL; > - > - av_freep(&s->buffer); > - if (s->write_flag) > - av_log(s, AV_LOG_VERBOSE, > - "Statistics: %"PRId64" bytes written, %d seeks, %d writeouts\n", > - ctx->bytes_written, ctx->seek_count, ctx->writeout_count); > - else > - av_log(s, AV_LOG_VERBOSE, "Statistics: %"PRId64" bytes read, %d seeks\n", > - ctx->bytes_read, ctx->seek_count); > - av_opt_free(s); > - > - error = s->error; > - avio_context_free(&s); > - > - ret = ffurl_close(h); > - if (ret < 0) > - return ret; > - > - return error; > -} > - > -int avio_closep(AVIOContext **s) > -{ > - int ret = avio_close(*s); > - *s = NULL; > - return ret; > -} > - > int avio_vprintf(AVIOContext *s, const char *fmt, va_list ap) > { > AVBPrint bp; > @@ -1450,23 +1281,6 @@ int avio_read_to_bprint(AVIOContext *h, AVBPrint *pb, size_t max_size) > return 0; > } > > -int avio_accept(AVIOContext *s, AVIOContext **c) > -{ > - int ret; > - URLContext *sc = s->opaque; > - URLContext *cc = NULL; > - ret = ffurl_accept(sc, &cc); > - if (ret < 0) > - return ret; > - return ffio_fdopen(c, cc); > -} > - > -int avio_handshake(AVIOContext *c) > -{ > - URLContext *cc = c->opaque; > - return ffurl_handshake(cc); > -} > - > /* output in a dynamic buffer */ > > typedef struct DynBuffer { > diff --git a/libavformat/url.h b/libavformat/url.h > index 59d9f1b870..4f3bfb6d57 100644 > --- a/libavformat/url.h > +++ b/libavformat/url.h > @@ -32,8 +32,6 @@ > #define URL_PROTOCOL_FLAG_NESTED_SCHEME 1 /*< The protocol name can be the first part of a nested protocol scheme */ > #define URL_PROTOCOL_FLAG_NETWORK 2 /*< The protocol uses network */ > > -extern const AVClass ffurl_context_class; > - > typedef struct URLContext { > const AVClass *av_class; /**< information for av_log(). Set by url_open(). */ > const struct URLProtocol *prot; 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".