[FFmpeg-cvslog] r14857 - in trunk/libavformat: avio.c avio.h

[rbultje]

Author: rbultje
Date: Wed Aug 20 01:44:23 2008
New Revision: 14857

Log:
Implement url_open_protocol(), which is basiclly the former url_open() but which opens a URLProtocol instead of a filename. url_open() is reimplemented to call url_open_protocol(). See discussion on "url_open_protocol" on ffmpeg-devel.



Modified:
   trunk/libavformat/avio.c
   trunk/libavformat/avio.h

Modified: trunk/libavformat/avio.c
==============================================================================
--- trunk/libavformat/avio.c	(original)
+++ trunk/libavformat/avio.c	Wed Aug 20 01:44:23 2008
@@ -59,41 +59,12 @@ int register_protocol(URLProtocol *proto
     return 0;
 }
 
-int url_open(URLContext **puc, const char *filename, int flags)
+int url_open_protocol (URLContext **puc, struct URLProtocol *up,
+                       const char *filename, int flags)
 {
     URLContext *uc;
-    URLProtocol *up;
-    const char *p;
-    char proto_str[128], *q;
     int err;
 
-    p = filename;
-    q = proto_str;
-    while (*p != '\0' && *p != ':') {
-        /* protocols can only contain alphabetic chars */
-        if (!isalpha(*p))
-            goto file_proto;
-        if ((q - proto_str) < sizeof(proto_str) - 1)
-            *q++ = *p;
-        p++;
-    }
-    /* if the protocol has length 1, we consider it is a dos drive */
-    if (*p == '\0' || (q - proto_str) <= 1) {
-    file_proto:
-        strcpy(proto_str, "file");
-    } else {
-        *q = '\0';
-    }
-
-    up = first_protocol;
-    while (up != NULL) {
-        if (!strcmp(proto_str, up->name))
-            goto found;
-        up = up->next;
-    }
-    err = AVERROR(ENOENT);
-    goto fail;
- found:
     uc = av_malloc(sizeof(URLContext) + strlen(filename) + 1);
     if (!uc) {
         err = AVERROR(ENOMEM);
@@ -117,7 +88,7 @@ int url_open(URLContext **puc, const cha
 
     //We must be carefull here as url_seek() could be slow, for example for http
     if(   (flags & (URL_WRONLY | URL_RDWR))
-       || !strcmp(proto_str, "file"))
+       || !strcmp(up->name, "file"))
         if(!uc->is_streamed && url_seek(uc, 0, SEEK_SET) < 0)
             uc->is_streamed= 1;
     *puc = uc;
@@ -127,6 +98,40 @@ int url_open(URLContext **puc, const cha
     return err;
 }
 
+int url_open(URLContext **puc, const char *filename, int flags)
+{
+    URLProtocol *up;
+    const char *p;
+    char proto_str[128], *q;
+
+    p = filename;
+    q = proto_str;
+    while (*p != '\0' && *p != ':') {
+        /* protocols can only contain alphabetic chars */
+        if (!isalpha(*p))
+            goto file_proto;
+        if ((q - proto_str) < sizeof(proto_str) - 1)
+            *q++ = *p;
+        p++;
+    }
+    /* if the protocol has length 1, we consider it is a dos drive */
+    if (*p == '\0' || (q - proto_str) <= 1) {
+    file_proto:
+        strcpy(proto_str, "file");
+    } else {
+        *q = '\0';
+    }
+
+    up = first_protocol;
+    while (up != NULL) {
+        if (!strcmp(proto_str, up->name))
+            return url_open_protocol (puc, up, filename, flags);
+        up = up->next;
+    }
+    *puc = NULL;
+    return AVERROR(ENOENT);
+}
+
 int url_read(URLContext *h, unsigned char *buf, int size)
 {
     int ret;

Modified: trunk/libavformat/avio.h
==============================================================================
--- trunk/libavformat/avio.h	(original)
+++ trunk/libavformat/avio.h	Wed Aug 20 01:44:23 2008
@@ -62,6 +62,8 @@ typedef struct URLPollEntry {
 
 typedef int URLInterruptCB(void);
 
+int url_open_protocol (URLContext **puc, struct URLProtocol *up,
+                       const char *filename, int flags);
 int url_open(URLContext **h, const char *filename, int flags);
 int url_read(URLContext *h, unsigned char *buf, int size);
 int url_write(URLContext *h, unsigned char *buf, int size);