Make DeluxePaint Animation demuxer actually return the find_record() error code ...

[ffmpeg] / libavformat / avio.c

diff --git a/libavformat/avio.c b/libavformat/avio.c
index 12788278026eb1f4cfd95f3c05cfccdff6454531..ec427deea39a1dcfb98c39ccc243250457582eda 100644 (file)
--- a/libavformat/avio.c
+++ b/libavformat/avio.c
@@ -19,8 +19,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+/* needed for usleep() */
+#define _XOPEN_SOURCE 600
+#include <unistd.h>
 #include "libavutil/avstring.h"
 #include "libavcodec/opt.h"
+#include "os_support.h"
 #include "avformat.h"
 
 #if LIBAVFORMAT_VERSION_MAJOR >= 53
@@ -49,7 +53,7 @@ URLProtocol *av_protocol_next(URLProtocol *p)
     else  return first_protocol;
 }
 
-int register_protocol(URLProtocol *protocol)
+int av_register_protocol(URLProtocol *protocol)
 {
     URLProtocol **p;
     p = &first_protocol;
@@ -59,13 +63,20 @@ int register_protocol(URLProtocol *protocol)
     return 0;
 }
 
+#if LIBAVFORMAT_VERSION_MAJOR < 53
+int register_protocol(URLProtocol *protocol)
+{
+    return av_register_protocol(protocol);
+}
+#endif
+
 int url_open_protocol (URLContext **puc, struct URLProtocol *up,
                        const char *filename, int flags)
 {
     URLContext *uc;
     int err;
 
-    uc = av_malloc(sizeof(URLContext) + strlen(filename) + 1);
+    uc = av_mallocz(sizeof(URLContext) + strlen(filename) + 1);
     if (!uc) {
         err = AVERROR(ENOMEM);
         goto fail;
@@ -86,7 +97,7 @@ int url_open_protocol (URLContext **puc, struct URLProtocol *up,
         return err;
     }
 
-    //We must be carefull here as url_seek() could be slow, for example for http
+    //We must be careful here as url_seek() could be slow, for example for http
     if(   (flags & (URL_WRONLY | URL_RDWR))
        || !strcmp(up->name, "file"))
         if(!uc->is_streamed && url_seek(uc, 0, SEEK_SET) < 0)
@@ -115,7 +126,7 @@ int url_open(URLContext **puc, const char *filename, int flags)
         p++;
     }
     /* if the protocol has length 1, we consider it is a dos drive */
-    if (*p == '\0' || (q - proto_str) <= 1) {
+    if (*p == '\0' || is_dos_path(filename)) {
     file_proto:
         strcpy(proto_str, "file");
     } else {
@@ -141,6 +152,29 @@ int url_read(URLContext *h, unsigned char *buf, int size)
     return ret;
 }
 
+int url_read_complete(URLContext *h, unsigned char *buf, int size)
+{
+    int ret, len;
+    int fast_retries = 5;
+
+    len = 0;
+    while (len < size) {
+        ret = url_read(h, buf+len, size-len);
+        if (ret == AVERROR(EAGAIN)) {
+            ret = 0;
+            if (fast_retries)
+                fast_retries--;
+            else
+                usleep(1000);
+        } else if (ret < 1)
+            return ret < 0 ? ret : len;
+        if (ret)
+           fast_retries = FFMAX(fast_retries, 2);
+        len += ret;
+    }
+    return len;
+}
+
 int url_write(URLContext *h, unsigned char *buf, int size)
 {
     int ret;
@@ -153,9 +187,9 @@ int url_write(URLContext *h, unsigned char *buf, int size)
     return ret;
 }
 
-offset_t url_seek(URLContext *h, offset_t pos, int whence)
+int64_t url_seek(URLContext *h, int64_t pos, int whence)
 {
-    offset_t ret;
+    int64_t ret;
 
     if (!h->prot->url_seek)
         return AVERROR(EPIPE);
@@ -183,9 +217,9 @@ int url_exist(const char *filename)
     return 1;
 }
 
-offset_t url_filesize(URLContext *h)
+int64_t url_filesize(URLContext *h)
 {
-    offset_t pos, size;
+    int64_t pos, size;
 
     size= url_seek(h, 0, AVSEEK_SIZE);
     if(size<0){
@@ -198,6 +232,13 @@ offset_t url_filesize(URLContext *h)
     return size;
 }
 
+int url_get_file_handle(URLContext *h)
+{
+    if (!h->prot->url_get_file_handle)
+        return -1;
+    return h->prot->url_get_file_handle(h);
+}
+
 int url_get_max_packet_size(URLContext *h)
 {
     return h->max_packet_size;
@@ -228,7 +269,7 @@ int av_url_read_pause(URLContext *h, int pause)
     return h->prot->url_read_pause(h, pause);
 }
 
-offset_t av_url_read_seek(URLContext *h,
+int64_t av_url_read_seek(URLContext *h,
         int stream_index, int64_t timestamp, int flags)
 {
     if (!h->prot->url_read_seek)