Mercurial > mplayer.hg
annotate libmpdemux/cache2.c @ 8154:3dd948f5d012
size optim
author | pontscho |
---|---|
date | Mon, 11 Nov 2002 18:31:13 +0000 |
parents | 013c255225d8 |
children | fc21a94f98c6 |
rev | line source |
---|---|
2324 | 1 #include "config.h" |
2 | |
2322 | 3 #ifdef USE_STREAM_CACHE |
4 | |
5 // Initial draft of my new cache system... | |
2352 | 6 // Note it runs in 2 processes (using fork()), but doesn't requires locking!! |
2322 | 7 // TODO: seeking, data consistency checking |
8 | |
2352 | 9 #define READ_USLEEP_TIME 10000 |
10 #define FILL_USLEEP_TIME 50000 | |
4825
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
3726
diff
changeset
|
11 #define PREFILL_SLEEP_TIME 200 |
2322 | 12 |
13 #include <stdio.h> | |
14 #include <stdlib.h> | |
15 #include <string.h> | |
16 #include <signal.h> | |
3726 | 17 #include <sys/types.h> |
18 #include <unistd.h> | |
2322 | 19 |
20 #include "../linux/shmem.h" | |
21 | |
2371 | 22 #include "mp_msg.h" |
23 | |
2322 | 24 #include "stream.h" |
25 | |
26 int stream_fill_buffer(stream_t *s); | |
27 int stream_seek_long(stream_t *s,off_t pos); | |
28 | |
7862
013c255225d8
mpdemux.c|h moved to libinput, mpdemux_check_interrupt() -> mp_input_check_interrupt()
arpi
parents:
7472
diff
changeset
|
29 extern int mp_input_check_interrupt(int time); |
2322 | 30 |
31 typedef struct { | |
32 // constats: | |
33 unsigned char *buffer; // base pointer of the alllocated buffer memory | |
2352 | 34 int buffer_size; // size of the alllocated buffer memory |
35 int sector_size; // size of a single sector (2048/2324) | |
36 int back_size; // we should keep back_size amount of old bytes for backward seek | |
37 int fill_limit; // we should fill buffer only if space>=fill_limit | |
3562 | 38 int prefill; // we should fill min prefill bytes if cache gets empty |
2374 | 39 // filler's pointers: |
40 int eof; | |
41 off_t min_filepos; // buffer contain only a part of the file, from min-max pos | |
42 off_t max_filepos; | |
43 off_t offset; // filepos <-> bufferpos offset value (filepos of the buffer's first byte) | |
2322 | 44 // reader's pointers: |
2374 | 45 off_t read_filepos; |
2322 | 46 // commands/locking: |
2352 | 47 // int seek_lock; // 1 if we will seek/reset buffer, 2 if we are ready for cmd |
48 // int fifo_flag; // 1 if we should use FIFO to notice cache about buffer reads. | |
2322 | 49 // callback |
50 stream_t* stream; | |
51 } cache_vars_t; | |
52 | |
2352 | 53 static int min_fill=0; |
54 | |
55 int cache_fill_status=0; | |
2322 | 56 |
57 void cache_stats(cache_vars_t* s){ | |
58 int newb=s->max_filepos-s->read_filepos; // new bytes in the buffer | |
7472
c4434bdf6e51
tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
arpi
parents:
7204
diff
changeset
|
59 printf("0x%06X [0x%06X] 0x%06X ",(int)s->min_filepos,(int)s->read_filepos,(int)s->max_filepos); |
2322 | 60 printf("%3d %% (%3d%%)\n",100*newb/s->buffer_size,100*min_fill/s->buffer_size); |
61 } | |
62 | |
63 int cache_read(cache_vars_t* s,unsigned char* buf,int size){ | |
64 int total=0; | |
65 while(size>0){ | |
66 int pos,newb,len; | |
2352 | 67 |
68 //printf("CACHE2_READ: 0x%X <= 0x%X <= 0x%X \n",s->min_filepos,s->read_filepos,s->max_filepos); | |
2322 | 69 |
2374 | 70 if(s->read_filepos>=s->max_filepos || s->read_filepos<s->min_filepos){ |
2352 | 71 // eof? |
72 if(s->eof) break; | |
73 // waiting for buffer fill... | |
74 usleep(READ_USLEEP_TIME); // 10ms | |
75 continue; // try again... | |
76 } | |
77 | |
2374 | 78 newb=s->max_filepos-s->read_filepos; // new bytes in the buffer |
2322 | 79 if(newb<min_fill) min_fill=newb; // statistics... |
80 | |
81 // printf("*** newb: %d bytes ***\n",newb); | |
2352 | 82 |
83 pos=s->read_filepos - s->offset; | |
84 if(pos<0) pos+=s->buffer_size; else | |
85 if(pos>=s->buffer_size) pos-=s->buffer_size; | |
86 | |
2322 | 87 if(newb>s->buffer_size-pos) newb=s->buffer_size-pos; // handle wrap... |
88 if(newb>size) newb=size; | |
89 | |
2352 | 90 // check: |
2371 | 91 if(s->read_filepos<s->min_filepos) mp_msg(MSGT_CACHE,MSGL_ERR,"Ehh. s->read_filepos<s->min_filepos !!! Report bug...\n"); |
2352 | 92 |
2322 | 93 // len=write(mem,newb) |
94 //printf("Buffer read: %d bytes\n",newb); | |
95 memcpy(buf,&s->buffer[pos],newb); | |
96 buf+=newb; | |
2352 | 97 len=newb; |
2322 | 98 // ... |
99 | |
100 s->read_filepos+=len; | |
101 size-=len; | |
102 total+=len; | |
103 | |
104 } | |
2352 | 105 cache_fill_status=100*(s->max_filepos-s->read_filepos)/s->buffer_size; |
2322 | 106 return total; |
107 } | |
108 | |
109 int cache_fill(cache_vars_t* s){ | |
7472
c4434bdf6e51
tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
arpi
parents:
7204
diff
changeset
|
110 int back,back2,newb,space,len,pos; |
2374 | 111 off_t read=s->read_filepos; |
2322 | 112 |
2352 | 113 if(read<s->min_filepos || read>s->max_filepos){ |
114 // seek... | |
2371 | 115 mp_msg(MSGT_CACHE,MSGL_DBG2,"Out of boundaries... seeking to 0x%X \n",read); |
2352 | 116 s->offset= // FIXME!? |
117 s->min_filepos=s->max_filepos=read; // drop cache content :( | |
118 if(s->stream->eof) stream_reset(s->stream); | |
119 stream_seek(s->stream,read); | |
2371 | 120 mp_msg(MSGT_CACHE,MSGL_DBG2,"Seek done. new pos: 0x%X \n",(int)stream_tell(s->stream)); |
2352 | 121 } |
122 | |
2322 | 123 // calc number of back-bytes: |
124 back=read - s->min_filepos; | |
125 if(back<0) back=0; // strange... | |
126 if(back>s->back_size) back=s->back_size; | |
127 | |
128 // calc number of new bytes: | |
129 newb=s->max_filepos - read; | |
130 if(newb<0) newb=0; // strange... | |
131 | |
132 // calc free buffer space: | |
133 space=s->buffer_size - (newb+back); | |
134 | |
135 // calc bufferpos: | |
136 pos=s->max_filepos - s->offset; | |
137 if(pos>=s->buffer_size) pos-=s->buffer_size; // wrap-around | |
138 | |
139 if(space<s->fill_limit){ | |
140 // printf("Buffer is full (%d bytes free, limit: %d)\n",space,s->fill_limit); | |
141 return 0; // no fill... | |
142 } | |
143 | |
144 // printf("### read=0x%X back=%d newb=%d space=%d pos=%d\n",read,back,newb,space,pos); | |
145 | |
146 // reduce space if needed: | |
147 if(space>s->buffer_size-pos) space=s->buffer_size-pos; | |
148 | |
149 // if(space>32768) space=32768; // limit one-time block size | |
150 if(space>4*s->sector_size) space=4*s->sector_size; | |
151 | |
2352 | 152 // if(s->seek_lock) return 0; // FIXME |
153 | |
154 #if 1 | |
155 // back+newb+space <= buffer_size | |
156 back2=s->buffer_size-(space+newb); // max back size | |
157 if(s->min_filepos<(read-back2)) s->min_filepos=read-back2; | |
158 #else | |
2322 | 159 s->min_filepos=read-back; // avoid seeking-back to temp area... |
2352 | 160 #endif |
2322 | 161 |
162 // .... | |
163 //printf("Buffer fill: %d bytes of %d\n",space,s->buffer_size); | |
164 //len=stream_fill_buffer(s->stream); | |
165 //memcpy(&s->buffer[pos],s->stream->buffer,len); // avoid this extra copy! | |
166 // .... | |
2348 | 167 len=stream_read(s->stream,&s->buffer[pos],space); |
168 if(!len) s->eof=1; | |
2322 | 169 |
170 s->max_filepos+=len; | |
171 if(pos+len>=s->buffer_size){ | |
172 // wrap... | |
173 s->offset+=s->buffer_size; | |
174 } | |
175 | |
176 return len; | |
177 | |
178 } | |
179 | |
180 cache_vars_t* cache_init(int size,int sector){ | |
181 int num; | |
182 cache_vars_t* s=shmem_alloc(sizeof(cache_vars_t)); | |
183 memset(s,0,sizeof(cache_vars_t)); | |
184 num=size/sector; | |
185 s->buffer_size=num*sector; | |
186 s->sector_size=sector; | |
187 s->buffer=shmem_alloc(s->buffer_size); | |
188 s->fill_limit=8*sector; | |
189 s->back_size=size/2; | |
3562 | 190 s->prefill=size/20; // default: 5% |
2322 | 191 return s; |
192 } | |
193 | |
194 static void exit_sighandler(int x){ | |
195 // close stream | |
196 exit(0); | |
197 } | |
198 | |
4825
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
3726
diff
changeset
|
199 int stream_enable_cache(stream_t *stream,int size,int min,int prefill){ |
3562 | 200 int ss=(stream->type==STREAMTYPE_VCD)?VCD_SECTOR_DATA:STREAM_BUFFER_SIZE; |
5991 | 201 cache_vars_t* s; |
7006
c0b490505298
disable cache if stream->fd<0 (no regular file/pipe but some special thing)
arpi
parents:
5991
diff
changeset
|
202 |
7204 | 203 if (stream->type==STREAMTYPE_STREAM && stream->fd < 0) { |
204 // The stream has no 'fd' behind it, so is non-cacheable | |
205 mp_msg(MSGT_CACHE,MSGL_STATUS,"\rThis stream is non-cacheable\n"); | |
206 return 1; | |
207 } | |
7006
c0b490505298
disable cache if stream->fd<0 (no regular file/pipe but some special thing)
arpi
parents:
5991
diff
changeset
|
208 |
5991 | 209 if(size<32*1024) size=32*1024; // 32kb min |
210 s=cache_init(size,ss); | |
3562 | 211 stream->cache_data=s; |
212 s->stream=stream; // callback | |
213 s->prefill=size*prefill; | |
214 | |
215 if((stream->cache_pid=fork())){ | |
216 // wait until cache is filled at least prefill_init % | |
5931 | 217 mp_msg(MSGT_CACHE,MSGL_V,"CACHE_PRE_INIT: %d [%d] %d pre:%d eof:%d \n", |
3600 | 218 s->min_filepos,s->read_filepos,s->max_filepos,min,s->eof); |
3562 | 219 while(s->read_filepos<s->min_filepos || s->max_filepos-s->read_filepos<min){ |
220 mp_msg(MSGT_CACHE,MSGL_STATUS,"\rCache fill: %5.2f%% (%d bytes) ", | |
3600 | 221 100.0*(float)(s->max_filepos-s->read_filepos)/(float)(s->buffer_size), |
3562 | 222 s->max_filepos-s->read_filepos |
223 ); | |
224 if(s->eof) break; // file is smaller than prefill size | |
7862
013c255225d8
mpdemux.c|h moved to libinput, mpdemux_check_interrupt() -> mp_input_check_interrupt()
arpi
parents:
7472
diff
changeset
|
225 if(mp_input_check_interrupt(PREFILL_SLEEP_TIME)) |
4825
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
3726
diff
changeset
|
226 return 0; |
3562 | 227 } |
4825
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
3726
diff
changeset
|
228 return 1; // parent exits |
3562 | 229 } |
230 | |
2322 | 231 // cache thread mainloop: |
232 signal(SIGTERM,exit_sighandler); // kill | |
233 while(1){ | |
3562 | 234 if(!cache_fill(s)){ |
2352 | 235 usleep(FILL_USLEEP_TIME); // idle |
2322 | 236 } |
2327 | 237 // cache_stats(s->cache_data); |
2322 | 238 } |
239 } | |
240 | |
241 int cache_stream_fill_buffer(stream_t *s){ | |
242 int len; | |
243 if(s->eof){ s->buf_pos=s->buf_len=0; return 0; } | |
244 if(!s->cache_pid) return stream_fill_buffer(s); | |
245 | |
2352 | 246 // cache_stats(s->cache_data); |
247 | |
2371 | 248 if(s->pos!=((cache_vars_t*)s->cache_data)->read_filepos) mp_msg(MSGT_CACHE,MSGL_ERR,"!!! read_filepos differs!!! report this bug...\n"); |
2327 | 249 |
2322 | 250 len=cache_read(s->cache_data,s->buffer, ((cache_vars_t*)s->cache_data)->sector_size); |
2352 | 251 //printf("cache_stream_fill_buffer->read -> %d\n",len); |
2327 | 252 |
2322 | 253 if(len<=0){ s->eof=1; s->buf_pos=s->buf_len=0; return 0; } |
254 s->buf_pos=0; | |
255 s->buf_len=len; | |
256 s->pos+=len; | |
257 // printf("[%d]",len);fflush(stdout); | |
258 return len; | |
259 | |
260 } | |
261 | |
2352 | 262 int cache_stream_seek_long(stream_t *stream,off_t pos){ |
263 cache_vars_t* s; | |
264 off_t newpos; | |
265 if(!stream->cache_pid) return stream_seek_long(stream,pos); | |
266 | |
267 s=stream->cache_data; | |
268 // s->seek_lock=1; | |
269 | |
2371 | 270 mp_msg(MSGT_CACHE,MSGL_DBG2,"CACHE2_SEEK: 0x%X <= 0x%X (0x%X) <= 0x%X \n",s->min_filepos,(int)pos,s->read_filepos,s->max_filepos); |
2322 | 271 |
2352 | 272 newpos=pos/s->sector_size; newpos*=s->sector_size; // align |
273 stream->pos=s->read_filepos=newpos; | |
274 s->eof=0; // !!!!!!! | |
275 | |
276 cache_stream_fill_buffer(stream); | |
2322 | 277 |
2352 | 278 pos-=newpos; |
279 if(pos>=0 && pos<=stream->buf_len){ | |
280 stream->buf_pos=pos; // byte position in sector | |
281 return 1; | |
282 } | |
283 | |
284 // stream->buf_pos=stream->buf_len=0; | |
285 // return 1; | |
286 | |
2371 | 287 #ifdef _LARGEFILE_SOURCE |
288 mp_msg(MSGT_CACHE,MSGL_V,"cache_stream_seek: WARNING! Can't seek to 0x%llX !\n",(long long)(pos+newpos)); | |
289 #else | |
290 mp_msg(MSGT_CACHE,MSGL_V,"cache_stream_seek: WARNING! Can't seek to 0x%X !\n",(pos+newpos)); | |
291 #endif | |
2322 | 292 return 0; |
293 } | |
294 | |
295 #endif |