RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

URLProtocol: Add URL_PROTOCOL_FLAG_NESTED_SCHEME 

If this flag is set, the protocol can handle URLs where the
scheme is a nested scheme such as applehttp+file: - the protocol
can handle any URL where the first segment of the nested scheme
belongs to this protocol.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 8f73c06077)
This commit is contained in:
Martin Storsjö 2011-02-28 15:39:36 +02:00 committed by Michael Niedermayer
parent 0ea285dd22
commit de0bddea29
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/avio.c
View File

@ -175,7 +175,7 @@ int url_open_protocol (URLContext **puc, struct URLProtocol *up,
int url_alloc(URLContext **puc, const char *filename, int flags) int url_alloc(URLContext **puc, const char *filename, int flags)
{ {
URLProtocol *up; URLProtocol *up;
char proto_str[128]; char proto_str[128], proto_nested[128], *ptr;
size_t proto_len = strspn(filename, URL_SCHEME_CHARS); size_t proto_len = strspn(filename, URL_SCHEME_CHARS);
if (filename[proto_len] != ':' || is_dos_path(filename)) if (filename[proto_len] != ':' || is_dos_path(filename))
@ -183,10 +183,17 @@ int url_alloc(URLContext **puc, const char *filename, int flags)
else else
av_strlcpy(proto_str, filename, FFMIN(proto_len+1, sizeof(proto_str))); av_strlcpy(proto_str, filename, FFMIN(proto_len+1, sizeof(proto_str)));
av_strlcpy(proto_nested, proto_str, sizeof(proto_nested));
if ((ptr = strchr(proto_nested, '+')))
*ptr = '\0';
up = first_protocol; up = first_protocol;
while (up != NULL) { while (up != NULL) {
if (!strcmp(proto_str, up->name)) if (!strcmp(proto_str, up->name))
return url_alloc_for_protocol (puc, up, filename, flags); return url_alloc_for_protocol (puc, up, filename, flags);
if (up->flags & URL_PROTOCOL_FLAG_NESTED_SCHEME &&
!strcmp(proto_nested, up->name))
return url_alloc_for_protocol (puc, up, filename, flags);
up = up->next; up = up->next;
} }
*puc = NULL; *puc = NULL;

2
libavformat/avio.h
View File

@ -281,6 +281,8 @@ int64_t av_url_read_seek(URLContext *h, int stream_index,
*/ */
#define AVSEEK_FORCE 0x20000 #define AVSEEK_FORCE 0x20000
#define URL_PROTOCOL_FLAG_NESTED_SCHEME 1 /*< The protocol name can be the first part of a nested protocol scheme */
typedef struct URLProtocol { typedef struct URLProtocol {
const char *name; const char *name;
int (*url_open)(URLContext *h, const char *url, int flags); int (*url_open)(URLContext *h, const char *url, int flags);