virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity

avformat/aviobuf: Simplify avio_read() and avio_seek()

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Bryan Huh 2015-11-15 18:02:11 -08:00 committed by Michael Niedermayer
parent a01c24e8c5
commit a01ba7f579
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/aviobuf.c
View File

@ -234,7 +234,7 @@ int64_t avio_seek(AVIOContext *s, int64_t offset, int whence)
/* can do the seek inside the buffer */ /* can do the seek inside the buffer */
s->buf_ptr = s->buffer + offset1; s->buf_ptr = s->buffer + offset1;
} else if ((!s->seekable || } else if ((!s->seekable ||
offset1 <= s->buf_end + s->short_seek_threshold - s->buffer) && offset1 <= buffer_size + s->short_seek_threshold) &&
!s->write_flag && offset1 >= 0 && !s->write_flag && offset1 >= 0 &&
(!s->direct || !s->seek) && (!s->direct || !s->seek) &&
(whence != SEEK_END || force)) { (whence != SEEK_END || force)) {
@ -242,7 +242,7 @@ int64_t avio_seek(AVIOContext *s, int64_t offset, int whence)
fill_buffer(s); fill_buffer(s);
if (s->eof_reached) if (s->eof_reached)
return AVERROR_EOF; return AVERROR_EOF;
s->buf_ptr = s->buf_end + offset - s->pos; s->buf_ptr = s->buf_end - (s->pos - offset);
} else if(!s->write_flag && offset1 < 0 && -offset1 < buffer_size>>1 && s->seek && offset > 0) { } else if(!s->write_flag && offset1 < 0 && -offset1 < buffer_size>>1 && s->seek && offset > 0) {
int64_t res; int64_t res;
@ -542,14 +542,13 @@ int avio_read(AVIOContext *s, unsigned char *buf, int size)
size1 = size; size1 = size;
while (size > 0) { while (size > 0) {
len = s->buf_end - s->buf_ptr; len = FFMIN(s->buf_end - s->buf_ptr, size);
if (len > size)
len = size;
if (len == 0 || s->write_flag) { if (len == 0 || s->write_flag) {
if((s->direct || size > s->buffer_size) && !s->update_checksum) { if((s->direct || size > s->buffer_size) && !s->update_checksum) {
// bypass the buffer and read data directly into buf // bypass the buffer and read data directly into buf
if(s->read_packet) if(s->read_packet)
len = s->read_packet(s->opaque, buf, size); len = s->read_packet(s->opaque, buf, size);
if (len <= 0) { if (len <= 0) {
/* do not modify buffer if EOF reached so that a seek back can /* do not modify buffer if EOF reached so that a seek back can
be done without rereading data */ be done without rereading data */