* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <unistd.h>
-
#include "libavutil/avstring.h"
+#include "libavutil/dict.h"
#include "libavutil/opt.h"
+#include "libavutil/time.h"
#include "os_support.h"
#include "avformat.h"
#if CONFIG_NETWORK
#endif
#include "url.h"
+static URLProtocol *first_protocol = NULL;
+
+URLProtocol *ffurl_protocol_next(URLProtocol *prev)
+{
+ return prev ? prev->next : first_protocol;
+}
+
/** @name Logging context. */
/*@{*/
static const char *urlcontext_to_name(void *ptr)
if(h->prot) return h->prot->name;
else return "NULL";
}
+
+static void *urlcontext_child_next(void *obj, void *prev)
+{
+ URLContext *h = obj;
+ if (!prev && h->priv_data && h->prot->priv_data_class)
+ return h->priv_data;
+ return NULL;
+}
+
+static const AVClass *urlcontext_child_class_next(const AVClass *prev)
+{
+ URLProtocol *p = NULL;
+
+ /* find the protocol that corresponds to prev */
+ while (prev && (p = ffurl_protocol_next(p)))
+ if (p->priv_data_class == prev)
+ break;
+
+ /* find next protocol with priv options */
+ while (p = ffurl_protocol_next(p))
+ if (p->priv_data_class)
+ return p->priv_data_class;
+ return NULL;
+
+}
+
static const AVOption options[] = {{NULL}};
-static const AVClass urlcontext_class = {
+const AVClass ffurl_context_class = {
.class_name = "URLContext",
.item_name = urlcontext_to_name,
.option = options,
.version = LIBAVUTIL_VERSION_INT,
+ .child_next = urlcontext_child_next,
+ .child_class_next = urlcontext_child_class_next,
};
/*@}*/
-static int default_interrupt_cb(void);
-
-URLProtocol *first_protocol = NULL;
-int (*url_interrupt_cb)(void) = default_interrupt_cb;
-
-#if FF_API_OLD_AVIO
-URLProtocol *av_protocol_next(URLProtocol *p)
-{
- if(p) return p->next;
- else return first_protocol;
-}
-#endif
const char *avio_enum_protocols(void **opaque, int output)
{
- URLProtocol **p = opaque;
- *p = *p ? (*p)->next : first_protocol;
- if (!*p) return NULL;
- if ((output && (*p)->url_write) || (!output && (*p)->url_read))
- return (*p)->name;
+ URLProtocol *p;
+ *opaque = ffurl_protocol_next(*opaque);
+ if (!(p = *opaque)) return NULL;
+ if ((output && p->url_write) || (!output && p->url_read))
+ return p->name;
return avio_enum_protocols(opaque, output);
}
int err;
#if CONFIG_NETWORK
- if (!ff_network_init())
+ if (up->flags & URL_PROTOCOL_FLAG_NETWORK && !ff_network_init())
return AVERROR(EIO);
#endif
uc = av_mallocz(sizeof(URLContext) + strlen(filename) + 1);
err = AVERROR(ENOMEM);
goto fail;
}
- uc->av_class = &urlcontext_class;
+ uc->av_class = &ffurl_context_class;
uc->filename = (char *) &uc[1];
strcpy(uc->filename, filename);
uc->prot = up;
fail:
*puc = NULL;
#if CONFIG_NETWORK
- ff_network_close();
+ if (up->flags & URL_PROTOCOL_FLAG_NETWORK)
+ ff_network_close();
#endif
return err;
}
-int ffurl_connect(URLContext* uc)
+int ffurl_connect(URLContext* uc, AVDictionary **options)
{
- int err = uc->prot->url_open(uc, uc->filename, uc->flags);
+ int err =
+ uc->prot->url_open2 ? uc->prot->url_open2(uc, uc->filename, uc->flags, options) :
+ uc->prot->url_open(uc, uc->filename, uc->flags);
if (err)
return err;
uc->is_connected = 1;
return 0;
}
-#if FF_API_OLD_AVIO
-int url_open_protocol (URLContext **puc, struct URLProtocol *up,
- const char *filename, int flags)
-{
- int ret;
-
- ret = url_alloc_for_protocol(puc, up, filename, flags, NULL);
- if (ret)
- goto fail;
- ret = ffurl_connect(*puc);
- if (!ret)
- return 0;
- fail:
- ffurl_close(*puc);
- *puc = NULL;
- return ret;
-}
-int url_alloc(URLContext **puc, const char *filename, int flags)
-{
- return ffurl_alloc(puc, filename, flags, NULL);
-}
-int url_connect(URLContext* uc)
-{
- return ffurl_connect(uc);
-}
-int url_open(URLContext **puc, const char *filename, int flags)
-{
- return ffurl_open(puc, filename, flags, NULL);
-}
-int url_read(URLContext *h, unsigned char *buf, int size)
-{
- return ffurl_read(h, buf, size);
-}
-int url_read_complete(URLContext *h, unsigned char *buf, int size)
-{
- return ffurl_read_complete(h, buf, size);
-}
-int url_write(URLContext *h, const unsigned char *buf, int size)
-{
- return ffurl_write(h, buf, size);
-}
-int64_t url_seek(URLContext *h, int64_t pos, int whence)
-{
- return ffurl_seek(h, pos, whence);
-}
-int url_close(URLContext *h)
-{
- return ffurl_close(h);
-}
-int64_t url_filesize(URLContext *h)
-{
- return ffurl_size(h);
-}
-int url_get_file_handle(URLContext *h)
-{
- return ffurl_get_file_handle(h);
-}
-int url_get_max_packet_size(URLContext *h)
-{
- return h->max_packet_size;
-}
-void url_get_filename(URLContext *h, char *buf, int buf_size)
-{
- av_strlcpy(buf, h->filename, buf_size);
-}
-void url_set_interrupt_cb(URLInterruptCB *interrupt_cb)
-{
- avio_set_interrupt_cb(interrupt_cb);
-}
-int av_register_protocol2(URLProtocol *protocol, int size)
-{
- return ffurl_register_protocol(protocol, size);
-}
-#endif
-
#define URL_SCHEME_CHARS \
"abcdefghijklmnopqrstuvwxyz" \
"ABCDEFGHIJKLMNOPQRSTUVWXYZ" \
int ffurl_alloc(URLContext **puc, const char *filename, int flags,
const AVIOInterruptCB *int_cb)
{
- URLProtocol *up;
+ URLProtocol *up = NULL;
char proto_str[128], proto_nested[128], *ptr;
size_t proto_len = strspn(filename, URL_SCHEME_CHARS);
if ((ptr = strchr(proto_nested, '+')))
*ptr = '\0';
- up = first_protocol;
- while (up != NULL) {
+ while (up = ffurl_protocol_next(up)) {
if (!strcmp(proto_str, up->name))
return url_alloc_for_protocol (puc, up, filename, flags, int_cb);
if (up->flags & URL_PROTOCOL_FLAG_NESTED_SCHEME &&
!strcmp(proto_nested, up->name))
return url_alloc_for_protocol (puc, up, filename, flags, int_cb);
- up = up->next;
}
*puc = NULL;
return AVERROR(ENOENT);
}
int ffurl_open(URLContext **puc, const char *filename, int flags,
- const AVIOInterruptCB *int_cb)
+ const AVIOInterruptCB *int_cb, AVDictionary **options)
{
int ret = ffurl_alloc(puc, filename, flags, int_cb);
if (ret)
return ret;
- ret = ffurl_connect(*puc);
+ if (options && (*puc)->prot->priv_data_class &&
+ (ret = av_opt_set_dict((*puc)->priv_data, options)) < 0)
+ goto fail;
+ ret = ffurl_connect(*puc, options);
if (!ret)
return 0;
+fail:
ffurl_close(*puc);
*puc = NULL;
return ret;
if (fast_retries)
fast_retries--;
else
- usleep(1000);
+ av_usleep(1000);
} else if (ret < 1)
return ret < 0 ? ret : len;
if (ret)
if (h->is_connected && h->prot->url_close)
ret = h->prot->url_close(h);
#if CONFIG_NETWORK
- ff_network_close();
+ if (h->prot->flags & URL_PROTOCOL_FLAG_NETWORK)
+ ff_network_close();
#endif
if (h->prot->priv_data_size) {
if (h->prot->priv_data_class)
return ret;
}
-#if FF_API_OLD_AVIO
-int url_exist(const char *filename)
-{
- URLContext *h;
- if (ffurl_open(&h, filename, AVIO_FLAG_READ, NULL) < 0)
- return 0;
- ffurl_close(h);
- return 1;
-}
-#endif
-
int avio_check(const char *url, int flags)
{
URLContext *h;
if (h->prot->url_check) {
ret = h->prot->url_check(h, flags);
} else {
- ret = ffurl_connect(h);
+ ret = ffurl_connect(h, NULL);
if (ret >= 0)
ret = flags;
}
return h->prot->url_get_file_handle(h);
}
-static int default_interrupt_cb(void)
+int ffurl_get_multi_file_handle(URLContext *h, int **handles, int *numhandles)
{
- return 0;
+ if (!h->prot->url_get_multi_file_handle) {
+ if (!h->prot->url_get_file_handle)
+ return AVERROR(ENOSYS);
+ *handles = av_malloc(sizeof(*handles));
+ if (!*handles)
+ return AVERROR(ENOMEM);
+ *numhandles = 1;
+ *handles[0] = h->prot->url_get_file_handle(h);
+ return 0;
+ }
+ return h->prot->url_get_multi_file_handle(h, handles, numhandles);
}
-void avio_set_interrupt_cb(int (*interrupt_cb)(void))
+int ffurl_shutdown(URLContext *h, int flags)
{
- if (!interrupt_cb)
- interrupt_cb = default_interrupt_cb;
- url_interrupt_cb = interrupt_cb;
+ if (!h->prot->url_shutdown)
+ return AVERROR(EINVAL);
+ return h->prot->url_shutdown(h, flags);
}
int ff_check_interrupt(AVIOInterruptCB *cb)
int ret;
if (cb && cb->callback && (ret = cb->callback(cb->opaque)))
return ret;
- return url_interrupt_cb();
-}
-
-#if FF_API_OLD_AVIO
-int av_url_read_pause(URLContext *h, int pause)
-{
- if (!h->prot->url_read_pause)
- return AVERROR(ENOSYS);
- return h->prot->url_read_pause(h, pause);
-}
-
-int64_t av_url_read_seek(URLContext *h,
- int stream_index, int64_t timestamp, int flags)
-{
- if (!h->prot->url_read_seek)
- return AVERROR(ENOSYS);
- return h->prot->url_read_seek(h, stream_index, timestamp, flags);
+ return 0;
}
-#endif
projects / ffmpeg / blobdiff