Mercurial > mplayer.hg
annotate stream/cache2.c @ 31193:f41fda4fe85f
100l, stream_check_for_interrupt argument is not in usec,
so we would end up sleeping for 10s instead of 10ms.
| author | reimar |
|---|---|
| date | Fri, 28 May 2010 18:47:03 +0000 |
| parents | 8432358f2d32 |
| children | 746aef293ae9 |
| rev | line source |
|---|---|
|
30426
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30362
diff
changeset
|
1 /* |
|
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30362
diff
changeset
|
2 * This file is part of MPlayer. |
|
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30362
diff
changeset
|
3 * |
|
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30362
diff
changeset
|
4 * MPlayer is free software; you can redistribute it and/or modify |
|
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30362
diff
changeset
|
5 * it under the terms of the GNU General Public License as published by |
|
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30362
diff
changeset
|
6 * the Free Software Foundation; either version 2 of the License, or |
|
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30362
diff
changeset
|
7 * (at your option) any later version. |
|
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30362
diff
changeset
|
8 * |
|
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30362
diff
changeset
|
9 * MPlayer is distributed in the hope that it will be useful, |
|
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30362
diff
changeset
|
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30362
diff
changeset
|
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30362
diff
changeset
|
12 * GNU General Public License for more details. |
|
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30362
diff
changeset
|
13 * |
|
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30362
diff
changeset
|
14 * You should have received a copy of the GNU General Public License along |
|
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30362
diff
changeset
|
15 * with MPlayer; if not, write to the Free Software Foundation, Inc., |
|
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30362
diff
changeset
|
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
|
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30362
diff
changeset
|
17 */ |
|
ce0122361a39
Add license header to all files missing it in the stream subdirectory.
diego
parents:
30362
diff
changeset
|
18 |
| 2324 | 19 #include "config.h" |
| 20 | |
| 2322 | 21 // Initial draft of my new cache system... |
| 31181 | 22 // Note it runs in 2 processes (using fork()), but doesn't require locking!! |
| 2322 | 23 // TODO: seeking, data consistency checking |
| 24 | |
|
31193
f41fda4fe85f
100l, stream_check_for_interrupt argument is not in usec,
reimar
parents:
31190
diff
changeset
|
25 #define READ_SLEEP_TIME 10 |
| 31181 | 26 // These defines are used to reduce the cost of many successive |
|
31142
355302f83219
Optimize cache behaviour for the many-consecutive-seeks case.
reimar
parents:
31141
diff
changeset
|
27 // seeks (e.g. when a file has no index) by spinning quickly at first. |
|
355302f83219
Optimize cache behaviour for the many-consecutive-seeks case.
reimar
parents:
31141
diff
changeset
|
28 #define INITIAL_FILL_USLEEP_TIME 1000 |
|
355302f83219
Optimize cache behaviour for the many-consecutive-seeks case.
reimar
parents:
31141
diff
changeset
|
29 #define INITIAL_FILL_USLEEP_COUNT 10 |
| 2352 | 30 #define FILL_USLEEP_TIME 50000 |
|
4825
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
3726
diff
changeset
|
31 #define PREFILL_SLEEP_TIME 200 |
|
26833
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
32 #define CONTROL_SLEEP_TIME 0 |
| 2322 | 33 |
| 34 #include <stdio.h> | |
| 35 #include <stdlib.h> | |
| 36 #include <string.h> | |
| 37 #include <signal.h> | |
| 3726 | 38 #include <sys/types.h> |
| 39 #include <unistd.h> | |
|
30351
b985db55e78a
Check for fork failing and make sure cache_uninit always frees the cache data
reimar
parents:
29888
diff
changeset
|
40 #include <errno.h> |
| 2322 | 41 |
|
27723
fb67a8f56bfc
Unconditionally #include osdep/shem.h, fixes the warnings on Cygwin:
diego
parents:
27343
diff
changeset
|
42 #include "osdep/shmem.h" |
| 17012 | 43 #include "osdep/timer.h" |
|
27894
d06d8e459ae1
Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents:
27876
diff
changeset
|
44 #if defined(__MINGW32__) |
| 26077 | 45 #include <windows.h> |
|
27770
c8d4cace053d
Avoid CreateThread and especially TerminateThread since they cause a memleak.
reimar
parents:
27769
diff
changeset
|
46 static void ThreadProc( void *s ); |
| 26077 | 47 #elif defined(__OS2__) |
| 48 #define INCL_DOS | |
| 49 #include <os2.h> | |
|
27756
1266470a5651
Revert declaring ThreadProc as void, it breaks the WINAPI.
diego
parents:
27727
diff
changeset
|
50 static void ThreadProc( void *s ); |
|
27894
d06d8e459ae1
Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents:
27876
diff
changeset
|
51 #elif defined(PTHREAD_CACHE) |
|
d06d8e459ae1
Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents:
27876
diff
changeset
|
52 #include <pthread.h> |
|
d06d8e459ae1
Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents:
27876
diff
changeset
|
53 static void *ThreadProc(void *s); |
| 26077 | 54 #else |
| 10242 | 55 #include <sys/wait.h> |
| 31146 | 56 #define FORKED_CACHE 1 |
| 57 #endif | |
| 58 #ifndef FORKED_CACHE | |
| 59 #define FORKED_CACHE 0 | |
| 10197 | 60 #endif |
| 2322 | 61 |
| 2371 | 62 #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
|
63 #include "help_mp.h" |
| 2371 | 64 |
| 2322 | 65 #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
|
66 #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
|
67 extern int use_gui; |
| 2322 | 68 |
| 69 typedef struct { | |
| 70 // constats: | |
| 31181 | 71 unsigned char *buffer; // base pointer of the allocated buffer memory |
| 72 int buffer_size; // size of the allocated buffer memory | |
| 2352 | 73 int sector_size; // size of a single sector (2048/2324) |
| 74 int back_size; // we should keep back_size amount of old bytes for backward seek | |
| 75 int fill_limit; // we should fill buffer only if space>=fill_limit | |
| 31181 | 76 int seek_limit; // keep filling cache if distance is less that seek limit |
| 2374 | 77 // filler's pointers: |
| 78 int eof; | |
| 79 off_t min_filepos; // buffer contain only a part of the file, from min-max pos | |
| 80 off_t max_filepos; | |
| 81 off_t offset; // filepos <-> bufferpos offset value (filepos of the buffer's first byte) | |
| 2322 | 82 // reader's pointers: |
| 2374 | 83 off_t read_filepos; |
| 2322 | 84 // commands/locking: |
| 2352 | 85 // int seek_lock; // 1 if we will seek/reset buffer, 2 if we are ready for cmd |
| 86 // int fifo_flag; // 1 if we should use FIFO to notice cache about buffer reads. | |
| 2322 | 87 // callback |
| 88 stream_t* stream; | |
|
26833
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
89 volatile int control; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
90 volatile unsigned control_uint_arg; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
91 volatile double control_double_arg; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
92 volatile int control_res; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
93 volatile off_t control_new_pos; |
|
26847
4f875ae5d538
Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents:
26833
diff
changeset
|
94 volatile double stream_time_length; |
| 2322 | 95 } cache_vars_t; |
| 96 | |
| 2352 | 97 static int min_fill=0; |
| 98 | |
| 99 int cache_fill_status=0; | |
| 2322 | 100 |
|
31141
3b5e8cc5e128
Add code to wake up cache process when e.g. a seek is needed.
reimar
parents:
30731
diff
changeset
|
101 static void cache_wakeup(stream_t *s) |
|
3b5e8cc5e128
Add code to wake up cache process when e.g. a seek is needed.
reimar
parents:
30731
diff
changeset
|
102 { |
| 31146 | 103 #if FORKED_CACHE |
|
31141
3b5e8cc5e128
Add code to wake up cache process when e.g. a seek is needed.
reimar
parents:
30731
diff
changeset
|
104 // signal process to wake up immediately |
| 31167 | 105 kill(s->cache_pid, SIGUSR1); |
|
31141
3b5e8cc5e128
Add code to wake up cache process when e.g. a seek is needed.
reimar
parents:
30731
diff
changeset
|
106 #endif |
|
3b5e8cc5e128
Add code to wake up cache process when e.g. a seek is needed.
reimar
parents:
30731
diff
changeset
|
107 } |
|
3b5e8cc5e128
Add code to wake up cache process when e.g. a seek is needed.
reimar
parents:
30731
diff
changeset
|
108 |
|
30557
74a6c2a3dcce
stream: Mark functions not used outside of their files as static.
diego
parents:
30426
diff
changeset
|
109 static void cache_stats(cache_vars_t *s) |
|
74a6c2a3dcce
stream: Mark functions not used outside of their files as static.
diego
parents:
30426
diff
changeset
|
110 { |
| 2322 | 111 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
|
112 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
|
113 mp_msg(MSGT_CACHE,MSGL_INFO,"%3d %% (%3d%%)\n",100*newb/s->buffer_size,100*min_fill/s->buffer_size); |
| 2322 | 114 } |
| 115 | |
|
30557
74a6c2a3dcce
stream: Mark functions not used outside of their files as static.
diego
parents:
30426
diff
changeset
|
116 static int cache_read(cache_vars_t *s, unsigned char *buf, int size) |
|
74a6c2a3dcce
stream: Mark functions not used outside of their files as static.
diego
parents:
30426
diff
changeset
|
117 { |
| 2322 | 118 int total=0; |
|
31190
8432358f2d32
Improve handling of cache process/thread hanging/being killed.
reimar
parents:
31189
diff
changeset
|
119 int sleep_count = 0; |
|
8432358f2d32
Improve handling of cache process/thread hanging/being killed.
reimar
parents:
31189
diff
changeset
|
120 int last_max = s->max_filepos; |
| 2322 | 121 while(size>0){ |
| 122 int pos,newb,len; | |
| 2352 | 123 |
| 124 //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
|
125 |
| 2374 | 126 if(s->read_filepos>=s->max_filepos || s->read_filepos<s->min_filepos){ |
| 2352 | 127 // eof? |
| 128 if(s->eof) break; | |
|
31190
8432358f2d32
Improve handling of cache process/thread hanging/being killed.
reimar
parents:
31189
diff
changeset
|
129 if (s->max_filepos == last_max) { |
|
31193
f41fda4fe85f
100l, stream_check_for_interrupt argument is not in usec,
reimar
parents:
31190
diff
changeset
|
130 if (sleep_count++ == 10) |
|
31190
8432358f2d32
Improve handling of cache process/thread hanging/being killed.
reimar
parents:
31189
diff
changeset
|
131 mp_msg(MSGT_CACHE, MSGL_WARN, "Cache not filling!\n"); |
|
8432358f2d32
Improve handling of cache process/thread hanging/being killed.
reimar
parents:
31189
diff
changeset
|
132 } else { |
|
8432358f2d32
Improve handling of cache process/thread hanging/being killed.
reimar
parents:
31189
diff
changeset
|
133 last_max = s->max_filepos; |
|
8432358f2d32
Improve handling of cache process/thread hanging/being killed.
reimar
parents:
31189
diff
changeset
|
134 sleep_count = 0; |
|
8432358f2d32
Improve handling of cache process/thread hanging/being killed.
reimar
parents:
31189
diff
changeset
|
135 } |
| 2352 | 136 // waiting for buffer fill... |
|
31193
f41fda4fe85f
100l, stream_check_for_interrupt argument is not in usec,
reimar
parents:
31190
diff
changeset
|
137 if (stream_check_interrupt(READ_SLEEP_TIME)) { |
|
31190
8432358f2d32
Improve handling of cache process/thread hanging/being killed.
reimar
parents:
31189
diff
changeset
|
138 s->eof = 1; |
|
8432358f2d32
Improve handling of cache process/thread hanging/being killed.
reimar
parents:
31189
diff
changeset
|
139 break; |
|
8432358f2d32
Improve handling of cache process/thread hanging/being killed.
reimar
parents:
31189
diff
changeset
|
140 } |
| 2352 | 141 continue; // try again... |
| 142 } | |
|
31190
8432358f2d32
Improve handling of cache process/thread hanging/being killed.
reimar
parents:
31189
diff
changeset
|
143 sleep_count = 0; |
| 2352 | 144 |
| 2374 | 145 newb=s->max_filepos-s->read_filepos; // new bytes in the buffer |
| 2322 | 146 if(newb<min_fill) min_fill=newb; // statistics... |
| 147 | |
| 148 // printf("*** newb: %d bytes ***\n",newb); | |
| 2352 | 149 |
| 150 pos=s->read_filepos - s->offset; | |
| 151 if(pos<0) pos+=s->buffer_size; else | |
| 152 if(pos>=s->buffer_size) pos-=s->buffer_size; | |
| 153 | |
| 2322 | 154 if(newb>s->buffer_size-pos) newb=s->buffer_size-pos; // handle wrap... |
| 155 if(newb>size) newb=size; | |
|
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
156 |
| 2352 | 157 // check: |
| 2371 | 158 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
|
159 |
| 2322 | 160 // len=write(mem,newb) |
| 161 //printf("Buffer read: %d bytes\n",newb); | |
| 162 memcpy(buf,&s->buffer[pos],newb); | |
| 163 buf+=newb; | |
| 2352 | 164 len=newb; |
| 2322 | 165 // ... |
|
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
166 |
| 2322 | 167 s->read_filepos+=len; |
| 168 size-=len; | |
| 169 total+=len; | |
|
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
170 |
| 2322 | 171 } |
|
18067
ac7eaa0313c2
avoid cache fill status overflow with caches > ca. 20 MB
reimar
parents:
17384
diff
changeset
|
172 cache_fill_status=(s->max_filepos-s->read_filepos)/(s->buffer_size / 100); |
| 2322 | 173 return total; |
| 174 } | |
| 175 | |
|
30557
74a6c2a3dcce
stream: Mark functions not used outside of their files as static.
diego
parents:
30426
diff
changeset
|
176 static int cache_fill(cache_vars_t *s) |
|
74a6c2a3dcce
stream: Mark functions not used outside of their files as static.
diego
parents:
30426
diff
changeset
|
177 { |
|
7472
c4434bdf6e51
tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
arpi
parents:
7204
diff
changeset
|
178 int back,back2,newb,space,len,pos; |
| 2374 | 179 off_t read=s->read_filepos; |
|
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
180 |
| 2352 | 181 if(read<s->min_filepos || read>s->max_filepos){ |
| 182 // seek... | |
| 17366 | 183 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
|
184 // 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
|
185 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
|
186 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
|
187 { |
|
fc21a94f98c6
do not discard cache content at seeking type=STREAMTYPE_STREAM
arpi
parents:
7862
diff
changeset
|
188 s->offset= // FIXME!? |
|
fc21a94f98c6
do not discard cache content at seeking type=STREAMTYPE_STREAM
arpi
parents:
7862
diff
changeset
|
189 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
|
190 if(s->stream->eof) stream_reset(s->stream); |
|
fc21a94f98c6
do not discard cache content at seeking type=STREAMTYPE_STREAM
arpi
parents:
7862
diff
changeset
|
191 stream_seek(s->stream,read); |
| 17366 | 192 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
|
193 } |
| 2352 | 194 } |
|
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
195 |
| 2322 | 196 // calc number of back-bytes: |
| 197 back=read - s->min_filepos; | |
| 198 if(back<0) back=0; // strange... | |
| 199 if(back>s->back_size) back=s->back_size; | |
|
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
200 |
| 2322 | 201 // calc number of new bytes: |
| 202 newb=s->max_filepos - read; | |
| 203 if(newb<0) newb=0; // strange... | |
| 204 | |
| 205 // calc free buffer space: | |
| 206 space=s->buffer_size - (newb+back); | |
|
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
207 |
| 2322 | 208 // calc bufferpos: |
| 209 pos=s->max_filepos - s->offset; | |
| 210 if(pos>=s->buffer_size) pos-=s->buffer_size; // wrap-around | |
|
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
211 |
| 2322 | 212 if(space<s->fill_limit){ |
| 213 // printf("Buffer is full (%d bytes free, limit: %d)\n",space,s->fill_limit); | |
| 214 return 0; // no fill... | |
| 215 } | |
| 216 | |
| 217 // 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
|
218 |
| 2322 | 219 // reduce space if needed: |
| 220 if(space>s->buffer_size-pos) space=s->buffer_size-pos; | |
|
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
221 |
| 2322 | 222 // if(space>32768) space=32768; // limit one-time block size |
| 223 if(space>4*s->sector_size) space=4*s->sector_size; | |
|
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
224 |
| 2352 | 225 // if(s->seek_lock) return 0; // FIXME |
| 226 | |
| 227 #if 1 | |
| 228 // back+newb+space <= buffer_size | |
| 229 back2=s->buffer_size-(space+newb); // max back size | |
| 230 if(s->min_filepos<(read-back2)) s->min_filepos=read-back2; | |
| 231 #else | |
| 2322 | 232 s->min_filepos=read-back; // avoid seeking-back to temp area... |
| 2352 | 233 #endif |
|
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
234 |
| 2322 | 235 // .... |
| 236 //printf("Buffer fill: %d bytes of %d\n",space,s->buffer_size); | |
| 237 //len=stream_fill_buffer(s->stream); | |
| 238 //memcpy(&s->buffer[pos],s->stream->buffer,len); // avoid this extra copy! | |
| 239 // .... | |
| 2348 | 240 len=stream_read(s->stream,&s->buffer[pos],space); |
| 31169 | 241 s->eof= !len; |
|
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
242 |
| 2322 | 243 s->max_filepos+=len; |
| 244 if(pos+len>=s->buffer_size){ | |
| 245 // wrap... | |
| 246 s->offset+=s->buffer_size; | |
| 247 } | |
|
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
248 |
| 2322 | 249 return len; |
|
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
250 |
| 2322 | 251 } |
| 252 | |
|
27770
c8d4cace053d
Avoid CreateThread and especially TerminateThread since they cause a memleak.
reimar
parents:
27769
diff
changeset
|
253 static int cache_execute_control(cache_vars_t *s) { |
|
26847
4f875ae5d538
Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents:
26833
diff
changeset
|
254 static unsigned last; |
|
30731
5a1ab9923c3a
Threaded cache fixes: do not free the stream_t struct twice on windows
reimar
parents:
30712
diff
changeset
|
255 int quit = s->control == -2; |
|
5a1ab9923c3a
Threaded cache fixes: do not free the stream_t struct twice on windows
reimar
parents:
30712
diff
changeset
|
256 if (quit || !s->stream->control) { |
|
26897
23c3741dc490
Handle NULL control function in cache_execute_control, fixes crash with http urls.
reimar
parents:
26847
diff
changeset
|
257 s->stream_time_length = 0; |
|
23c3741dc490
Handle NULL control function in cache_execute_control, fixes crash with http urls.
reimar
parents:
26847
diff
changeset
|
258 s->control_new_pos = 0; |
|
23c3741dc490
Handle NULL control function in cache_execute_control, fixes crash with http urls.
reimar
parents:
26847
diff
changeset
|
259 s->control_res = STREAM_UNSUPPORTED; |
|
23c3741dc490
Handle NULL control function in cache_execute_control, fixes crash with http urls.
reimar
parents:
26847
diff
changeset
|
260 s->control = -1; |
|
30731
5a1ab9923c3a
Threaded cache fixes: do not free the stream_t struct twice on windows
reimar
parents:
30712
diff
changeset
|
261 return !quit; |
|
26897
23c3741dc490
Handle NULL control function in cache_execute_control, fixes crash with http urls.
reimar
parents:
26847
diff
changeset
|
262 } |
|
26847
4f875ae5d538
Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents:
26833
diff
changeset
|
263 if (GetTimerMS() - last > 99) { |
|
4f875ae5d538
Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents:
26833
diff
changeset
|
264 double len; |
|
4f875ae5d538
Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents:
26833
diff
changeset
|
265 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
|
266 s->stream_time_length = len; |
|
4f875ae5d538
Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents:
26833
diff
changeset
|
267 else |
|
4f875ae5d538
Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents:
26833
diff
changeset
|
268 s->stream_time_length = 0; |
|
4f875ae5d538
Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents:
26833
diff
changeset
|
269 last = GetTimerMS(); |
|
4f875ae5d538
Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents:
26833
diff
changeset
|
270 } |
|
30731
5a1ab9923c3a
Threaded cache fixes: do not free the stream_t struct twice on windows
reimar
parents:
30712
diff
changeset
|
271 if (s->control == -1) return 1; |
|
26833
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
272 switch (s->control) { |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
273 case STREAM_CTRL_GET_CURRENT_TIME: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
274 case STREAM_CTRL_SEEK_TO_TIME: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
275 case STREAM_CTRL_GET_ASPECT_RATIO: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
276 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
|
277 break; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
278 case STREAM_CTRL_SEEK_TO_CHAPTER: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
279 case STREAM_CTRL_GET_NUM_CHAPTERS: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
280 case STREAM_CTRL_GET_CURRENT_CHAPTER: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
281 case STREAM_CTRL_GET_NUM_ANGLES: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
282 case STREAM_CTRL_GET_ANGLE: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
283 case STREAM_CTRL_SET_ANGLE: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
284 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
|
285 break; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
286 default: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
287 s->control_res = STREAM_UNSUPPORTED; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
288 break; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
289 } |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
290 s->control_new_pos = s->stream->pos; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
291 s->control = -1; |
|
30731
5a1ab9923c3a
Threaded cache fixes: do not free the stream_t struct twice on windows
reimar
parents:
30712
diff
changeset
|
292 return 1; |
|
26833
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
293 } |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
294 |
| 31147 | 295 static void *shared_alloc(int size) { |
| 296 #if FORKED_CACHE | |
| 297 return shmem_alloc(size); | |
| 298 #else | |
| 299 return malloc(size); | |
| 300 #endif | |
| 301 } | |
| 302 | |
| 303 static void shared_free(void *ptr, int size) { | |
| 304 #if FORKED_CACHE | |
| 305 shmem_free(ptr, size); | |
| 306 #else | |
| 307 free(ptr); | |
| 308 #endif | |
| 309 } | |
| 310 | |
|
30359
44b8f698fd15
Make cache_init static, it is not used outside this file
reimar
parents:
30355
diff
changeset
|
311 static cache_vars_t* cache_init(int size,int sector){ |
| 2322 | 312 int num; |
| 31147 | 313 cache_vars_t* s=shared_alloc(sizeof(cache_vars_t)); |
| 12899 | 314 if(s==NULL) return NULL; |
|
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
315 |
| 2322 | 316 memset(s,0,sizeof(cache_vars_t)); |
| 317 num=size/sector; | |
|
12835
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
318 if(num < 16){ |
|
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
319 num = 16; |
|
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
320 }//32kb min_size |
| 2322 | 321 s->buffer_size=num*sector; |
| 322 s->sector_size=sector; | |
| 31147 | 323 s->buffer=shared_alloc(s->buffer_size); |
| 12899 | 324 |
| 325 if(s->buffer == NULL){ | |
| 31147 | 326 shared_free(s, sizeof(cache_vars_t)); |
| 12899 | 327 return NULL; |
| 328 } | |
| 329 | |
| 2322 | 330 s->fill_limit=8*sector; |
|
12835
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
331 s->back_size=s->buffer_size/2; |
| 2322 | 332 return s; |
| 333 } | |
| 334 | |
| 9915 | 335 void cache_uninit(stream_t *s) { |
| 336 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
|
337 if(s->cache_pid) { |
| 31146 | 338 #if !FORKED_CACHE |
| 30353 | 339 cache_do_control(s, -2, NULL); |
| 26077 | 340 #else |
| 30353 | 341 kill(s->cache_pid,SIGKILL); |
| 342 waitpid(s->cache_pid,NULL,0); | |
| 10197 | 343 #endif |
| 30352 | 344 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
|
345 } |
| 9915 | 346 if(!c) return; |
| 31147 | 347 shared_free(c->buffer, c->buffer_size); |
| 30354 | 348 c->buffer = NULL; |
|
30731
5a1ab9923c3a
Threaded cache fixes: do not free the stream_t struct twice on windows
reimar
parents:
30712
diff
changeset
|
349 c->stream = NULL; |
| 31147 | 350 shared_free(s->cache_data, sizeof(cache_vars_t)); |
| 30352 | 351 s->cache_data = NULL; |
| 9915 | 352 } |
| 353 | |
| 2322 | 354 static void exit_sighandler(int x){ |
| 355 // close stream | |
| 356 exit(0); | |
| 357 } | |
| 358 | |
|
31141
3b5e8cc5e128
Add code to wake up cache process when e.g. a seek is needed.
reimar
parents:
30731
diff
changeset
|
359 static void dummy_sighandler(int x) { |
|
3b5e8cc5e128
Add code to wake up cache process when e.g. a seek is needed.
reimar
parents:
30731
diff
changeset
|
360 } |
|
3b5e8cc5e128
Add code to wake up cache process when e.g. a seek is needed.
reimar
parents:
30731
diff
changeset
|
361 |
|
30360
c74a5f8ffab3
Change code to allow playing a stream even if enabling the cache failed
reimar
parents:
30359
diff
changeset
|
362 /** |
|
31144
c2d5a1f6360b
Extract the cache main loop into a separate function.
reimar
parents:
31142
diff
changeset
|
363 * Main loop of the cache process or thread. |
|
c2d5a1f6360b
Extract the cache main loop into a separate function.
reimar
parents:
31142
diff
changeset
|
364 */ |
|
c2d5a1f6360b
Extract the cache main loop into a separate function.
reimar
parents:
31142
diff
changeset
|
365 static void cache_mainloop(cache_vars_t *s) { |
|
c2d5a1f6360b
Extract the cache main loop into a separate function.
reimar
parents:
31142
diff
changeset
|
366 int sleep_count = 0; |
|
31189
edfa98275e04
Fix cache process accidentally being killed by SIGUSR1.
reimar
parents:
31181
diff
changeset
|
367 #if FORKED_CACHE |
|
edfa98275e04
Fix cache process accidentally being killed by SIGUSR1.
reimar
parents:
31181
diff
changeset
|
368 signal(SIGUSR1, SIG_IGN); |
|
edfa98275e04
Fix cache process accidentally being killed by SIGUSR1.
reimar
parents:
31181
diff
changeset
|
369 #endif |
|
31144
c2d5a1f6360b
Extract the cache main loop into a separate function.
reimar
parents:
31142
diff
changeset
|
370 do { |
|
c2d5a1f6360b
Extract the cache main loop into a separate function.
reimar
parents:
31142
diff
changeset
|
371 if (!cache_fill(s)) { |
| 31167 | 372 #if FORKED_CACHE |
| 373 // Let signal wake us up, we cannot leave this | |
| 374 // enabled since we do not handle EINTR in most places. | |
| 375 // This might need extra code to work on BSD. | |
| 376 signal(SIGUSR1, dummy_sighandler); | |
| 377 #endif | |
|
31144
c2d5a1f6360b
Extract the cache main loop into a separate function.
reimar
parents:
31142
diff
changeset
|
378 if (sleep_count < INITIAL_FILL_USLEEP_COUNT) { |
|
c2d5a1f6360b
Extract the cache main loop into a separate function.
reimar
parents:
31142
diff
changeset
|
379 sleep_count++; |
|
c2d5a1f6360b
Extract the cache main loop into a separate function.
reimar
parents:
31142
diff
changeset
|
380 usec_sleep(INITIAL_FILL_USLEEP_TIME); |
|
c2d5a1f6360b
Extract the cache main loop into a separate function.
reimar
parents:
31142
diff
changeset
|
381 } else |
|
c2d5a1f6360b
Extract the cache main loop into a separate function.
reimar
parents:
31142
diff
changeset
|
382 usec_sleep(FILL_USLEEP_TIME); // idle |
| 31167 | 383 #if FORKED_CACHE |
| 384 signal(SIGUSR1, SIG_IGN); | |
| 385 #endif | |
|
31144
c2d5a1f6360b
Extract the cache main loop into a separate function.
reimar
parents:
31142
diff
changeset
|
386 } else |
|
c2d5a1f6360b
Extract the cache main loop into a separate function.
reimar
parents:
31142
diff
changeset
|
387 sleep_count = 0; |
|
c2d5a1f6360b
Extract the cache main loop into a separate function.
reimar
parents:
31142
diff
changeset
|
388 // cache_stats(s->cache_data); |
|
c2d5a1f6360b
Extract the cache main loop into a separate function.
reimar
parents:
31142
diff
changeset
|
389 } while (cache_execute_control(s)); |
|
c2d5a1f6360b
Extract the cache main loop into a separate function.
reimar
parents:
31142
diff
changeset
|
390 } |
|
c2d5a1f6360b
Extract the cache main loop into a separate function.
reimar
parents:
31142
diff
changeset
|
391 |
|
c2d5a1f6360b
Extract the cache main loop into a separate function.
reimar
parents:
31142
diff
changeset
|
392 /** |
|
30360
c74a5f8ffab3
Change code to allow playing a stream even if enabling the cache failed
reimar
parents:
30359
diff
changeset
|
393 * \return 1 on success, 0 if the function was interrupted and -1 on error |
|
c74a5f8ffab3
Change code to allow playing a stream even if enabling the cache failed
reimar
parents:
30359
diff
changeset
|
394 */ |
|
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
|
395 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
|
396 int ss = stream->sector_size ? stream->sector_size : STREAM_BUFFER_SIZE; |
|
30362
48c51ebbe421
Always call cache_uninit to immediately free everything cache-related if we
reimar
parents:
30360
diff
changeset
|
397 int res = -1; |
| 5991 | 398 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
|
399 |
|
29888
5c39c41f38e8
Deobfuscate the special hack to disable cache for live555.
reimar
parents:
29263
diff
changeset
|
400 if (stream->flags & STREAM_NON_CACHEABLE) { |
| 7204 | 401 mp_msg(MSGT_CACHE,MSGL_STATUS,"\rThis stream is non-cacheable\n"); |
| 402 return 1; | |
| 403 } | |
|
7006
c0b490505298
disable cache if stream->fd<0 (no regular file/pipe but some special thing)
arpi
parents:
5991
diff
changeset
|
404 |
| 5991 | 405 s=cache_init(size,ss); |
|
30360
c74a5f8ffab3
Change code to allow playing a stream even if enabling the cache failed
reimar
parents:
30359
diff
changeset
|
406 if(s == NULL) return -1; |
| 3562 | 407 stream->cache_data=s; |
| 408 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
|
409 s->seek_limit=seek_limit; |
|
12835
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
410 |
|
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
411 |
|
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
412 //make sure that we won't wait from cache_fill |
| 31181 | 413 //more data than it is allowed 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
|
414 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
|
415 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
|
416 } |
|
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
417 if (min > s->buffer_size - s->fill_limit) { |
|
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
418 min = s->buffer_size - s->fill_limit; |
|
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
419 } |
|
31189
edfa98275e04
Fix cache process accidentally being killed by SIGUSR1.
reimar
parents:
31181
diff
changeset
|
420 // to make sure we wait for the cache process/thread to be active |
|
edfa98275e04
Fix cache process accidentally being killed by SIGUSR1.
reimar
parents:
31181
diff
changeset
|
421 // before continuing |
|
edfa98275e04
Fix cache process accidentally being killed by SIGUSR1.
reimar
parents:
31181
diff
changeset
|
422 if (min <= 0) |
|
edfa98275e04
Fix cache process accidentally being killed by SIGUSR1.
reimar
parents:
31181
diff
changeset
|
423 min = 1; |
|
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
424 |
| 31146 | 425 #if FORKED_CACHE |
| 3562 | 426 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
|
427 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
|
428 stream->cache_pid = 0; |
| 10197 | 429 #else |
| 430 { | |
| 431 stream_t* stream2=malloc(sizeof(stream_t)); | |
| 432 memcpy(stream2,s->stream,sizeof(stream_t)); | |
| 433 s->stream=stream2; | |
|
27894
d06d8e459ae1
Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents:
27876
diff
changeset
|
434 #if defined(__MINGW32__) |
|
27770
c8d4cace053d
Avoid CreateThread and especially TerminateThread since they cause a memleak.
reimar
parents:
27769
diff
changeset
|
435 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
|
436 #elif defined(__OS2__) |
|
d06d8e459ae1
Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents:
27876
diff
changeset
|
437 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
|
438 #else |
|
27896
4c2232462353
100l, stream->cache_pid can not be used directly in pthread_create,
reimar
parents:
27894
diff
changeset
|
439 { |
|
4c2232462353
100l, stream->cache_pid can not be used directly in pthread_create,
reimar
parents:
27894
diff
changeset
|
440 pthread_t tid; |
|
4c2232462353
100l, stream->cache_pid can not be used directly in pthread_create,
reimar
parents:
27894
diff
changeset
|
441 pthread_create(&tid, NULL, ThreadProc, s); |
|
4c2232462353
100l, stream->cache_pid can not be used directly in pthread_create,
reimar
parents:
27894
diff
changeset
|
442 stream->cache_pid = 1; |
|
4c2232462353
100l, stream->cache_pid can not be used directly in pthread_create,
reimar
parents:
27894
diff
changeset
|
443 } |
| 26077 | 444 #endif |
| 10197 | 445 #endif |
|
30351
b985db55e78a
Check for fork failing and make sure cache_uninit always frees the cache data
reimar
parents:
29888
diff
changeset
|
446 if (!stream->cache_pid) { |
|
b985db55e78a
Check for fork failing and make sure cache_uninit always frees the cache data
reimar
parents:
29888
diff
changeset
|
447 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
|
448 "Starting cache process/thread failed: %s.\n", strerror(errno)); |
|
30362
48c51ebbe421
Always call cache_uninit to immediately free everything cache-related if we
reimar
parents:
30360
diff
changeset
|
449 goto err_out; |
|
30351
b985db55e78a
Check for fork failing and make sure cache_uninit always frees the cache data
reimar
parents:
29888
diff
changeset
|
450 } |
| 3562 | 451 // wait until cache is filled at least prefill_init % |
| 17366 | 452 mp_msg(MSGT_CACHE,MSGL_V,"CACHE_PRE_INIT: %"PRId64" [%"PRId64"] %"PRId64" pre:%d eof:%d \n", |
| 17384 | 453 (int64_t)s->min_filepos,(int64_t)s->read_filepos,(int64_t)s->max_filepos,min,s->eof); |
| 3562 | 454 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
|
455 mp_msg(MSGT_CACHE,MSGL_STATUS,MSGTR_CacheFill, |
| 3600 | 456 100.0*(float)(s->max_filepos-s->read_filepos)/(float)(s->buffer_size), |
| 17366 | 457 (int64_t)s->max_filepos-s->read_filepos |
| 3562 | 458 ); |
| 459 if(s->eof) break; // file is smaller than prefill size | |
|
30362
48c51ebbe421
Always call cache_uninit to immediately free everything cache-related if we
reimar
parents:
30360
diff
changeset
|
460 if(stream_check_interrupt(PREFILL_SLEEP_TIME)) { |
|
48c51ebbe421
Always call cache_uninit to immediately free everything cache-related if we
reimar
parents:
30360
diff
changeset
|
461 res = 0; |
|
48c51ebbe421
Always call cache_uninit to immediately free everything cache-related if we
reimar
parents:
30360
diff
changeset
|
462 goto err_out; |
|
48c51ebbe421
Always call cache_uninit to immediately free everything cache-related if we
reimar
parents:
30360
diff
changeset
|
463 } |
| 3562 | 464 } |
| 16870 | 465 mp_msg(MSGT_CACHE,MSGL_STATUS,"\n"); |
|
4825
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
3726
diff
changeset
|
466 return 1; // parent exits |
|
30362
48c51ebbe421
Always call cache_uninit to immediately free everything cache-related if we
reimar
parents:
30360
diff
changeset
|
467 |
|
48c51ebbe421
Always call cache_uninit to immediately free everything cache-related if we
reimar
parents:
30360
diff
changeset
|
468 err_out: |
|
48c51ebbe421
Always call cache_uninit to immediately free everything cache-related if we
reimar
parents:
30360
diff
changeset
|
469 cache_uninit(stream); |
|
48c51ebbe421
Always call cache_uninit to immediately free everything cache-related if we
reimar
parents:
30360
diff
changeset
|
470 return res; |
| 3562 | 471 } |
|
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
472 |
| 31146 | 473 #if FORKED_CACHE |
| 27343 | 474 #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
|
475 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
|
476 #endif |
| 2322 | 477 signal(SIGTERM,exit_sighandler); // kill |
|
31144
c2d5a1f6360b
Extract the cache main loop into a separate function.
reimar
parents:
31142
diff
changeset
|
478 cache_mainloop(s); |
|
30355
ca3e3df28fe2
Add an exit() to silence a gcc warning and ensure forked code will never
reimar
parents:
30354
diff
changeset
|
479 // make sure forked code never leaves this function |
|
ca3e3df28fe2
Add an exit() to silence a gcc warning and ensure forked code will never
reimar
parents:
30354
diff
changeset
|
480 exit(0); |
|
30712
75903ab49159
Restructure #ifs to be clearer, also ensures that we return from the thread
reimar
parents:
30691
diff
changeset
|
481 #endif |
| 2322 | 482 } |
| 483 | |
| 31146 | 484 #if !FORKED_CACHE |
| 485 #if defined(__MINGW32__) || defined(__OS2__) | |
| 486 static void ThreadProc( void *s ){ | |
| 487 cache_mainloop(s); | |
| 488 _endthread(); | |
| 489 } | |
| 490 #else | |
|
31145
47d2e52f61b4
Try reducing the #ifdef mess for the different cache variants.
reimar
parents:
31144
diff
changeset
|
491 static void *ThreadProc( void *s ){ |
|
47d2e52f61b4
Try reducing the #ifdef mess for the different cache variants.
reimar
parents:
31144
diff
changeset
|
492 cache_mainloop(s); |
|
47d2e52f61b4
Try reducing the #ifdef mess for the different cache variants.
reimar
parents:
31144
diff
changeset
|
493 return NULL; |
|
47d2e52f61b4
Try reducing the #ifdef mess for the different cache variants.
reimar
parents:
31144
diff
changeset
|
494 } |
| 31146 | 495 #endif |
|
31145
47d2e52f61b4
Try reducing the #ifdef mess for the different cache variants.
reimar
parents:
31144
diff
changeset
|
496 #endif |
|
47d2e52f61b4
Try reducing the #ifdef mess for the different cache variants.
reimar
parents:
31144
diff
changeset
|
497 |
| 2322 | 498 int cache_stream_fill_buffer(stream_t *s){ |
| 499 int len; | |
| 500 if(!s->cache_pid) return stream_fill_buffer(s); | |
| 501 | |
| 2352 | 502 // cache_stats(s->cache_data); |
| 503 | |
| 2371 | 504 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 | 505 |
| 2322 | 506 len=cache_read(s->cache_data,s->buffer, ((cache_vars_t*)s->cache_data)->sector_size); |
| 2352 | 507 //printf("cache_stream_fill_buffer->read -> %d\n",len); |
| 2327 | 508 |
| 2322 | 509 if(len<=0){ s->eof=1; s->buf_pos=s->buf_len=0; return 0; } |
| 31169 | 510 s->eof=0; |
| 2322 | 511 s->buf_pos=0; |
| 512 s->buf_len=len; | |
| 513 s->pos+=len; | |
| 514 // printf("[%d]",len);fflush(stdout); | |
| 515 return len; | |
| 516 | |
| 517 } | |
| 518 | |
| 2352 | 519 int cache_stream_seek_long(stream_t *stream,off_t pos){ |
| 520 cache_vars_t* s; | |
| 521 off_t newpos; | |
| 522 if(!stream->cache_pid) return stream_seek_long(stream,pos); | |
|
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
523 |
| 2352 | 524 s=stream->cache_data; |
| 525 // s->seek_lock=1; | |
|
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
526 |
| 17366 | 527 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 | 528 |
| 2352 | 529 newpos=pos/s->sector_size; newpos*=s->sector_size; // align |
| 530 stream->pos=s->read_filepos=newpos; | |
| 531 s->eof=0; // !!!!!!! | |
|
31141
3b5e8cc5e128
Add code to wake up cache process when e.g. a seek is needed.
reimar
parents:
30731
diff
changeset
|
532 cache_wakeup(stream); |
| 2352 | 533 |
| 534 cache_stream_fill_buffer(stream); | |
| 2322 | 535 |
| 2352 | 536 pos-=newpos; |
| 537 if(pos>=0 && pos<=stream->buf_len){ | |
| 538 stream->buf_pos=pos; // byte position in sector | |
| 539 return 1; | |
| 540 } | |
| 541 | |
| 542 // stream->buf_pos=stream->buf_len=0; | |
| 543 // return 1; | |
| 544 | |
|
16750
0a31740dd5e6
Use PRI?64 defines as format strings for 64 bit variables.
reimar
parents:
16152
diff
changeset
|
545 mp_msg(MSGT_CACHE,MSGL_V,"cache_stream_seek: WARNING! Can't seek to 0x%"PRIX64" !\n",(int64_t)(pos+newpos)); |
| 2322 | 546 return 0; |
| 547 } | |
|
26833
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
548 |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
549 int cache_do_control(stream_t *stream, int cmd, void *arg) { |
|
31190
8432358f2d32
Improve handling of cache process/thread hanging/being killed.
reimar
parents:
31189
diff
changeset
|
550 int sleep_count = 0; |
|
26833
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
551 cache_vars_t* s = stream->cache_data; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
552 switch (cmd) { |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
553 case STREAM_CTRL_SEEK_TO_TIME: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
554 s->control_double_arg = *(double *)arg; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
555 s->control = cmd; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
556 break; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
557 case STREAM_CTRL_SEEK_TO_CHAPTER: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
558 case STREAM_CTRL_SET_ANGLE: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
559 s->control_uint_arg = *(unsigned *)arg; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
560 s->control = cmd; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
561 break; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
562 // 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
|
563 case STREAM_CTRL_GET_TIME_LENGTH: |
|
26924
ca50c4a72f68
100l, fix wrong order of cases in cache_do_control
reimar
parents:
26897
diff
changeset
|
564 // case STREAM_CTRL_GET_CURRENT_TIME: |
|
26847
4f875ae5d538
Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents:
26833
diff
changeset
|
565 *(double *)arg = s->stream_time_length; |
|
4f875ae5d538
Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents:
26833
diff
changeset
|
566 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
|
567 case STREAM_CTRL_GET_NUM_CHAPTERS: |
|
ca50c4a72f68
100l, fix wrong order of cases in cache_do_control
reimar
parents:
26897
diff
changeset
|
568 case STREAM_CTRL_GET_CURRENT_CHAPTER: |
|
26833
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
569 case STREAM_CTRL_GET_ASPECT_RATIO: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
570 case STREAM_CTRL_GET_NUM_ANGLES: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
571 case STREAM_CTRL_GET_ANGLE: |
|
27770
c8d4cace053d
Avoid CreateThread and especially TerminateThread since they cause a memleak.
reimar
parents:
27769
diff
changeset
|
572 case -2: |
|
26833
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
573 s->control = cmd; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
574 break; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
575 default: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
576 return STREAM_UNSUPPORTED; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
577 } |
|
31141
3b5e8cc5e128
Add code to wake up cache process when e.g. a seek is needed.
reimar
parents:
30731
diff
changeset
|
578 cache_wakeup(stream); |
|
31190
8432358f2d32
Improve handling of cache process/thread hanging/being killed.
reimar
parents:
31189
diff
changeset
|
579 while (s->control != -1) { |
|
8432358f2d32
Improve handling of cache process/thread hanging/being killed.
reimar
parents:
31189
diff
changeset
|
580 if (sleep_count++ == 1000) |
|
8432358f2d32
Improve handling of cache process/thread hanging/being killed.
reimar
parents:
31189
diff
changeset
|
581 mp_msg(MSGT_CACHE, MSGL_WARN, "Cache no responding!\n"); |
|
8432358f2d32
Improve handling of cache process/thread hanging/being killed.
reimar
parents:
31189
diff
changeset
|
582 if (stream_check_interrupt(CONTROL_SLEEP_TIME)) { |
|
8432358f2d32
Improve handling of cache process/thread hanging/being killed.
reimar
parents:
31189
diff
changeset
|
583 s->eof = 1; |
|
8432358f2d32
Improve handling of cache process/thread hanging/being killed.
reimar
parents:
31189
diff
changeset
|
584 return STREAM_UNSUPPORTED; |
|
8432358f2d32
Improve handling of cache process/thread hanging/being killed.
reimar
parents:
31189
diff
changeset
|
585 } |
|
8432358f2d32
Improve handling of cache process/thread hanging/being killed.
reimar
parents:
31189
diff
changeset
|
586 } |
|
26833
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
587 switch (cmd) { |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
588 case STREAM_CTRL_GET_TIME_LENGTH: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
589 case STREAM_CTRL_GET_CURRENT_TIME: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
590 case STREAM_CTRL_GET_ASPECT_RATIO: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
591 *(double *)arg = s->control_double_arg; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
592 break; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
593 case STREAM_CTRL_GET_NUM_CHAPTERS: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
594 case STREAM_CTRL_GET_CURRENT_CHAPTER: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
595 case STREAM_CTRL_GET_NUM_ANGLES: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
596 case STREAM_CTRL_GET_ANGLE: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
597 *(unsigned *)arg = s->control_uint_arg; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
598 break; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
599 case STREAM_CTRL_SEEK_TO_CHAPTER: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
600 case STREAM_CTRL_SEEK_TO_TIME: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
601 case STREAM_CTRL_SET_ANGLE: |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
602 stream->pos = s->read_filepos = s->control_new_pos; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
603 break; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
604 } |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
605 return s->control_res; |
|
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
606 } |
