Started implementation of "correct" O_DIRECT handling

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

diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index b680c1dfbc3dfcb4b398066b65720ff20ff69c99..491e7c76d8689ca129261158f8a4c0bcfb90330d 100644 (file)
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -20,9 +20,12 @@
  */
 
 #include "libavutil/crc.h"
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 #include "avio.h"
 #include <stdarg.h>
+#include <unistd.h>
+#include <malloc.h>
 
 #define IO_BUFFER_SIZE 32768
 
@@ -40,8 +43,8 @@ int init_put_byte(ByteIOContext *s,
     s->buffer = buffer;
     s->buffer_size = buffer_size;
     s->buf_ptr = buffer;
-    url_resetbuf(s, write_flag ? URL_WRONLY : URL_RDONLY);
     s->opaque = opaque;
+    url_resetbuf(s, write_flag ? URL_WRONLY : URL_RDONLY);
     s->write_packet = write_packet;
     s->read_packet = read_packet;
     s->seek = seek;
@@ -76,22 +79,36 @@ ByteIOContext *av_alloc_put_byte(
     return s;
 }
 
+#define BLOCK_SIZE 512
+
 static void flush_buffer(ByteIOContext *s)
 {
+    size_t data_len = s->buf_ptr - s->buffer;
+    size_t to_write = (data_len + BLOCK_SIZE - 1) & ~(BLOCK_SIZE - 1);
+    int64_t res = AVERROR(EPIPE);
+    av_log(NULL, AV_LOG_ERROR, "YYY dl=%u, tw=%u\n", data_len, to_write);
     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);
+            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 += s->buf_ptr - s->buffer;
+        s->pos += to_write - BLOCK_SIZE;
+       memcpy(s->buffer, &s->buffer[to_write], data_len - to_write + BLOCK_SIZE);
+       s->buf_ptr -= to_write - BLOCK_SIZE;
+
+        if (s->seek)
+           res = s->seek(s->opaque, s->pos, SEEK_SET);
+       if (res < 0)
+           av_log(NULL, AV_LOG_ERROR, "seek error inside flush_buffer: %lld\n", res);
+       av_log(NULL, AV_LOG_ERROR, "ZZZ tw=%u, pos=%d\n", to_write, s->pos);
     }
-    s->buf_ptr = s->buffer;
 }
 
 void put_byte(ByteIOContext *s, int b)
@@ -145,9 +162,11 @@ int64_t url_fseek(ByteIOContext *s, int64_t offset, int whence)
             return offset1;
         offset += offset1;
     }
+    av_log(NULL, AV_LOG_ERROR, "SEEK to %llu\n", offset);
+
     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 &&
@@ -160,12 +179,13 @@ int64_t url_fseek(ByteIOContext *s, int64_t offset, int whence)
     } else {
         int64_t res = AVERROR(EPIPE);
 
-#if defined(CONFIG_MUXERS) || defined(CONFIG_NETWORK)
+#if CONFIG_MUXERS || CONFIG_NETWORK
         if (s->write_flag) {
             flush_buffer(s);
             s->must_flush = 1;
         }
-#endif /* defined(CONFIG_MUXERS) || defined(CONFIG_NETWORK) */
+#endif /* CONFIG_MUXERS || CONFIG_NETWORK */
+#warning TODO read the whole block from the file to the buffer
         if (!s->seek || (res = s->seek(s->opaque, offset, SEEK_SET)) < 0)
             return res;
         if (!s->write_flag)
@@ -537,7 +557,8 @@ int url_fdopen(ByteIOContext **s, URLContext *h)
     } else {
         buffer_size = IO_BUFFER_SIZE;
     }
-    buffer = av_malloc(buffer_size);
+    buffer_size = 2*buffer_size+BLOCK_SIZE;
+    buffer = memalign(sysconf(_SC_PAGESIZE), buffer_size);
     if (!buffer)
         return AVERROR(ENOMEM);
 
@@ -624,7 +645,7 @@ URLContext *url_fileno(ByteIOContext *s)
     return s->opaque;
 }
 
-#ifdef CONFIG_MUXERS
+#if CONFIG_MUXERS
 int url_fprintf(ByteIOContext *s, const char *fmt, ...)
 {
     va_list ap;
@@ -688,8 +709,8 @@ int64_t av_url_read_fseek(ByteIOContext *s, int stream_index,
 }
 
 /* url_open_dyn_buf and url_close_dyn_buf are used in rtp.c to send a response
- * back to the server even if CONFIG_MUXERS is not set. */
-#if defined(CONFIG_MUXERS) || defined(CONFIG_NETWORK)
+ * back to the server even if CONFIG_MUXERS is false. */
+#if CONFIG_MUXERS || CONFIG_NETWORK
 /* buffer handling */
 int url_open_buf(ByteIOContext **s, uint8_t *buf, int buf_size, int flags)
 {
@@ -740,7 +761,7 @@ static int dyn_buf_write(void *opaque, uint8_t *buf, int buf_size)
     if (new_allocated_size > d->allocated_size) {
         d->buffer = av_realloc(d->buffer, new_allocated_size);
         if(d->buffer == NULL)
-             return -1234;
+             return AVERROR(ENOMEM);
         d->allocated_size = new_allocated_size;
     }
     memcpy(d->buffer + d->pos, buf, buf_size);
@@ -756,10 +777,7 @@ static int dyn_packet_buf_write(void *opaque, uint8_t *buf, int buf_size)
     int ret;
 
     /* packetized write: output the header */
-    buf1[0] = (buf_size >> 24);
-    buf1[1] = (buf_size >> 16);
-    buf1[2] = (buf_size >> 8);
-    buf1[3] = (buf_size);
+    AV_WB32(buf1, buf_size);
     ret= dyn_buf_write(opaque, buf1, 4);
     if(ret < 0)
         return ret;
@@ -785,28 +803,20 @@ 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;
-    d = av_malloc(sizeof(DynBuffer) + io_buffer_size);
+    d = av_mallocz(sizeof(DynBuffer) + io_buffer_size);
     if (!d)
-        return -1;
+        return AVERROR(ENOMEM);
     *s = av_mallocz(sizeof(ByteIOContext));
     if(!*s) {
         av_free(d);
         return AVERROR(ENOMEM);
     }
     d->io_buffer_size = io_buffer_size;
-    d->buffer = NULL;
-    d->pos = 0;
-    d->size = 0;
-    d->allocated_size = 0;
     ret = init_put_byte(*s, d->io_buffer, io_buffer_size,
                         1, d, NULL,
                         max_packet_size ? dyn_packet_buf_write : dyn_buf_write,