*/
#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
return s;
}
+#define BLOCK_SIZE 512
+
static void flush_buffer(ByteIOContext *s)
{
- if (s->buf_ptr > s->buffer) {
+ 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=%zd, tw=%zd\n", data_len, to_write);
+ if (data_len > 0) {
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 += 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=%zu, pos=%zd\n", to_write, s->pos);
}
- s->buf_ptr = s->buffer;
}
void put_byte(ByteIOContext *s, int b)
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 &&
s->must_flush = 1;
}
#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)
} 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);
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;
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,