github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-16 22:37:28 +01:00
Code Releases Activity

stream_read() now returns no. of bytes readed

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2348 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2001-10-21 18:13:48 +00:00
parent 69fee563a1
commit 52ad3e1c73
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libmpdemux/stream.h
View File

@ -86,12 +86,13 @@ inline static unsigned int stream_read_dword_le(stream_t *s){
return y; return y;
} }
inline static void stream_read(stream_t *s,char* mem,int len){ inline static int stream_read(stream_t *s,char* mem,int total){
int len=total;
while(len>0){ while(len>0){
int x; int x;
x=s->buf_len-s->buf_pos; x=s->buf_len-s->buf_pos;
if(x==0){ if(x==0){
if(!cache_stream_fill_buffer(s)) return; // EOF if(!cache_stream_fill_buffer(s)) return total-len; // EOF
x=s->buf_len-s->buf_pos; x=s->buf_len-s->buf_pos;
} }
if(s->buf_pos>s->buf_len) printf("stream_read: WARNING! s->buf_pos>s->buf_len\n"); if(s->buf_pos>s->buf_len) printf("stream_read: WARNING! s->buf_pos>s->buf_len\n");
@ -99,6 +100,7 @@ inline static void stream_read(stream_t *s,char* mem,int len){
memcpy(mem,&s->buffer[s->buf_pos],x); memcpy(mem,&s->buffer[s->buf_pos],x);
s->buf_pos+=x; mem+=x; len-=x; s->buf_pos+=x; mem+=x; len-=x;
} }
return total;
} }
inline static int stream_eof(stream_t *s){ inline static int stream_eof(stream_t *s){