From 6aa0b98fb27ab22bd62a365de44d9f16cc07d03e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Sun, 6 Nov 2011 14:10:16 +0200 Subject: avio: Add AVIOInterruptCB This is a better io interrupt callback function, which has an opaque parameter, which is given to the interrupt callback. This allows callers to precisely cancel IO for one single AVFormatContext, without interrupt other ones in the same process. Note, it's not needed in AVIOContext, at the moment. Signed-off-by: Anton Khirnov --- libavformat/url.h | 1 + 1 file changed, 1 insertion(+) (limited to 'libavformat/url.h') diff --git a/libavformat/url.h b/libavformat/url.h index d69d0bc5c5..c0f532278f 100644 --- a/libavformat/url.h +++ b/libavformat/url.h @@ -42,6 +42,7 @@ typedef struct URLContext { int max_packet_size; /**< if non zero, the stream is packetized with this max packet size */ int is_streamed; /**< true if streamed (no seek possible), default = false */ int is_connected; + AVIOInterruptCB interrupt_callback; } URLContext; typedef struct URLProtocol { -- cgit v1.2.3 From c4a090ddb564b87fd9d6d4f83e0f134a77c96007 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Sun, 6 Nov 2011 22:10:21 +0200 Subject: avio: Add an internal utility function for checking the new interrupt callback Signed-off-by: Anton Khirnov --- libavformat/url.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'libavformat/url.h') diff --git a/libavformat/url.h b/libavformat/url.h index c0f532278f..de10033710 100644 --- a/libavformat/url.h +++ b/libavformat/url.h @@ -170,6 +170,12 @@ int ffurl_get_file_handle(URLContext *h); */ int ffurl_register_protocol(URLProtocol *protocol, int size); +/** + * Check if the user has requested to interrup a blocking function + * associated with cb. + */ +int ff_check_interrupt(AVIOInterruptCB *cb); + /* udp.c */ int ff_udp_set_remote_url(URLContext *h, const char *uri); int ff_udp_get_local_port(URLContext *h); -- cgit v1.2.3 From 6f1b7b39449c4cd58e37d831d5d97bfd25eb26f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Sun, 6 Nov 2011 22:50:44 +0200 Subject: avio: Add an AVIOInterruptCB parameter to ffurl_open/ffurl_alloc Change all uses of these function to pass the relevant callback on. --- libavformat/url.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'libavformat/url.h') diff --git a/libavformat/url.h b/libavformat/url.h index de10033710..03ba15fdda 100644 --- a/libavformat/url.h +++ b/libavformat/url.h @@ -72,10 +72,13 @@ typedef struct URLProtocol { * function puts the pointer to the created URLContext * @param flags flags which control how the resource indicated by url * is to be opened + * @param int_cb interrupt callback to use for the URLContext, may be + * NULL * @return 0 in case of success, a negative value corresponding to an * AVERROR code in case of failure */ -int ffurl_alloc(URLContext **puc, const char *filename, int flags); +int ffurl_alloc(URLContext **puc, const char *filename, int flags, + const AVIOInterruptCB *int_cb); /** * Connect an URLContext that has been allocated by ffurl_alloc @@ -90,10 +93,13 @@ int ffurl_connect(URLContext *uc); * function puts the pointer to the created URLContext * @param flags flags which control how the resource indicated by url * is to be opened + * @param int_cb interrupt callback to use for the URLContext, may be + * NULL * @return 0 in case of success, a negative value corresponding to an * AVERROR code in case of failure */ -int ffurl_open(URLContext **puc, const char *filename, int flags); +int ffurl_open(URLContext **puc, const char *filename, int flags, + const AVIOInterruptCB *int_cb); /** * Read up to size bytes from the resource accessed by h, and store -- cgit v1.2.3 From 163a31136dcb0b5966fc779917e0408cb52d7295 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 5 Nov 2011 11:42:13 +0100 Subject: avio: add and use ffurl_protocol_next(). --- libavformat/url.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'libavformat/url.h') diff --git a/libavformat/url.h b/libavformat/url.h index 03ba15fdda..902539aa64 100644 --- a/libavformat/url.h +++ b/libavformat/url.h @@ -182,6 +182,13 @@ int ffurl_register_protocol(URLProtocol *protocol, int size); */ int ff_check_interrupt(AVIOInterruptCB *cb); +/** + * Iterate over all available protocols. + * + * @param prev result of the previous call to this functions or NULL. + */ +URLProtocol *ffurl_protocol_next(URLProtocol *prev); + /* udp.c */ int ff_udp_set_remote_url(URLContext *h, const char *uri); int ff_udp_get_local_port(URLContext *h); -- cgit v1.2.3 From ddffc2fdc351d60ca190b016cccff4acff27823f Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 5 Nov 2011 10:04:04 +0100 Subject: avio: add support for passing options to protocols. Not used anywhere yet, support for passing options from avio_open() will follow. --- libavformat/url.h | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'libavformat/url.h') diff --git a/libavformat/url.h b/libavformat/url.h index 902539aa64..1f04c8d530 100644 --- a/libavformat/url.h +++ b/libavformat/url.h @@ -28,6 +28,8 @@ #include "avio.h" #include "libavformat/version.h" +#include "libavutil/dict.h" + #if !FF_API_OLD_AVIO #define URL_PROTOCOL_FLAG_NESTED_SCHEME 1 /*< The protocol name can be the first part of a nested protocol scheme */ @@ -48,6 +50,12 @@ typedef struct URLContext { typedef struct URLProtocol { const char *name; int (*url_open)( URLContext *h, const char *url, int flags); + /** + * This callback is to be used by protocols which open further nested + * protocols. options are then to be passed to ffurl_open()/ffurl_connect() + * for those nested protocols. + */ + int (*url_open2)(URLContext *h, const char *url, int flags, AVDictionary **options); int (*url_read)( URLContext *h, unsigned char *buf, int size); int (*url_write)(URLContext *h, const unsigned char *buf, int size); int64_t (*url_seek)( URLContext *h, int64_t pos, int whence); @@ -82,8 +90,13 @@ int ffurl_alloc(URLContext **puc, const char *filename, int flags, /** * Connect an URLContext that has been allocated by ffurl_alloc + * + * @param options A dictionary filled with options for nested protocols, + * i.e. it will be passed to url_open2() for protocols implementing it. + * This parameter will be destroyed and replaced with a dict containing options + * that were not found. May be NULL. */ -int ffurl_connect(URLContext *uc); +int ffurl_connect(URLContext *uc, AVDictionary **options); /** * Create an URLContext for accessing to the resource indicated by @@ -95,11 +108,14 @@ int ffurl_connect(URLContext *uc); * is to be opened * @param int_cb interrupt callback to use for the URLContext, may be * NULL + * @param options A dictionary filled with protocol-private options. On return + * this parameter will be destroyed and replaced with a dict containing options + * that were not found. May be NULL. * @return 0 in case of success, a negative value corresponding to an * AVERROR code in case of failure */ int ffurl_open(URLContext **puc, const char *filename, int flags, - const AVIOInterruptCB *int_cb); + const AVIOInterruptCB *int_cb, AVDictionary **options); /** * Read up to size bytes from the resource accessed by h, and store -- cgit v1.2.3 From 1dee0aca7401fc6c01f23ceedaff6533efb0fb28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Sun, 6 Nov 2011 23:03:45 +0200 Subject: avio: add avio_open2, taking an interrupt callback and options The interrupt callback has to be passed in during opening (setting it after opening isn't enough), since a blocking open couldn't be interrupted otherwise. Options are passed down to procotols and also need to be available during open() in most cases. Signed-off-by: Anton Khirnov --- libavformat/url.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'libavformat/url.h') diff --git a/libavformat/url.h b/libavformat/url.h index 1f04c8d530..ea8c7abb8f 100644 --- a/libavformat/url.h +++ b/libavformat/url.h @@ -29,12 +29,15 @@ #include "libavformat/version.h" #include "libavutil/dict.h" +#include "libavutil/log.h" #if !FF_API_OLD_AVIO #define URL_PROTOCOL_FLAG_NESTED_SCHEME 1 /*< The protocol name can be the first part of a nested protocol scheme */ extern int (*url_interrupt_cb)(void); +extern const AVClass ffurl_context_class; + typedef struct URLContext { const AVClass *av_class; /**< information for av_log(). Set by url_open(). */ struct URLProtocol *prot; -- cgit v1.2.3