github
/
mpv
mirror of https://github.com/mpv-player/mpv
1
Fork 0
Code Releases Activity

stream, demux_lavf: minor cleanup for stream size code

This commit is contained in:
wm4 2012-11-18 21:23:17 +01:00
parent ddffcce678
commit efaa73cc73
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
demux/demux_lavf.c
View File

@ -112,9 +112,7 @@ static int64_t mp_seek(void *opaque, int64_t pos, int whence)
else if (whence == SEEK_SET)
pos += stream->start_pos;
else if (whence == AVSEEK_SIZE && stream->end_pos > 0) {
uint64_t size;
if (stream_control(stream, STREAM_CTRL_GET_SIZE, &size) == STREAM_OK)
return size;
stream_update_size(stream);
return stream->end_pos - stream->start_pos;
} else
return -1;

9
stream/stream.c
View File

@ -476,6 +476,15 @@ int stream_control(stream_t *s, int cmd, void *arg){
return s->control(s, cmd, arg);
}
void stream_update_size(stream_t *s)
{
uint64_t size;
if (stream_control(s, STREAM_CTRL_GET_SIZE, &size) == STREAM_OK) {
if (size > s->end_pos)
s->end_pos = size;
}
}
stream_t* new_memory_stream(unsigned char* data,int len){
stream_t *s;

1
stream/stream.h
View File

@ -349,6 +349,7 @@ struct bstr stream_read_complete(struct stream *s, void *talloc_ctx,
int max_size, int padding_bytes);
void stream_reset(stream_t *s);
int stream_control(stream_t *s, int cmd, void *arg);
void stream_update_size(stream_t *s);
stream_t* new_stream(int fd,int type);
void free_stream(stream_t *s);
stream_t* new_memory_stream(unsigned char* data,int len);