Mercurial > mplayer.hg
annotate stream/cache2.c @ 30352:dff74677e2fd
Zero freed pointers.
| author | reimar |
|---|---|
| date | Sat, 23 Jan 2010 10:53:28 +0000 |
| parents | b985db55e78a |
| children | 3c131287a33e |
| rev | line source |
|---|---|
| 2324 | 1 #include "config.h" |
| 2 | |
| 2322 | 3 // Initial draft of my new cache system... |
| 2352 | 4 // Note it runs in 2 processes (using fork()), but doesn't requires locking!! |
| 2322 | 5 // TODO: seeking, data consistency checking |
| 6 | |
| 2352 | 7 #define READ_USLEEP_TIME 10000 |
| 8 #define FILL_USLEEP_TIME 50000 | |
|
4825
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
3726
diff
changeset
|
9 #define PREFILL_SLEEP_TIME 200 |
|
26833
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
10 #define CONTROL_SLEEP_TIME 0 |
| 2322 | 11 |
| 12 #include <stdio.h> | |
| 13 #include <stdlib.h> | |
| 14 #include <string.h> | |
| 15 #include <signal.h> | |
| 3726 | 16 #include <sys/types.h> |
| 17 #include <unistd.h> | |
|
30351
b985db55e78a
Check for fork failing and make sure cache_uninit always frees the cache data
reimar
parents:
29888
diff
changeset
|
18 #include <errno.h> |
| 2322 | 19 |
|
27723
fb67a8f56bfc
Unconditionally #include osdep/shem.h, fixes the warnings on Cygwin:
diego
parents:
27343
diff
changeset
|
20 #include "osdep/shmem.h" |
| 17012 | 21 #include "osdep/timer.h" |
|
27894
d06d8e459ae1
Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents:
27876
diff
changeset
|
22 #if defined(__MINGW32__) |
| 26077 | 23 #include <windows.h> |
|
27770
c8d4cace053d
Avoid CreateThread and especially TerminateThread since they cause a memleak.
reimar
parents:
27769
diff
changeset
|
24 static void ThreadProc( void *s ); |
| 26077 | 25 #elif defined(__OS2__) |
| 26 #define INCL_DOS | |
| 27 #include <os2.h> | |
|
27756
1266470a5651
Revert declaring ThreadProc as void, it breaks the WINAPI.
diego
parents:
27727
diff
changeset
|
28 static void ThreadProc( void *s ); |
|
27894
d06d8e459ae1
Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents:
27876
diff
changeset
|
29 #elif defined(PTHREAD_CACHE) |
|
d06d8e459ae1
Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents:
27876
diff
changeset
|
30 #include <pthread.h> |
|
d06d8e459ae1
Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents:
27876
diff
changeset
|
31 static void *ThreadProc(void *s); |
| 26077 | 32 #else |
| 10242 | 33 #include <sys/wait.h> |
| 10197 | 34 #endif |
| 2322 | 35 |
| 2371 | 36 #include "mp_msg.h" |
|
16793
8d4fb5469efb
Make a few more messages translatable by moving them into help_mp-en.h.
diego
parents:
16750
diff
changeset
|
37 #include "help_mp.h" |
| 2371 | 38 |
| 2322 | 39 #include "stream.h" |
|
27876
298a3cd86bbb
Include cache2.h in cache2.c, fixes an implicit declaration warning for cache_do_control
reimar
parents:
27770
diff
changeset
|
40 #include "cache2.h" |
|
24697
8f2154e066cf
Make sure forked code does not try to display a GTK message box (and thus crashes)
reimar
parents:
22142
diff
changeset
|
41 extern int use_gui; |
| 2322 | 42 |
| 43 int stream_fill_buffer(stream_t *s); | |
| 44 int stream_seek_long(stream_t *s,off_t pos); | |
| 45 | |
| 46 typedef struct { | |
| 47 // constats: | |
| 48 unsigned char *buffer; // base pointer of the alllocated buffer memory | |
| 2352 | 49 int buffer_size; // size of the alllocated buffer memory |
| 50 int sector_size; // size of a single sector (2048/2324) | |
| 51 int back_size; // we should keep back_size amount of old bytes for backward seek | |
| 52 int fill_limit; // we should fill buffer only if space>=fill_limit | |
|
16152
10a69a812eff
remove unused cache-prefill and create cache-seek-min that controls when seek_long is prefered over waiting for cache to fill
iive
parents:
12899
diff
changeset
|
53 int seek_limit; // keep filling cache if distanse is less that seek limit |
| 2374 | 54 // filler's pointers: |
| 55 int eof; | |
| 56 off_t min_filepos; // buffer contain only a part of the file, from min-max pos | |
| 57 off_t max_filepos; | |
| 58 off_t offset; // filepos <-> bufferpos offset value (filepos of the buffer's first byte) | |
| 2322 | 59 // reader's pointers: |
| 2374 | 60 off_t read_filepos; |
| 2322 | 61 // commands/locking: |
| 2352 | 62 // int seek_lock; // 1 if we will seek/reset buffer, 2 if we are ready for cmd |
| 63 // int fifo_flag; // 1 if we should use FIFO to notice cache about buffer reads. | |
| 2322 | 64 // callback |
| 65 stream_t* stream; | |
|
26833
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
66 volatile int control; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
67 volatile unsigned control_uint_arg; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
68 volatile double control_double_arg; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
69 volatile int control_res; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
70 volatile off_t control_new_pos; |
|
26847
4f875ae5d538
Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents:
26833
diff
changeset
|
71 volatile double stream_time_length; |
| 2322 | 72 } cache_vars_t; |
| 73 | |
| 2352 | 74 static int min_fill=0; |
| 75 | |
| 76 int cache_fill_status=0; | |
| 2322 | 77 |
| 78 void cache_stats(cache_vars_t* s){ | |
| 79 int newb=s->max_filepos-s->read_filepos; // new bytes in the buffer | |
|
18176
f72bc5754209
Part3 of Otvos Attila's oattila AT chello-hu mp_msg changes, with lots of modifications as usual
reynaldo
parents:
18067
diff
changeset
|
80 mp_msg(MSGT_CACHE,MSGL_INFO,"0x%06X [0x%06X] 0x%06X ",(int)s->min_filepos,(int)s->read_filepos,(int)s->max_filepos); |
|
f72bc5754209
Part3 of Otvos Attila's oattila AT chello-hu mp_msg changes, with lots of modifications as usual
reynaldo
parents:
18067
diff
changeset
|
81 mp_msg(MSGT_CACHE,MSGL_INFO,"%3d %% (%3d%%)\n",100*newb/s->buffer_size,100*min_fill/s->buffer_size); |
| 2322 | 82 } |
| 83 | |
| 84 int cache_read(cache_vars_t* s,unsigned char* buf,int size){ | |
| 85 int total=0; | |
| 86 while(size>0){ | |
| 87 int pos,newb,len; | |
| 2352 | 88 |
| 89 //printf("CACHE2_READ: 0x%X <= 0x%X <= 0x%X \n",s->min_filepos,s->read_filepos,s->max_filepos); | |
|
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
90 |
| 2374 | 91 if(s->read_filepos>=s->max_filepos || s->read_filepos<s->min_filepos){ |
| 2352 | 92 // eof? |
| 93 if(s->eof) break; | |
| 94 // waiting for buffer fill... | |
| 10197 | 95 usec_sleep(READ_USLEEP_TIME); // 10ms |
| 2352 | 96 continue; // try again... |
| 97 } | |
| 98 | |
| 2374 | 99 newb=s->max_filepos-s->read_filepos; // new bytes in the buffer |
| 2322 | 100 if(newb<min_fill) min_fill=newb; // statistics... |
| 101 | |
| 102 // printf("*** newb: %d bytes ***\n",newb); | |
| 2352 | 103 |
| 104 pos=s->read_filepos - s->offset; | |
| 105 if(pos<0) pos+=s->buffer_size; else | |
| 106 if(pos>=s->buffer_size) pos-=s->buffer_size; | |
| 107 | |
| 2322 | 108 if(newb>s->buffer_size-pos) newb=s->buffer_size-pos; // handle wrap... |
| 109 if(newb>size) newb=size; | |
|
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
110 |
| 2352 | 111 // check: |
| 2371 | 112 if(s->read_filepos<s->min_filepos) mp_msg(MSGT_CACHE,MSGL_ERR,"Ehh. s->read_filepos<s->min_filepos !!! Report bug...\n"); |
|
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
113 |
| 2322 | 114 // len=write(mem,newb) |
| 115 //printf("Buffer read: %d bytes\n",newb); | |
| 116 memcpy(buf,&s->buffer[pos],newb); | |
| 117 buf+=newb; | |
| 2352 | 118 len=newb; |
| 2322 | 119 // ... |
|
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
120 |
| 2322 | 121 s->read_filepos+=len; |
| 122 size-=len; | |
| 123 total+=len; | |
|
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
124 |
| 2322 | 125 } |
|
18067
ac7eaa0313c2
avoid cache fill status overflow with caches > ca. 20 MB
reimar
parents:
17384
diff
changeset
|
126 cache_fill_status=(s->max_filepos-s->read_filepos)/(s->buffer_size / 100); |
| 2322 | 127 return total; |
| 128 } | |
| 129 | |
| 130 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
|
131 int back,back2,newb,space,len,pos; |
| 2374 | 132 off_t read=s->read_filepos; |
|
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
133 |
| 2352 | 134 if(read<s->min_filepos || read>s->max_filepos){ |
| 135 // seek... | |
| 17366 | 136 mp_msg(MSGT_CACHE,MSGL_DBG2,"Out of boundaries... seeking to 0x%"PRIX64" \n",(int64_t)read); |
|
8938
fc21a94f98c6
do not discard cache content at seeking type=STREAMTYPE_STREAM
arpi
parents:
7862
diff
changeset
|
137 // streaming: drop cache contents only if seeking backward or too much fwd: |
|
fc21a94f98c6
do not discard cache content at seeking type=STREAMTYPE_STREAM
arpi
parents:
7862
diff
changeset
|
138 if(s->stream->type!=STREAMTYPE_STREAM || |
|
16152
10a69a812eff
remove unused cache-prefill and create cache-seek-min that controls when seek_long is prefered over waiting for cache to fill
iive
parents:
12899
diff
changeset
|
139 read<s->min_filepos || read>=s->max_filepos+s->seek_limit) |
|
8938
fc21a94f98c6
do not discard cache content at seeking type=STREAMTYPE_STREAM
arpi
parents:
7862
diff
changeset
|
140 { |
|
fc21a94f98c6
do not discard cache content at seeking type=STREAMTYPE_STREAM
arpi
parents:
7862
diff
changeset
|
141 s->offset= // FIXME!? |
|
fc21a94f98c6
do not discard cache content at seeking type=STREAMTYPE_STREAM
arpi
parents:
7862
diff
changeset
|
142 s->min_filepos=s->max_filepos=read; // drop cache content :( |
|
fc21a94f98c6
do not discard cache content at seeking type=STREAMTYPE_STREAM
arpi
parents:
7862
diff
changeset
|
143 if(s->stream->eof) stream_reset(s->stream); |
|
fc21a94f98c6
do not discard cache content at seeking type=STREAMTYPE_STREAM
arpi
parents:
7862
diff
changeset
|
144 stream_seek(s->stream,read); |
| 17366 | 145 mp_msg(MSGT_CACHE,MSGL_DBG2,"Seek done. new pos: 0x%"PRIX64" \n",(int64_t)stream_tell(s->stream)); |
|
8938
fc21a94f98c6
do not discard cache content at seeking type=STREAMTYPE_STREAM
arpi
parents:
7862
diff
changeset
|
146 } |
| 2352 | 147 } |
|
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
148 |
| 2322 | 149 // calc number of back-bytes: |
| 150 back=read - s->min_filepos; | |
| 151 if(back<0) back=0; // strange... | |
| 152 if(back>s->back_size) back=s->back_size; | |
|
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
153 |
| 2322 | 154 // calc number of new bytes: |
| 155 newb=s->max_filepos - read; | |
| 156 if(newb<0) newb=0; // strange... | |
| 157 | |
| 158 // calc free buffer space: | |
| 159 space=s->buffer_size - (newb+back); | |
|
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
160 |
| 2322 | 161 // calc bufferpos: |
| 162 pos=s->max_filepos - s->offset; | |
| 163 if(pos>=s->buffer_size) pos-=s->buffer_size; // wrap-around | |
|
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
164 |
| 2322 | 165 if(space<s->fill_limit){ |
| 166 // printf("Buffer is full (%d bytes free, limit: %d)\n",space,s->fill_limit); | |
| 167 return 0; // no fill... | |
| 168 } | |
| 169 | |
| 170 // printf("### read=0x%X back=%d newb=%d space=%d pos=%d\n",read,back,newb,space,pos); | |
|
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
171 |
| 2322 | 172 // reduce space if needed: |
| 173 if(space>s->buffer_size-pos) space=s->buffer_size-pos; | |
|
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
174 |
| 2322 | 175 // if(space>32768) space=32768; // limit one-time block size |
| 176 if(space>4*s->sector_size) space=4*s->sector_size; | |
|
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
177 |
| 2352 | 178 // if(s->seek_lock) return 0; // FIXME |
| 179 | |
| 180 #if 1 | |
| 181 // back+newb+space <= buffer_size | |
| 182 back2=s->buffer_size-(space+newb); // max back size | |
| 183 if(s->min_filepos<(read-back2)) s->min_filepos=read-back2; | |
| 184 #else | |
| 2322 | 185 s->min_filepos=read-back; // avoid seeking-back to temp area... |
| 2352 | 186 #endif |
|
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
187 |
| 2322 | 188 // .... |
| 189 //printf("Buffer fill: %d bytes of %d\n",space,s->buffer_size); | |
| 190 //len=stream_fill_buffer(s->stream); | |
| 191 //memcpy(&s->buffer[pos],s->stream->buffer,len); // avoid this extra copy! | |
| 192 // .... | |
| 2348 | 193 len=stream_read(s->stream,&s->buffer[pos],space); |
| 194 if(!len) s->eof=1; | |
|
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
195 |
| 2322 | 196 s->max_filepos+=len; |
| 197 if(pos+len>=s->buffer_size){ | |
| 198 // wrap... | |
| 199 s->offset+=s->buffer_size; | |
| 200 } | |
|
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
201 |
| 2322 | 202 return len; |
|
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
203 |
| 2322 | 204 } |
| 205 | |
|
27770
c8d4cace053d
Avoid CreateThread and especially TerminateThread since they cause a memleak.
reimar
parents:
27769
diff
changeset
|
206 static int cache_execute_control(cache_vars_t *s) { |
|
c8d4cace053d
Avoid CreateThread and especially TerminateThread since they cause a memleak.
reimar
parents:
27769
diff
changeset
|
207 int res = 1; |
|
26847
4f875ae5d538
Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents:
26833
diff
changeset
|
208 static unsigned last; |
|
26897
23c3741dc490
Handle NULL control function in cache_execute_control, fixes crash with http urls.
reimar
parents:
26847
diff
changeset
|
209 if (!s->stream->control) { |
|
23c3741dc490
Handle NULL control function in cache_execute_control, fixes crash with http urls.
reimar
parents:
26847
diff
changeset
|
210 s->stream_time_length = 0; |
|
23c3741dc490
Handle NULL control function in cache_execute_control, fixes crash with http urls.
reimar
parents:
26847
diff
changeset
|
211 s->control_new_pos = 0; |
|
23c3741dc490
Handle NULL control function in cache_execute_control, fixes crash with http urls.
reimar
parents:
26847
diff
changeset
|
212 s->control_res = STREAM_UNSUPPORTED; |
|
23c3741dc490
Handle NULL control function in cache_execute_control, fixes crash with http urls.
reimar
parents:
26847
diff
changeset
|
213 s->control = -1; |
|
27770
c8d4cace053d
Avoid CreateThread and especially TerminateThread since they cause a memleak.
reimar
parents:
27769
diff
changeset
|
214 return res; |
|
26897
23c3741dc490
Handle NULL control function in cache_execute_control, fixes crash with http urls.
reimar
parents:
26847
diff
changeset
|
215 } |
|
26847
4f875ae5d538
Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents:
26833
diff
changeset
|
216 if (GetTimerMS() - last > 99) { |
|
4f875ae5d538
Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents:
26833
diff
changeset
|
217 double len; |
|
4f875ae5d538
Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents:
26833
diff
changeset
|
218 if (s->stream->control(s->stream, STREAM_CTRL_GET_TIME_LENGTH, &len) == STREAM_OK) |
|
4f875ae5d538
Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents:
26833
diff
changeset
|
219 s->stream_time_length = len; |
|
4f875ae5d538
Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents:
26833
diff
changeset
|
220 else |
|
4f875ae5d538
Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents:
26833
diff
changeset
|
221 s->stream_time_length = 0; |
|
4f875ae5d538
Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents:
26833
diff
changeset
|
222 last = GetTimerMS(); |
|
4f875ae5d538
Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents:
26833
diff
changeset
|
223 } |
|
27770
c8d4cace053d
Avoid CreateThread and especially TerminateThread since they cause a memleak.
reimar
parents:
27769
diff
changeset
|
224 if (s->control == -1) return res; |
|
26833
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
225 switch (s->control) { |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
226 case STREAM_CTRL_GET_CURRENT_TIME: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
227 case STREAM_CTRL_SEEK_TO_TIME: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
228 case STREAM_CTRL_GET_ASPECT_RATIO: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
229 s->control_res = s->stream->control(s->stream, s->control, &s->control_double_arg); |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
230 break; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
231 case STREAM_CTRL_SEEK_TO_CHAPTER: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
232 case STREAM_CTRL_GET_NUM_CHAPTERS: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
233 case STREAM_CTRL_GET_CURRENT_CHAPTER: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
234 case STREAM_CTRL_GET_NUM_ANGLES: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
235 case STREAM_CTRL_GET_ANGLE: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
236 case STREAM_CTRL_SET_ANGLE: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
237 s->control_res = s->stream->control(s->stream, s->control, &s->control_uint_arg); |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
238 break; |
|
27770
c8d4cace053d
Avoid CreateThread and especially TerminateThread since they cause a memleak.
reimar
parents:
27769
diff
changeset
|
239 case -2: |
|
c8d4cace053d
Avoid CreateThread and especially TerminateThread since they cause a memleak.
reimar
parents:
27769
diff
changeset
|
240 res = 0; |
|
26833
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
241 default: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
242 s->control_res = STREAM_UNSUPPORTED; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
243 break; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
244 } |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
245 s->control_new_pos = s->stream->pos; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
246 s->control = -1; |
|
27770
c8d4cace053d
Avoid CreateThread and especially TerminateThread since they cause a memleak.
reimar
parents:
27769
diff
changeset
|
247 return res; |
|
26833
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
248 } |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
249 |
| 2322 | 250 cache_vars_t* cache_init(int size,int sector){ |
| 251 int num; | |
|
27894
d06d8e459ae1
Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents:
27876
diff
changeset
|
252 #if !defined(__MINGW32__) && !defined(PTHREAD_CACHE) && !defined(__OS2__) |
| 2322 | 253 cache_vars_t* s=shmem_alloc(sizeof(cache_vars_t)); |
| 10197 | 254 #else |
| 255 cache_vars_t* s=malloc(sizeof(cache_vars_t)); | |
| 256 #endif | |
| 12899 | 257 if(s==NULL) return NULL; |
|
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
258 |
| 2322 | 259 memset(s,0,sizeof(cache_vars_t)); |
| 260 num=size/sector; | |
|
12835
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
261 if(num < 16){ |
|
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
262 num = 16; |
|
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
263 }//32kb min_size |
| 2322 | 264 s->buffer_size=num*sector; |
| 265 s->sector_size=sector; | |
|
27894
d06d8e459ae1
Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents:
27876
diff
changeset
|
266 #if !defined(__MINGW32__) && !defined(PTHREAD_CACHE) && !defined(__OS2__) |
| 2322 | 267 s->buffer=shmem_alloc(s->buffer_size); |
| 10197 | 268 #else |
| 269 s->buffer=malloc(s->buffer_size); | |
| 270 #endif | |
| 12899 | 271 |
| 272 if(s->buffer == NULL){ | |
|
27894
d06d8e459ae1
Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents:
27876
diff
changeset
|
273 #if !defined(__MINGW32__) && !defined(PTHREAD_CACHE) && !defined(__OS2__) |
| 12899 | 274 shmem_free(s,sizeof(cache_vars_t)); |
| 275 #else | |
| 276 free(s); | |
| 277 #endif | |
| 278 return NULL; | |
| 279 } | |
| 280 | |
| 2322 | 281 s->fill_limit=8*sector; |
|
12835
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
282 s->back_size=s->buffer_size/2; |
| 2322 | 283 return s; |
| 284 } | |
| 285 | |
| 9915 | 286 void cache_uninit(stream_t *s) { |
| 287 cache_vars_t* c = s->cache_data; | |
|
30351
b985db55e78a
Check for fork failing and make sure cache_uninit always frees the cache data
reimar
parents:
29888
diff
changeset
|
288 if(s->cache_pid) { |
|
27894
d06d8e459ae1
Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents:
27876
diff
changeset
|
289 #if defined(__MINGW32__) || defined(PTHREAD_CACHE) || defined(__OS2__) |
|
27770
c8d4cace053d
Avoid CreateThread and especially TerminateThread since they cause a memleak.
reimar
parents:
27769
diff
changeset
|
290 cache_do_control(s, -2, NULL); |
| 26077 | 291 #else |
| 9915 | 292 kill(s->cache_pid,SIGKILL); |
| 293 waitpid(s->cache_pid,NULL,0); | |
| 10197 | 294 #endif |
| 30352 | 295 s->cache_pid = 0; |
|
30351
b985db55e78a
Check for fork failing and make sure cache_uninit always frees the cache data
reimar
parents:
29888
diff
changeset
|
296 } |
| 9915 | 297 if(!c) return; |
|
27894
d06d8e459ae1
Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents:
27876
diff
changeset
|
298 #if defined(__MINGW32__) || defined(PTHREAD_CACHE) || defined(__OS2__) |
| 26077 | 299 free(c->stream); |
| 300 free(c->buffer); | |
| 301 free(s->cache_data); | |
| 302 #else | |
| 9915 | 303 shmem_free(c->buffer,c->buffer_size); |
| 304 shmem_free(s->cache_data,sizeof(cache_vars_t)); | |
| 10197 | 305 #endif |
| 30352 | 306 c->buffer = NULL; |
| 307 s->cache_data = NULL; | |
| 9915 | 308 } |
| 309 | |
| 2322 | 310 static void exit_sighandler(int x){ |
| 311 // close stream | |
| 312 exit(0); | |
| 313 } | |
| 314 | |
|
16152
10a69a812eff
remove unused cache-prefill and create cache-seek-min that controls when seek_long is prefered over waiting for cache to fill
iive
parents:
12899
diff
changeset
|
315 int stream_enable_cache(stream_t *stream,int size,int min,int seek_limit){ |
|
25445
959fca775f43
Fix stream_cache to use sector_size set in stream_t.
ulion
parents:
24697
diff
changeset
|
316 int ss = stream->sector_size ? stream->sector_size : STREAM_BUFFER_SIZE; |
| 5991 | 317 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
|
318 |
|
29888
5c39c41f38e8
Deobfuscate the special hack to disable cache for live555.
reimar
parents:
29263
diff
changeset
|
319 if (stream->flags & STREAM_NON_CACHEABLE) { |
| 7204 | 320 mp_msg(MSGT_CACHE,MSGL_STATUS,"\rThis stream is non-cacheable\n"); |
| 321 return 1; | |
| 322 } | |
|
7006
c0b490505298
disable cache if stream->fd<0 (no regular file/pipe but some special thing)
arpi
parents:
5991
diff
changeset
|
323 |
| 5991 | 324 s=cache_init(size,ss); |
| 12899 | 325 if(s == NULL) return 0; |
| 3562 | 326 stream->cache_data=s; |
| 327 s->stream=stream; // callback | |
|
16152
10a69a812eff
remove unused cache-prefill and create cache-seek-min that controls when seek_long is prefered over waiting for cache to fill
iive
parents:
12899
diff
changeset
|
328 s->seek_limit=seek_limit; |
|
12835
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
329 |
|
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
330 |
|
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
331 //make sure that we won't wait from cache_fill |
|
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
332 //more data than it is alowed to fill |
|
16152
10a69a812eff
remove unused cache-prefill and create cache-seek-min that controls when seek_long is prefered over waiting for cache to fill
iive
parents:
12899
diff
changeset
|
333 if (s->seek_limit > s->buffer_size - s->fill_limit ){ |
|
10a69a812eff
remove unused cache-prefill and create cache-seek-min that controls when seek_long is prefered over waiting for cache to fill
iive
parents:
12899
diff
changeset
|
334 s->seek_limit = s->buffer_size - s->fill_limit; |
|
12835
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
335 } |
|
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
336 if (min > s->buffer_size - s->fill_limit) { |
|
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
337 min = s->buffer_size - s->fill_limit; |
|
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
338 } |
|
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
339 |
|
27894
d06d8e459ae1
Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents:
27876
diff
changeset
|
340 #if !defined(__MINGW32__) && !defined(PTHREAD_CACHE) && !defined(__OS2__) |
| 3562 | 341 if((stream->cache_pid=fork())){ |
|
30351
b985db55e78a
Check for fork failing and make sure cache_uninit always frees the cache data
reimar
parents:
29888
diff
changeset
|
342 if ((pid_t)stream->cache_pid == -1) |
|
b985db55e78a
Check for fork failing and make sure cache_uninit always frees the cache data
reimar
parents:
29888
diff
changeset
|
343 stream->cache_pid = 0; |
| 10197 | 344 #else |
| 345 { | |
| 346 stream_t* stream2=malloc(sizeof(stream_t)); | |
| 347 memcpy(stream2,s->stream,sizeof(stream_t)); | |
| 348 s->stream=stream2; | |
|
27894
d06d8e459ae1
Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents:
27876
diff
changeset
|
349 #if defined(__MINGW32__) |
|
27770
c8d4cace053d
Avoid CreateThread and especially TerminateThread since they cause a memleak.
reimar
parents:
27769
diff
changeset
|
350 stream->cache_pid = _beginthread( ThreadProc, 0, s ); |
|
27894
d06d8e459ae1
Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents:
27876
diff
changeset
|
351 #elif defined(__OS2__) |
|
d06d8e459ae1
Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents:
27876
diff
changeset
|
352 stream->cache_pid = _beginthread( ThreadProc, NULL, 256 * 1024, s ); |
|
27770
c8d4cace053d
Avoid CreateThread and especially TerminateThread since they cause a memleak.
reimar
parents:
27769
diff
changeset
|
353 #else |
|
27896
4c2232462353
100l, stream->cache_pid can not be used directly in pthread_create,
reimar
parents:
27894
diff
changeset
|
354 { |
|
4c2232462353
100l, stream->cache_pid can not be used directly in pthread_create,
reimar
parents:
27894
diff
changeset
|
355 pthread_t tid; |
|
4c2232462353
100l, stream->cache_pid can not be used directly in pthread_create,
reimar
parents:
27894
diff
changeset
|
356 pthread_create(&tid, NULL, ThreadProc, s); |
|
4c2232462353
100l, stream->cache_pid can not be used directly in pthread_create,
reimar
parents:
27894
diff
changeset
|
357 stream->cache_pid = 1; |
|
4c2232462353
100l, stream->cache_pid can not be used directly in pthread_create,
reimar
parents:
27894
diff
changeset
|
358 } |
| 26077 | 359 #endif |
| 10197 | 360 #endif |
|
30351
b985db55e78a
Check for fork failing and make sure cache_uninit always frees the cache data
reimar
parents:
29888
diff
changeset
|
361 if (!stream->cache_pid) { |
|
b985db55e78a
Check for fork failing and make sure cache_uninit always frees the cache data
reimar
parents:
29888
diff
changeset
|
362 mp_msg(MSGT_CACHE, MSGL_ERR, |
|
b985db55e78a
Check for fork failing and make sure cache_uninit always frees the cache data
reimar
parents:
29888
diff
changeset
|
363 "Starting cache process/thread failed: %s.\n", strerror(errno)); |
|
b985db55e78a
Check for fork failing and make sure cache_uninit always frees the cache data
reimar
parents:
29888
diff
changeset
|
364 return 0; |
|
b985db55e78a
Check for fork failing and make sure cache_uninit always frees the cache data
reimar
parents:
29888
diff
changeset
|
365 } |
| 3562 | 366 // wait until cache is filled at least prefill_init % |
| 17366 | 367 mp_msg(MSGT_CACHE,MSGL_V,"CACHE_PRE_INIT: %"PRId64" [%"PRId64"] %"PRId64" pre:%d eof:%d \n", |
| 17384 | 368 (int64_t)s->min_filepos,(int64_t)s->read_filepos,(int64_t)s->max_filepos,min,s->eof); |
| 3562 | 369 while(s->read_filepos<s->min_filepos || s->max_filepos-s->read_filepos<min){ |
|
16793
8d4fb5469efb
Make a few more messages translatable by moving them into help_mp-en.h.
diego
parents:
16750
diff
changeset
|
370 mp_msg(MSGT_CACHE,MSGL_STATUS,MSGTR_CacheFill, |
| 3600 | 371 100.0*(float)(s->max_filepos-s->read_filepos)/(float)(s->buffer_size), |
| 17366 | 372 (int64_t)s->max_filepos-s->read_filepos |
| 3562 | 373 ); |
| 374 if(s->eof) break; // file is smaller than prefill size | |
|
26326
5bfc1d8bece9
Remove the need for code using stream to export an mp_input_check_interrupt()
albeu
parents:
26077
diff
changeset
|
375 if(stream_check_interrupt(PREFILL_SLEEP_TIME)) |
|
4825
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
3726
diff
changeset
|
376 return 0; |
| 3562 | 377 } |
| 16870 | 378 mp_msg(MSGT_CACHE,MSGL_STATUS,"\n"); |
|
4825
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
3726
diff
changeset
|
379 return 1; // parent exits |
| 3562 | 380 } |
|
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
381 |
|
27894
d06d8e459ae1
Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents:
27876
diff
changeset
|
382 #if defined(__MINGW32__) || defined(PTHREAD_CACHE) || defined(__OS2__) |
| 10197 | 383 } |
|
27894
d06d8e459ae1
Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents:
27876
diff
changeset
|
384 #ifdef PTHREAD_CACHE |
|
d06d8e459ae1
Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents:
27876
diff
changeset
|
385 static void *ThreadProc( void *s ){ |
|
d06d8e459ae1
Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents:
27876
diff
changeset
|
386 #else |
| 26077 | 387 static void ThreadProc( void *s ){ |
| 388 #endif | |
|
27894
d06d8e459ae1
Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents:
27876
diff
changeset
|
389 #endif |
|
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
390 |
| 27343 | 391 #ifdef CONFIG_GUI |
|
24697
8f2154e066cf
Make sure forked code does not try to display a GTK message box (and thus crashes)
reimar
parents:
22142
diff
changeset
|
392 use_gui = 0; // mp_msg may not use gui stuff in forked code |
|
8f2154e066cf
Make sure forked code does not try to display a GTK message box (and thus crashes)
reimar
parents:
22142
diff
changeset
|
393 #endif |
| 2322 | 394 // cache thread mainloop: |
| 395 signal(SIGTERM,exit_sighandler); // kill | |
|
27770
c8d4cace053d
Avoid CreateThread and especially TerminateThread since they cause a memleak.
reimar
parents:
27769
diff
changeset
|
396 do { |
| 27769 | 397 if(!cache_fill(s)){ |
| 10197 | 398 usec_sleep(FILL_USLEEP_TIME); // idle |
| 2322 | 399 } |
| 2327 | 400 // cache_stats(s->cache_data); |
|
27770
c8d4cace053d
Avoid CreateThread and especially TerminateThread since they cause a memleak.
reimar
parents:
27769
diff
changeset
|
401 } while (cache_execute_control(s)); |
|
27894
d06d8e459ae1
Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents:
27876
diff
changeset
|
402 #if defined(__MINGW32__) || defined(__OS2__) |
|
27770
c8d4cace053d
Avoid CreateThread and especially TerminateThread since they cause a memleak.
reimar
parents:
27769
diff
changeset
|
403 _endthread(); |
|
c8d4cace053d
Avoid CreateThread and especially TerminateThread since they cause a memleak.
reimar
parents:
27769
diff
changeset
|
404 #endif |
|
27894
d06d8e459ae1
Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents:
27876
diff
changeset
|
405 #ifdef PTHREAD_CACHE |
|
d06d8e459ae1
Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents:
27876
diff
changeset
|
406 return NULL; |
|
d06d8e459ae1
Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents:
27876
diff
changeset
|
407 #endif |
| 2322 | 408 } |
| 409 | |
| 410 int cache_stream_fill_buffer(stream_t *s){ | |
| 411 int len; | |
| 412 if(s->eof){ s->buf_pos=s->buf_len=0; return 0; } | |
| 413 if(!s->cache_pid) return stream_fill_buffer(s); | |
| 414 | |
| 2352 | 415 // cache_stats(s->cache_data); |
| 416 | |
| 2371 | 417 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 | 418 |
| 2322 | 419 len=cache_read(s->cache_data,s->buffer, ((cache_vars_t*)s->cache_data)->sector_size); |
| 2352 | 420 //printf("cache_stream_fill_buffer->read -> %d\n",len); |
| 2327 | 421 |
| 2322 | 422 if(len<=0){ s->eof=1; s->buf_pos=s->buf_len=0; return 0; } |
| 423 s->buf_pos=0; | |
| 424 s->buf_len=len; | |
| 425 s->pos+=len; | |
| 426 // printf("[%d]",len);fflush(stdout); | |
| 427 return len; | |
| 428 | |
| 429 } | |
| 430 | |
| 2352 | 431 int cache_stream_seek_long(stream_t *stream,off_t pos){ |
| 432 cache_vars_t* s; | |
| 433 off_t newpos; | |
| 434 if(!stream->cache_pid) return stream_seek_long(stream,pos); | |
|
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
435 |
| 2352 | 436 s=stream->cache_data; |
| 437 // s->seek_lock=1; | |
|
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
438 |
| 17366 | 439 mp_msg(MSGT_CACHE,MSGL_DBG2,"CACHE2_SEEK: 0x%"PRIX64" <= 0x%"PRIX64" (0x%"PRIX64") <= 0x%"PRIX64" \n",s->min_filepos,pos,s->read_filepos,s->max_filepos); |
| 2322 | 440 |
| 2352 | 441 newpos=pos/s->sector_size; newpos*=s->sector_size; // align |
| 442 stream->pos=s->read_filepos=newpos; | |
| 443 s->eof=0; // !!!!!!! | |
| 444 | |
| 445 cache_stream_fill_buffer(stream); | |
| 2322 | 446 |
| 2352 | 447 pos-=newpos; |
| 448 if(pos>=0 && pos<=stream->buf_len){ | |
| 449 stream->buf_pos=pos; // byte position in sector | |
| 450 return 1; | |
| 451 } | |
| 452 | |
| 453 // stream->buf_pos=stream->buf_len=0; | |
| 454 // return 1; | |
| 455 | |
|
16750
0a31740dd5e6
Use PRI?64 defines as format strings for 64 bit variables.
reimar
parents:
16152
diff
changeset
|
456 mp_msg(MSGT_CACHE,MSGL_V,"cache_stream_seek: WARNING! Can't seek to 0x%"PRIX64" !\n",(int64_t)(pos+newpos)); |
| 2322 | 457 return 0; |
| 458 } | |
|
26833
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
459 |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
460 int cache_do_control(stream_t *stream, int cmd, void *arg) { |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
461 cache_vars_t* s = stream->cache_data; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
462 switch (cmd) { |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
463 case STREAM_CTRL_SEEK_TO_TIME: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
464 s->control_double_arg = *(double *)arg; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
465 s->control = cmd; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
466 break; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
467 case STREAM_CTRL_SEEK_TO_CHAPTER: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
468 case STREAM_CTRL_SET_ANGLE: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
469 s->control_uint_arg = *(unsigned *)arg; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
470 s->control = cmd; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
471 break; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
472 // the core might call these every frame, they are too slow for this... |
|
26847
4f875ae5d538
Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents:
26833
diff
changeset
|
473 case STREAM_CTRL_GET_TIME_LENGTH: |
|
26924
ca50c4a72f68
100l, fix wrong order of cases in cache_do_control
reimar
parents:
26897
diff
changeset
|
474 // case STREAM_CTRL_GET_CURRENT_TIME: |
|
26847
4f875ae5d538
Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents:
26833
diff
changeset
|
475 *(double *)arg = s->stream_time_length; |
|
4f875ae5d538
Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents:
26833
diff
changeset
|
476 return s->stream_time_length ? STREAM_OK : STREAM_UNSUPPORTED; |
|
26924
ca50c4a72f68
100l, fix wrong order of cases in cache_do_control
reimar
parents:
26897
diff
changeset
|
477 case STREAM_CTRL_GET_NUM_CHAPTERS: |
|
ca50c4a72f68
100l, fix wrong order of cases in cache_do_control
reimar
parents:
26897
diff
changeset
|
478 case STREAM_CTRL_GET_CURRENT_CHAPTER: |
|
26833
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
479 case STREAM_CTRL_GET_ASPECT_RATIO: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
480 case STREAM_CTRL_GET_NUM_ANGLES: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
481 case STREAM_CTRL_GET_ANGLE: |
|
27770
c8d4cace053d
Avoid CreateThread and especially TerminateThread since they cause a memleak.
reimar
parents:
27769
diff
changeset
|
482 case -2: |
|
26833
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
483 s->control = cmd; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
484 break; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
485 default: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
486 return STREAM_UNSUPPORTED; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
487 } |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
488 while (s->control != -1) |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
489 usec_sleep(CONTROL_SLEEP_TIME); |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
490 switch (cmd) { |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
491 case STREAM_CTRL_GET_TIME_LENGTH: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
492 case STREAM_CTRL_GET_CURRENT_TIME: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
493 case STREAM_CTRL_GET_ASPECT_RATIO: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
494 *(double *)arg = s->control_double_arg; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
495 break; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
496 case STREAM_CTRL_GET_NUM_CHAPTERS: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
497 case STREAM_CTRL_GET_CURRENT_CHAPTER: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
498 case STREAM_CTRL_GET_NUM_ANGLES: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
499 case STREAM_CTRL_GET_ANGLE: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
500 *(unsigned *)arg = s->control_uint_arg; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
501 break; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
502 case STREAM_CTRL_SEEK_TO_CHAPTER: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
503 case STREAM_CTRL_SEEK_TO_TIME: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
504 case STREAM_CTRL_SET_ANGLE: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
505 stream->pos = s->read_filepos = s->control_new_pos; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
506 break; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
507 } |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
508 return s->control_res; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
509 } |
