virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-28 12:32:17 +02:00
Code Issues Releases Activity

avformat: Append data in fill_buffer() when possible

Browse Source 
Data is appended in fill_buffer() when there is sufficient space left
and the data pointer only reset when needed.
Previously the data pointer was more often reset, loosing more seekback
space than otherwise needed.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-06-30 18:15:50 +02:00
parent bf18abb2eb
commit 2ca48e4666
1 changed files with 9 additions and 7 deletions

16
libavformat/aviobuf.c

@ -392,12 +392,11 @@ void avio_wb24(AVIOContext *s, unsigned int val)
static void fill_buffer(AVIOContext *s) static void fill_buffer(AVIOContext *s)
{ {
uint8_t *dst = !s->max_packet_size &&
s->buf_end - s->buffer < s->buffer_size ?
s->buf_end : s->buffer;
int len = s->buffer_size - (dst - s->buffer);
int max_buffer_size = s->max_packet_size ? int max_buffer_size = s->max_packet_size ?
s->max_packet_size : IO_BUFFER_SIZE; s->max_packet_size : IO_BUFFER_SIZE;
uint8_t *dst = s->buf_end - s->buffer + max_buffer_size < s->buffer_size ?
s->buf_end : s->buffer;
int len = s->buffer_size - (dst - s->buffer);
/* can't fill the buffer without read_packet, just set EOF if appropriate */ /* can't fill the buffer without read_packet, just set EOF if appropriate */
if (!s->read_packet && s->buf_ptr >= s->buf_end) if (!s->read_packet && s->buf_ptr >= s->buf_end)
@ -416,10 +415,13 @@ static void fill_buffer(AVIOContext *s)
/* make buffer smaller in case it ended up large after probing */ /* make buffer smaller in case it ended up large after probing */
if (s->read_packet && s->buffer_size > max_buffer_size) { if (s->read_packet && s->buffer_size > max_buffer_size) {
ffio_set_buf_size(s, max_buffer_size); if (dst == s->buffer) {
ffio_set_buf_size(s, max_buffer_size);
s->checksum_ptr = dst = s->buffer; s->checksum_ptr = dst = s->buffer;
len = s->buffer_size; }
av_assert0(len >= max_buffer_size);
len = max_buffer_size;
} }
if (s->read_packet) if (s->read_packet)