Use O_DIRECT buffer flushing only when we operate really on O_DIRECT file

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

diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 491e7c76d8689ca129261158f8a4c0bcfb90330d..8493e553276ac21925034d062a098917effd5997 100644 (file)
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -81,13 +81,22 @@ ByteIOContext *av_alloc_put_byte(
 
 #define BLOCK_SIZE 512
 
-static void flush_buffer(ByteIOContext *s)
+static void flush_buffer_o_direct(ByteIOContext *s)
 {
     size_t data_len = s->buf_ptr - s->buffer;
+
+    /* Write all the data in the buffer to the disk together with any
+     * additional space at the end of the buffer up to the first
+     * multiple of BLOCK_SIZE. The last block is always written to the
+     * disk despite not being fully filled. If the last block is not
+     * fully filled, we keep it (moved to the begginig of the buffer)
+     * and any subsequent call to this function will rewrite the block
+     * together with the additional data added to the buffer. */
     size_t to_write = (data_len + BLOCK_SIZE - 1) & ~(BLOCK_SIZE - 1);
+    size_t whole_blocks = data_len & ~(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) {
+    //av_log(NULL, AV_LOG_ERROR, "%p: YYY dl=%zd, tw=%zd\n", s, data_len, to_write);
+    if (data_len > 0) {
         if (s->write_packet && !s->error){
             int ret= s->write_packet(s->opaque, s->buffer, to_write);
             if(ret < 0){
@@ -99,18 +108,40 @@ static void flush_buffer(ByteIOContext *s)
             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 - BLOCK_SIZE;
-       memcpy(s->buffer, &s->buffer[to_write], data_len - to_write + BLOCK_SIZE);
-       s->buf_ptr -= to_write - BLOCK_SIZE;
+        s->pos += whole_blocks;
+       memcpy(s->buffer, &s->buffer[whole_blocks], data_len - whole_blocks);
+       s->buf_ptr -= whole_blocks;
 
         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);
+       //av_log(NULL, AV_LOG_ERROR, "ZZZ tw=%zu, pos=%zd\n", to_write, s->pos);
     }
 }
 
+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);
+            if(ret < 0){
+                s->error = ret;
+            }
+        }
+        if(s->update_checksum){
+            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->buf_ptr = s->buffer;
+}
+
 void put_byte(ByteIOContext *s, int b)
 {
     *(s->buf_ptr)++ = b;
@@ -162,13 +193,14 @@ 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);
+    av_log(NULL, AV_LOG_ERROR, "%p: SEEK from %llu to %llu\n", s, pos, offset);
 
     offset1 = offset - pos;
     if (!s->must_flush &&
         offset1 >= 0 && offset1 <= (s->buf_end - s->buffer)) {
         /* can do the seek inside the buffer */
         s->buf_ptr = s->buffer + offset1;
+       av_log(NULL, AV_LOG_ERROR, "Internal seek by %llu\n", offset1);
     } else if(s->is_streamed && !s->write_flag &&
               offset1 >= 0 && offset1 < (s->buf_end - s->buffer) + (1<<16)){
         while(s->pos < offset && !s->eof_reached)
@@ -557,8 +589,14 @@ int url_fdopen(ByteIOContext **s, URLContext *h)
     } else {
         buffer_size = IO_BUFFER_SIZE;
     }
-    buffer_size = 2*buffer_size+BLOCK_SIZE;
-    buffer = memalign(sysconf(_SC_PAGESIZE), buffer_size);
+    (*s)->o_direct_flag = !!(h->flags & URL_DIRECT);
+    if ((*s)->o_direct_flag) {
+       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);