Remove debugging messages

[frescor/ffmpeg.git] / libavformat / aviobuf.c

diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index b1e1b49a7e17d6bb44bd1c92e9890ca34dd48ba6..901103b701d7226e0064ee38605b465617d5d850 100644 (file)
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -24,6 +24,8 @@
 #include "avformat.h"
 #include "avio.h"
 #include <stdarg.h>
+#include <unistd.h>
+#include <malloc.h>
 
 #define IO_BUFFER_SIZE 32768
 
@@ -77,8 +79,46 @@ ByteIOContext *av_alloc_put_byte(
     return s;
 }
 
+#define BLOCK_SIZE 512
+
+static void flush_buffer_o_direct(ByteIOContext *s)
+{
+    size_t data_len = s->buf_ptr - s->buffer;
+    size_t to_write = data_len & ~(BLOCK_SIZE - 1);
+
+    if (s->flush_all) {
+       s->flush_all = 0;
+       to_write = (data_len + BLOCK_SIZE - 1) & ~(BLOCK_SIZE - 1);
+    }
+
+    if (data_len > 0) {
+        if (s->write_packet && !s->error){
+            int ret= s->write_packet(s->opaque, s->buffer, to_write);
+            if(ret < 0){
+                s->error = ret;
+            }
+        }
+        if(s->update_checksum){
+           av_log(NULL, AV_LOG_ERROR, "Checksumming not implemented in O_DIRECT patch\n");
+            s->checksum= s->update_checksum(s->checksum, s->checksum_ptr, s->buf_ptr - s->checksum_ptr);
+            s->checksum_ptr= s->buffer;
+        }
+        s->pos += to_write;
+       if (data_len > to_write) {
+           /* flush_all was not set */
+           memcpy(s->buffer, &s->buffer[to_write], data_len - to_write);
+           s->buf_ptr -= to_write;
+       } else
+           s->buf_ptr = s->buffer;
+    }
+}
+
 static void flush_buffer(ByteIOContext *s)
 {
+    if (s->o_direct_flag) {
+       flush_buffer_o_direct(s);
+       return;
+    }
     if (s->buf_ptr > s->buffer) {
         if (s->write_packet && !s->error){
             int ret= s->write_packet(s->opaque, s->buffer, s->buf_ptr - s->buffer);
@@ -146,9 +186,10 @@ int64_t url_fseek(ByteIOContext *s, int64_t offset, int whence)
             return offset1;
         offset += offset1;
     }
+
     offset1 = offset - pos;
     if (!s->must_flush &&
-        offset1 >= 0 && offset1 < (s->buf_end - s->buffer)) {
+        offset1 >= 0 && offset1 <= (s->buf_end - s->buffer)) {
         /* can do the seek inside the buffer */
         s->buf_ptr = s->buffer + offset1;
     } else if(s->is_streamed && !s->write_flag &&
@@ -163,16 +204,30 @@ int64_t url_fseek(ByteIOContext *s, int64_t offset, int whence)
 
 #if CONFIG_MUXERS || CONFIG_NETWORK
         if (s->write_flag) {
+           s->flush_all = 1;
             flush_buffer(s);
             s->must_flush = 1;
         }
 #endif /* CONFIG_MUXERS || CONFIG_NETWORK */
-        if (!s->seek || (res = s->seek(s->opaque, offset, SEEK_SET)) < 0)
-            return res;
-        if (!s->write_flag)
-            s->buf_end = s->buffer;
-        s->buf_ptr = s->buffer;
-        s->pos = offset;
+       if (s->o_direct_flag) {
+           /* Read the whole block from the seek destination */
+           offset1 = offset & ~(BLOCK_SIZE - 1);
+           if (!s->seek || (res = s->seek(s->opaque, offset1, SEEK_SET)) < 0)
+               return res;
+           if ((res = s->read_packet(s->opaque, s->buffer, BLOCK_SIZE)) < 0)
+               return res;
+           if (!s->seek || (res = s->seek(s->opaque, offset1, SEEK_SET)) < 0)
+               return res;
+           s->buf_ptr = s->buffer + offset - offset1;
+           s->pos = offset1;
+       } else {
+           if (!s->seek || (res = s->seek(s->opaque, offset, SEEK_SET)) < 0)
+               return res;
+           if (!s->write_flag)
+               s->buf_end = s->buffer;
+           s->buf_ptr = s->buffer;
+           s->pos = offset;
+       }
     }
     s->eof_reached = 0;
     return offset;
@@ -538,7 +593,14 @@ int url_fdopen(ByteIOContext **s, URLContext *h)
     } else {
         buffer_size = IO_BUFFER_SIZE;
     }
-    buffer = av_malloc(buffer_size);
+    if (h->flags & URL_DIRECT) {
+       if ((h->flags & URL_RDWR) == 0)
+           return AVERROR(EINVAL); /* We need read beacuse of url_fseek() */
+       buffer_size = 2*buffer_size+BLOCK_SIZE;
+       buffer = memalign(sysconf(_SC_PAGESIZE), buffer_size);
+    } else {
+       buffer = av_malloc(buffer_size);
+    }
     if (!buffer)
         return AVERROR(ENOMEM);
 
@@ -557,6 +619,7 @@ int url_fdopen(ByteIOContext **s, URLContext *h)
     }
     (*s)->is_streamed = h->is_streamed;
     (*s)->max_packet_size = max_packet_size;
+    (*s)->o_direct_flag = !!(h->flags & URL_DIRECT);
     if(h->prot) {
         (*s)->read_pause = (int (*)(void *, int))h->prot->url_read_pause;
         (*s)->read_seek  = (int64_t (*)(void *, int, int64_t, int))h->prot->url_read_seek;
@@ -783,12 +846,8 @@ static int64_t dyn_buf_seek(void *opaque, int64_t offset, int whence)
 static int url_open_dyn_buf_internal(ByteIOContext **s, int max_packet_size)
 {
     DynBuffer *d;
-    int io_buffer_size, ret;
-
-    if (max_packet_size)
-        io_buffer_size = max_packet_size;
-    else
-        io_buffer_size = 1024;
+    int ret;
+    unsigned io_buffer_size = max_packet_size ? max_packet_size : 1024;
 
     if(sizeof(DynBuffer) + io_buffer_size < io_buffer_size)
         return -1;