har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simplify url_fseek()

Browse Source 
Originally committed as revision 6316 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2006-09-22 10:03:04 +00:00
parent 8e06f20abf
commit f40d17398d
1 changed files with 24 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libavformat/aviobuf.c
View File

@ -106,19 +106,18 @@ void put_flush_packet(ByteIOContext *s)
offset_t url_fseek(ByteIOContext *s, offset_t offset, int whence) offset_t url_fseek(ByteIOContext *s, offset_t offset, int whence)
{ {
offset_t offset1; offset_t offset1;
offset_t pos= s->pos - (s->write_flag ? 0 : (s->buf_end - s->buffer));
if (whence != SEEK_CUR && whence != SEEK_SET) if (whence != SEEK_CUR && whence != SEEK_SET)
return -EINVAL; return -EINVAL;
#ifdef CONFIG_MUXERS
if (s->write_flag) {
if (whence == SEEK_CUR) { if (whence == SEEK_CUR) {
offset1 = s->pos + (s->buf_ptr - s->buffer); offset1 = pos + (s->buf_ptr - s->buffer);
if (offset == 0) if (offset == 0)
return offset1; return offset1;
offset += offset1; offset += offset1;
} }
offset1 = offset - s->pos; offset1 = offset - pos;
if (!s->must_flush && 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 */ /* can do the seek inside the buffer */
@ -126,36 +125,22 @@ offset_t url_fseek(ByteIOContext *s, offset_t offset, int whence)
} else { } else {
if (!s->seek) if (!s->seek)
return -EPIPE; return -EPIPE;
#ifdef CONFIG_MUXERS
if (s->write_flag) {
flush_buffer(s); flush_buffer(s);
s->must_flush = 1; s->must_flush = 1;
s->buf_ptr = s->buffer;
s->seek(s->opaque, offset, SEEK_SET);
s->pos = offset;
}
} else } else
#endif //CONFIG_MUXERS #endif //CONFIG_MUXERS
{ {
if (whence == SEEK_CUR) {
offset1 = s->pos - (s->buf_end - s->buffer) + (s->buf_ptr - s->buffer);
if (offset == 0)
return offset1;
offset += offset1;
}
offset1 = offset - (s->pos - (s->buf_end - s->buffer));
if (offset1 >= 0 && offset1 <= (s->buf_end - s->buffer)) {
/* can do the seek inside the buffer */
s->buf_ptr = s->buffer + offset1;
} else {
if (!s->seek)
return -EPIPE;
s->buf_ptr = s->buffer;
s->buf_end = s->buffer; s->buf_end = s->buffer;
}
s->buf_ptr = s->buffer;
if (s->seek(s->opaque, offset, SEEK_SET) == (offset_t)-EPIPE) if (s->seek(s->opaque, offset, SEEK_SET) == (offset_t)-EPIPE)
return -EPIPE; return -EPIPE;
s->pos = offset; s->pos = offset;
} }
s->eof_reached = 0; s->eof_reached = 0;
}
return offset; return offset;
} }