Mercurial > mplayer.hg
comparison stream/cache2.c @ 32468:0c7c4ed0b7eb
Remove som irrelevant commented-out code.
author | reimar |
---|---|
date | Wed, 27 Oct 2010 17:52:45 +0000 |
parents | faefba58f413 |
children | 5d1d67cf8718 |
comparison
equal
deleted
inserted
replaced
32467:fbe5c829c69b | 32468:0c7c4ed0b7eb |
---|---|
211 // printf("### read=0x%X back=%d newb=%d space=%d pos=%d\n",read,back,newb,space,pos); | 211 // printf("### read=0x%X back=%d newb=%d space=%d pos=%d\n",read,back,newb,space,pos); |
212 | 212 |
213 // reduce space if needed: | 213 // reduce space if needed: |
214 if(space>s->buffer_size-pos) space=s->buffer_size-pos; | 214 if(space>s->buffer_size-pos) space=s->buffer_size-pos; |
215 | 215 |
216 // if(space>32768) space=32768; // limit one-time block size | 216 // limit one-time block size |
217 if(space>4*s->sector_size) space=4*s->sector_size; | 217 if(space>4*s->sector_size) space=4*s->sector_size; |
218 | |
219 // if(s->seek_lock) return 0; // FIXME | |
220 | 218 |
221 #if 1 | 219 #if 1 |
222 // back+newb+space <= buffer_size | 220 // back+newb+space <= buffer_size |
223 back2=s->buffer_size-(space+newb); // max back size | 221 back2=s->buffer_size-(space+newb); // max back size |
224 if(s->min_filepos<(read-back2)) s->min_filepos=read-back2; | 222 if(s->min_filepos<(read-back2)) s->min_filepos=read-back2; |
225 #else | 223 #else |
226 s->min_filepos=read-back; // avoid seeking-back to temp area... | 224 s->min_filepos=read-back; // avoid seeking-back to temp area... |
227 #endif | 225 #endif |
228 | 226 |
229 // .... | |
230 //printf("Buffer fill: %d bytes of %d\n",space,s->buffer_size); | |
231 //len=stream_fill_buffer(s->stream); | |
232 //memcpy(&s->buffer[pos],s->stream->buffer,len); // avoid this extra copy! | |
233 // .... | |
234 len=stream_read(s->stream,&s->buffer[pos],space); | 227 len=stream_read(s->stream,&s->buffer[pos],space); |
235 s->eof= !len; | 228 s->eof= !len; |
236 | 229 |
237 s->max_filepos+=len; | 230 s->max_filepos+=len; |
238 if(pos+len>=s->buffer_size){ | 231 if(pos+len>=s->buffer_size){ |