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

[reimar]

Author: reimar
Date: Sat Jan 23 11:23:47 2010
New Revision: 21393

Log:
Make url_read_complete retry on EAGAIN and return how much data it read
if it reached EOF, making it useful in more cases.

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

Modified: trunk/libavformat/avio.c
==============================================================================
--- trunk/libavformat/avio.c	Sat Jan 23 10:42:52 2010	(r21392)
+++ trunk/libavformat/avio.c	Sat Jan 23 11:23:47 2010	(r21393)
@@ -156,8 +156,10 @@ int url_read_complete(URLContext *h, uns
     len = 0;
     while (len < size) {
         ret = url_read(h, buf+len, size-len);
-        if (ret < 1)
-            return ret;
+        if (ret == AVERROR(EAGAIN)) {
+            ret = 0;
+        } else if (ret < 1)
+            return ret < 0 ? ret : len;
         len += ret;
     }
     return len;

Modified: trunk/libavformat/avio.h
==============================================================================
--- trunk/libavformat/avio.h	Sat Jan 23 10:42:52 2010	(r21392)
+++ trunk/libavformat/avio.h	Sat Jan 23 11:23:47 2010	(r21393)
@@ -69,6 +69,14 @@ int url_open_protocol (URLContext **puc,
                        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);
+/**
+ * Read as many bytes as possible (up to size), calling the
+ * read function multiple times if necessary.
+ * Will also retry if the read function returns AVERROR(EAGAIN).
+ * This makes special short-read handling in applications
+ * unnecessary, if the return value is < size then it is
+ * certain there was either an error or the end of file was reached.
+ */
 int url_read_complete(URLContext *h, unsigned char *buf, int size);
 int url_write(URLContext *h, unsigned char *buf, int size);
 int64_t url_seek(URLContext *h, int64_t pos, int whence);