Mercurial > mplayer.hg
annotate stream/cache2.c @ 36418:155e6100949c
Code changes to avoid additional unnecessary re-inits.
author | reimar |
---|---|
date | Sat, 16 Nov 2013 23:23:46 +0000 |
parents | d206960484fe |
children | 7766530caa76 |
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 |
35025
a11919e51187
Avoid sleeping 0 ms, this can cause sleep to be not called at all.
reimar
parents:
35013
diff
changeset
|
32 #define CONTROL_SLEEP_TIME 1 |
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 |
32529
0624fa95a2aa
Make the file protocol read up to 64 kB at once when the cache is used,
reimar
parents:
32472
diff
changeset
|
42 #include "libavutil/avutil.h" |
35712
d206960484fe
Add a number of missing libavutil header #includes.
diego
parents:
35266
diff
changeset
|
43 #include "libavutil/common.h" |
27723
fb67a8f56bfc
Unconditionally #include osdep/shem.h, fixes the warnings on Cygwin:
diego
parents:
27343
diff
changeset
|
44 #include "osdep/shmem.h" |
17012 | 45 #include "osdep/timer.h" |
27894
d06d8e459ae1
Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents:
27876
diff
changeset
|
46 #if defined(__MINGW32__) |
26077 | 47 #include <windows.h> |
27770
c8d4cace053d
Avoid CreateThread and especially TerminateThread since they cause a memleak.
reimar
parents:
27769
diff
changeset
|
48 static void ThreadProc( void *s ); |
26077 | 49 #elif defined(__OS2__) |
50 #define INCL_DOS | |
51 #include <os2.h> | |
27756
1266470a5651
Revert declaring ThreadProc as void, it breaks the WINAPI.
diego
parents:
27727
diff
changeset
|
52 static void ThreadProc( void *s ); |
27894
d06d8e459ae1
Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents:
27876
diff
changeset
|
53 #elif defined(PTHREAD_CACHE) |
d06d8e459ae1
Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents:
27876
diff
changeset
|
54 #include <pthread.h> |
d06d8e459ae1
Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents:
27876
diff
changeset
|
55 static void *ThreadProc(void *s); |
26077 | 56 #else |
10242 | 57 #include <sys/wait.h> |
31146 | 58 #define FORKED_CACHE 1 |
59 #endif | |
60 #ifndef FORKED_CACHE | |
61 #define FORKED_CACHE 0 | |
10197 | 62 #endif |
2322 | 63 |
2371 | 64 #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
|
65 #include "help_mp.h" |
2371 | 66 |
2322 | 67 #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
|
68 #include "cache2.h" |
33517
850a3272e10d
Change code to allow STREAM_CTRL_GET_CURRENT_TIME with cache enabled.
reimar
parents:
33512
diff
changeset
|
69 #include "mp_global.h" |
2322 | 70 |
71 typedef struct { | |
72 // constats: | |
31181 | 73 unsigned char *buffer; // base pointer of the allocated buffer memory |
34704 | 74 int64_t buffer_size; // size of the allocated buffer memory |
2352 | 75 int sector_size; // size of a single sector (2048/2324) |
34704 | 76 int64_t back_size; // we should keep back_size amount of old bytes for backward seek |
77 int64_t fill_limit; // we should fill buffer only if space>=fill_limit | |
78 int64_t seek_limit; // keep filling cache if distance is less that seek limit | |
34283
3a4adac4e9a5
Make cache process detect when the main process disappeared and
reimar
parents:
33868
diff
changeset
|
79 #if FORKED_CACHE |
3a4adac4e9a5
Make cache process detect when the main process disappeared and
reimar
parents:
33868
diff
changeset
|
80 pid_t ppid; // parent PID to detect killed parent |
3a4adac4e9a5
Make cache process detect when the main process disappeared and
reimar
parents:
33868
diff
changeset
|
81 #endif |
2374 | 82 // filler's pointers: |
83 int eof; | |
34705 | 84 int64_t min_filepos; // buffer contain only a part of the file, from min-max pos |
85 int64_t max_filepos; | |
86 int64_t offset; // filepos <-> bufferpos offset value (filepos of the buffer's first byte) | |
2322 | 87 // reader's pointers: |
34705 | 88 int64_t read_filepos; |
2322 | 89 // commands/locking: |
2352 | 90 // int seek_lock; // 1 if we will seek/reset buffer, 2 if we are ready for cmd |
91 // int fifo_flag; // 1 if we should use FIFO to notice cache about buffer reads. | |
2322 | 92 // callback |
93 stream_t* stream; | |
26833
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
94 volatile int control; |
35013 | 95 volatile uint64_t control_uint_arg; |
26833
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
96 volatile double control_double_arg; |
34648
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34488
diff
changeset
|
97 volatile struct stream_lang_req control_lang_arg; |
26833
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
98 volatile int control_res; |
26847
4f875ae5d538
Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents:
26833
diff
changeset
|
99 volatile double stream_time_length; |
33517
850a3272e10d
Change code to allow STREAM_CTRL_GET_CURRENT_TIME with cache enabled.
reimar
parents:
33512
diff
changeset
|
100 volatile double stream_time_pos; |
2322 | 101 } cache_vars_t; |
102 | |
31141
3b5e8cc5e128
Add code to wake up cache process when e.g. a seek is needed.
reimar
parents:
30731
diff
changeset
|
103 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
|
104 { |
31146 | 105 #if FORKED_CACHE |
31141
3b5e8cc5e128
Add code to wake up cache process when e.g. a seek is needed.
reimar
parents:
30731
diff
changeset
|
106 // signal process to wake up immediately |
31167 | 107 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
|
108 #endif |
3b5e8cc5e128
Add code to wake up cache process when e.g. a seek is needed.
reimar
parents:
30731
diff
changeset
|
109 } |
3b5e8cc5e128
Add code to wake up cache process when e.g. a seek is needed.
reimar
parents:
30731
diff
changeset
|
110 |
34373
7a4dbec9415b
Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents:
34283
diff
changeset
|
111 static void cache_flush(cache_vars_t *s) |
7a4dbec9415b
Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents:
34283
diff
changeset
|
112 { |
7a4dbec9415b
Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents:
34283
diff
changeset
|
113 s->offset= // FIXME!? |
7a4dbec9415b
Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents:
34283
diff
changeset
|
114 s->min_filepos=s->max_filepos=s->read_filepos; // drop cache content :( |
7a4dbec9415b
Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents:
34283
diff
changeset
|
115 } |
7a4dbec9415b
Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents:
34283
diff
changeset
|
116 |
30557
74a6c2a3dcce
stream: Mark functions not used outside of their files as static.
diego
parents:
30426
diff
changeset
|
117 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
|
118 { |
2322 | 119 int total=0; |
31190
8432358f2d32
Improve handling of cache process/thread hanging/being killed.
reimar
parents:
31189
diff
changeset
|
120 int sleep_count = 0; |
34704 | 121 int64_t last_max = s->max_filepos; |
2322 | 122 while(size>0){ |
34704 | 123 int64_t pos,newb,len; |
2352 | 124 |
125 //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
|
126 |
2374 | 127 if(s->read_filepos>=s->max_filepos || s->read_filepos<s->min_filepos){ |
2352 | 128 // eof? |
129 if(s->eof) break; | |
31190
8432358f2d32
Improve handling of cache process/thread hanging/being killed.
reimar
parents:
31189
diff
changeset
|
130 if (s->max_filepos == last_max) { |
31193
f41fda4fe85f
100l, stream_check_for_interrupt argument is not in usec,
reimar
parents:
31190
diff
changeset
|
131 if (sleep_count++ == 10) |
33868
1714e25ded23
Another attempt to make message easier to understand.
reimar
parents:
33867
diff
changeset
|
132 mp_msg(MSGT_CACHE, MSGL_WARN, "Cache empty, consider increasing -cache and/or -cache-min. [performance issue]\n"); |
31190
8432358f2d32
Improve handling of cache process/thread hanging/being killed.
reimar
parents:
31189
diff
changeset
|
133 } else { |
8432358f2d32
Improve handling of cache process/thread hanging/being killed.
reimar
parents:
31189
diff
changeset
|
134 last_max = s->max_filepos; |
8432358f2d32
Improve handling of cache process/thread hanging/being killed.
reimar
parents:
31189
diff
changeset
|
135 sleep_count = 0; |
8432358f2d32
Improve handling of cache process/thread hanging/being killed.
reimar
parents:
31189
diff
changeset
|
136 } |
2352 | 137 // waiting for buffer fill... |
31193
f41fda4fe85f
100l, stream_check_for_interrupt argument is not in usec,
reimar
parents:
31190
diff
changeset
|
138 if (stream_check_interrupt(READ_SLEEP_TIME)) { |
31190
8432358f2d32
Improve handling of cache process/thread hanging/being killed.
reimar
parents:
31189
diff
changeset
|
139 s->eof = 1; |
8432358f2d32
Improve handling of cache process/thread hanging/being killed.
reimar
parents:
31189
diff
changeset
|
140 break; |
8432358f2d32
Improve handling of cache process/thread hanging/being killed.
reimar
parents:
31189
diff
changeset
|
141 } |
2352 | 142 continue; // try again... |
143 } | |
31190
8432358f2d32
Improve handling of cache process/thread hanging/being killed.
reimar
parents:
31189
diff
changeset
|
144 sleep_count = 0; |
2352 | 145 |
2374 | 146 newb=s->max_filepos-s->read_filepos; // new bytes in the buffer |
2322 | 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 } |
172 return total; | |
173 } | |
174 | |
30557
74a6c2a3dcce
stream: Mark functions not used outside of their files as static.
diego
parents:
30426
diff
changeset
|
175 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
|
176 { |
34704 | 177 int64_t back,back2,newb,space,len,pos; |
34705 | 178 int64_t read=s->read_filepos; |
32529
0624fa95a2aa
Make the file protocol read up to 64 kB at once when the cache is used,
reimar
parents:
32472
diff
changeset
|
179 int read_chunk; |
33033
1aed51b973fa
Ensure we always pass a buffer of at least sector size to the read function.
reimar
parents:
32731
diff
changeset
|
180 int wraparound_copy = 0; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
181 |
2352 | 182 if(read<s->min_filepos || read>s->max_filepos){ |
183 // seek... | |
34706 | 184 mp_msg(MSGT_CACHE,MSGL_DBG2,"Out of boundaries... seeking to 0x%"PRIX64" \n",read); |
31305
7ae56026b7ee
Respect -cache-seek-min also for on-disk files to reduce issues with mov.
reimar
parents:
31195
diff
changeset
|
185 // drop cache contents only if seeking backward or too much fwd. |
7ae56026b7ee
Respect -cache-seek-min also for on-disk files to reduce issues with mov.
reimar
parents:
31195
diff
changeset
|
186 // This is also done for on-disk files, since it loses the backseek cache. |
7ae56026b7ee
Respect -cache-seek-min also for on-disk files to reduce issues with mov.
reimar
parents:
31195
diff
changeset
|
187 // That in turn can cause major bandwidth increase and performance |
7ae56026b7ee
Respect -cache-seek-min also for on-disk files to reduce issues with mov.
reimar
parents:
31195
diff
changeset
|
188 // issues with e.g. mov or badly interleaved files |
7ae56026b7ee
Respect -cache-seek-min also for on-disk files to reduce issues with mov.
reimar
parents:
31195
diff
changeset
|
189 if(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
|
190 { |
34373
7a4dbec9415b
Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents:
34283
diff
changeset
|
191 cache_flush(s); |
8938
fc21a94f98c6
do not discard cache content at seeking type=STREAMTYPE_STREAM
arpi
parents:
7862
diff
changeset
|
192 if(s->stream->eof) stream_reset(s->stream); |
32472
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32468
diff
changeset
|
193 stream_seek_internal(s->stream,read); |
17366 | 194 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
|
195 } |
2352 | 196 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
197 |
2322 | 198 // calc number of back-bytes: |
199 back=read - s->min_filepos; | |
200 if(back<0) back=0; // strange... | |
201 if(back>s->back_size) back=s->back_size; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
202 |
2322 | 203 // calc number of new bytes: |
204 newb=s->max_filepos - read; | |
205 if(newb<0) newb=0; // strange... | |
206 | |
207 // calc free buffer space: | |
208 space=s->buffer_size - (newb+back); | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
209 |
2322 | 210 // calc bufferpos: |
211 pos=s->max_filepos - s->offset; | |
212 if(pos>=s->buffer_size) pos-=s->buffer_size; // wrap-around | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
213 |
2322 | 214 if(space<s->fill_limit){ |
215 // printf("Buffer is full (%d bytes free, limit: %d)\n",space,s->fill_limit); | |
216 return 0; // no fill... | |
217 } | |
218 | |
219 // 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
|
220 |
33033
1aed51b973fa
Ensure we always pass a buffer of at least sector size to the read function.
reimar
parents:
32731
diff
changeset
|
221 // try to avoid wrap-around. If not possible due to sector size |
1aed51b973fa
Ensure we always pass a buffer of at least sector size to the read function.
reimar
parents:
32731
diff
changeset
|
222 // do an extra copy. |
1aed51b973fa
Ensure we always pass a buffer of at least sector size to the read function.
reimar
parents:
32731
diff
changeset
|
223 if(space>s->buffer_size-pos) { |
1aed51b973fa
Ensure we always pass a buffer of at least sector size to the read function.
reimar
parents:
32731
diff
changeset
|
224 if (s->buffer_size-pos >= s->sector_size) { |
1aed51b973fa
Ensure we always pass a buffer of at least sector size to the read function.
reimar
parents:
32731
diff
changeset
|
225 space=s->buffer_size-pos; |
1aed51b973fa
Ensure we always pass a buffer of at least sector size to the read function.
reimar
parents:
32731
diff
changeset
|
226 } else { |
1aed51b973fa
Ensure we always pass a buffer of at least sector size to the read function.
reimar
parents:
32731
diff
changeset
|
227 space = s->sector_size; |
1aed51b973fa
Ensure we always pass a buffer of at least sector size to the read function.
reimar
parents:
32731
diff
changeset
|
228 wraparound_copy = 1; |
1aed51b973fa
Ensure we always pass a buffer of at least sector size to the read function.
reimar
parents:
32731
diff
changeset
|
229 } |
1aed51b973fa
Ensure we always pass a buffer of at least sector size to the read function.
reimar
parents:
32731
diff
changeset
|
230 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
231 |
32468 | 232 // limit one-time block size |
32529
0624fa95a2aa
Make the file protocol read up to 64 kB at once when the cache is used,
reimar
parents:
32472
diff
changeset
|
233 read_chunk = s->stream->read_chunk; |
0624fa95a2aa
Make the file protocol read up to 64 kB at once when the cache is used,
reimar
parents:
32472
diff
changeset
|
234 if (!read_chunk) read_chunk = 4*s->sector_size; |
0624fa95a2aa
Make the file protocol read up to 64 kB at once when the cache is used,
reimar
parents:
32472
diff
changeset
|
235 space = FFMIN(space, read_chunk); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
236 |
2352 | 237 #if 1 |
238 // back+newb+space <= buffer_size | |
239 back2=s->buffer_size-(space+newb); // max back size | |
240 if(s->min_filepos<(read-back2)) s->min_filepos=read-back2; | |
241 #else | |
2322 | 242 s->min_filepos=read-back; // avoid seeking-back to temp area... |
2352 | 243 #endif |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
244 |
33033
1aed51b973fa
Ensure we always pass a buffer of at least sector size to the read function.
reimar
parents:
32731
diff
changeset
|
245 if (wraparound_copy) { |
1aed51b973fa
Ensure we always pass a buffer of at least sector size to the read function.
reimar
parents:
32731
diff
changeset
|
246 int to_copy; |
1aed51b973fa
Ensure we always pass a buffer of at least sector size to the read function.
reimar
parents:
32731
diff
changeset
|
247 len = stream_read_internal(s->stream, s->stream->buffer, space); |
1aed51b973fa
Ensure we always pass a buffer of at least sector size to the read function.
reimar
parents:
32731
diff
changeset
|
248 to_copy = FFMIN(len, s->buffer_size-pos); |
1aed51b973fa
Ensure we always pass a buffer of at least sector size to the read function.
reimar
parents:
32731
diff
changeset
|
249 memcpy(s->buffer + pos, s->stream->buffer, to_copy); |
1aed51b973fa
Ensure we always pass a buffer of at least sector size to the read function.
reimar
parents:
32731
diff
changeset
|
250 memcpy(s->buffer, s->stream->buffer + to_copy, len - to_copy); |
1aed51b973fa
Ensure we always pass a buffer of at least sector size to the read function.
reimar
parents:
32731
diff
changeset
|
251 } else |
32472
5d1d67cf8718
Add internal read and seek function to avoid a useless memcpy when using
reimar
parents:
32468
diff
changeset
|
252 len = stream_read_internal(s->stream, &s->buffer[pos], space); |
31169 | 253 s->eof= !len; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
254 |
2322 | 255 s->max_filepos+=len; |
256 if(pos+len>=s->buffer_size){ | |
257 // wrap... | |
258 s->offset+=s->buffer_size; | |
259 } | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
260 |
2322 | 261 return len; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
262 |
2322 | 263 } |
264 | |
27770
c8d4cace053d
Avoid CreateThread and especially TerminateThread since they cause a memleak.
reimar
parents:
27769
diff
changeset
|
265 static int cache_execute_control(cache_vars_t *s) { |
33348 | 266 double double_res; |
267 unsigned uint_res; | |
35266
ceb148e1fe31
Change STREAM_CTRL_GET_SIZE argument type from off_t to
reimar
parents:
35169
diff
changeset
|
268 uint64_t uint64_res; |
34373
7a4dbec9415b
Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents:
34283
diff
changeset
|
269 int needs_flush = 0; |
26847
4f875ae5d538
Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents:
26833
diff
changeset
|
270 static unsigned last; |
30731
5a1ab9923c3a
Threaded cache fixes: do not free the stream_t struct twice on windows
reimar
parents:
30712
diff
changeset
|
271 int quit = s->control == -2; |
34488
01c19d9b1e83
Print an error when streams behave in a way that the cache cannot handle.
reimar
parents:
34487
diff
changeset
|
272 uint64_t old_pos = s->stream->pos; |
01c19d9b1e83
Print an error when streams behave in a way that the cache cannot handle.
reimar
parents:
34487
diff
changeset
|
273 int old_eof = s->stream->eof; |
30731
5a1ab9923c3a
Threaded cache fixes: do not free the stream_t struct twice on windows
reimar
parents:
30712
diff
changeset
|
274 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
|
275 s->stream_time_length = 0; |
33517
850a3272e10d
Change code to allow STREAM_CTRL_GET_CURRENT_TIME with cache enabled.
reimar
parents:
33512
diff
changeset
|
276 s->stream_time_pos = MP_NOPTS_VALUE; |
26897
23c3741dc490
Handle NULL control function in cache_execute_control, fixes crash with http urls.
reimar
parents:
26847
diff
changeset
|
277 s->control_res = STREAM_UNSUPPORTED; |
23c3741dc490
Handle NULL control function in cache_execute_control, fixes crash with http urls.
reimar
parents:
26847
diff
changeset
|
278 s->control = -1; |
30731
5a1ab9923c3a
Threaded cache fixes: do not free the stream_t struct twice on windows
reimar
parents:
30712
diff
changeset
|
279 return !quit; |
26897
23c3741dc490
Handle NULL control function in cache_execute_control, fixes crash with http urls.
reimar
parents:
26847
diff
changeset
|
280 } |
26847
4f875ae5d538
Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents:
26833
diff
changeset
|
281 if (GetTimerMS() - last > 99) { |
33517
850a3272e10d
Change code to allow STREAM_CTRL_GET_CURRENT_TIME with cache enabled.
reimar
parents:
33512
diff
changeset
|
282 double len, pos; |
26847
4f875ae5d538
Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents:
26833
diff
changeset
|
283 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
|
284 s->stream_time_length = len; |
4f875ae5d538
Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents:
26833
diff
changeset
|
285 else |
4f875ae5d538
Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents:
26833
diff
changeset
|
286 s->stream_time_length = 0; |
33517
850a3272e10d
Change code to allow STREAM_CTRL_GET_CURRENT_TIME with cache enabled.
reimar
parents:
33512
diff
changeset
|
287 if (s->stream->control(s->stream, STREAM_CTRL_GET_CURRENT_TIME, &pos) == STREAM_OK) |
850a3272e10d
Change code to allow STREAM_CTRL_GET_CURRENT_TIME with cache enabled.
reimar
parents:
33512
diff
changeset
|
288 s->stream_time_pos = pos; |
850a3272e10d
Change code to allow STREAM_CTRL_GET_CURRENT_TIME with cache enabled.
reimar
parents:
33512
diff
changeset
|
289 else |
850a3272e10d
Change code to allow STREAM_CTRL_GET_CURRENT_TIME with cache enabled.
reimar
parents:
33512
diff
changeset
|
290 s->stream_time_pos = MP_NOPTS_VALUE; |
34283
3a4adac4e9a5
Make cache process detect when the main process disappeared and
reimar
parents:
33868
diff
changeset
|
291 #if FORKED_CACHE |
3a4adac4e9a5
Make cache process detect when the main process disappeared and
reimar
parents:
33868
diff
changeset
|
292 // if parent PID changed, main process was killed -> exit |
3a4adac4e9a5
Make cache process detect when the main process disappeared and
reimar
parents:
33868
diff
changeset
|
293 if (s->ppid != getppid()) { |
3a4adac4e9a5
Make cache process detect when the main process disappeared and
reimar
parents:
33868
diff
changeset
|
294 mp_msg(MSGT_CACHE, MSGL_WARN, "Parent process disappeared, exiting cache process.\n"); |
3a4adac4e9a5
Make cache process detect when the main process disappeared and
reimar
parents:
33868
diff
changeset
|
295 return 0; |
3a4adac4e9a5
Make cache process detect when the main process disappeared and
reimar
parents:
33868
diff
changeset
|
296 } |
3a4adac4e9a5
Make cache process detect when the main process disappeared and
reimar
parents:
33868
diff
changeset
|
297 #endif |
26847
4f875ae5d538
Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents:
26833
diff
changeset
|
298 last = GetTimerMS(); |
4f875ae5d538
Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents:
26833
diff
changeset
|
299 } |
30731
5a1ab9923c3a
Threaded cache fixes: do not free the stream_t struct twice on windows
reimar
parents:
30712
diff
changeset
|
300 if (s->control == -1) return 1; |
26833
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
301 switch (s->control) { |
33360 | 302 case STREAM_CTRL_SEEK_TO_TIME: |
34373
7a4dbec9415b
Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents:
34283
diff
changeset
|
303 needs_flush = 1; |
33360 | 304 double_res = s->control_double_arg; |
26833
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
305 case STREAM_CTRL_GET_CURRENT_TIME: |
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
306 case STREAM_CTRL_GET_ASPECT_RATIO: |
33348 | 307 s->control_res = s->stream->control(s->stream, s->control, &double_res); |
308 s->control_double_arg = double_res; | |
26833
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
309 break; |
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
310 case STREAM_CTRL_SEEK_TO_CHAPTER: |
33360 | 311 case STREAM_CTRL_SET_ANGLE: |
34373
7a4dbec9415b
Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents:
34283
diff
changeset
|
312 needs_flush = 1; |
33360 | 313 uint_res = s->control_uint_arg; |
35164 | 314 case STREAM_CTRL_GET_NUM_TITLES: |
26833
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
315 case STREAM_CTRL_GET_NUM_CHAPTERS: |
35169
3b2c280da1af
Add new stream control command STREAM_CTRL_GET_CURRENT_TITLE for DVDs.
ib
parents:
35164
diff
changeset
|
316 case STREAM_CTRL_GET_CURRENT_TITLE: |
26833
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
317 case STREAM_CTRL_GET_CURRENT_CHAPTER: |
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
318 case STREAM_CTRL_GET_NUM_ANGLES: |
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
319 case STREAM_CTRL_GET_ANGLE: |
33348 | 320 s->control_res = s->stream->control(s->stream, s->control, &uint_res); |
321 s->control_uint_arg = uint_res; | |
26833
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
322 break; |
35013 | 323 case STREAM_CTRL_GET_SIZE: |
324 s->control_res = s->stream->control(s->stream, s->control, &uint64_res); | |
325 s->control_uint_arg = uint64_res; | |
326 break; | |
34648
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34488
diff
changeset
|
327 case STREAM_CTRL_GET_LANG: |
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34488
diff
changeset
|
328 s->control_res = s->stream->control(s->stream, s->control, (void *)&s->control_lang_arg); |
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34488
diff
changeset
|
329 break; |
26833
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
330 default: |
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
331 s->control_res = STREAM_UNSUPPORTED; |
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
332 break; |
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
333 } |
34487 | 334 if (s->control_res == STREAM_OK && needs_flush) { |
34373
7a4dbec9415b
Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents:
34283
diff
changeset
|
335 s->read_filepos = s->stream->pos; |
7a4dbec9415b
Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents:
34283
diff
changeset
|
336 s->eof = s->stream->eof; |
7a4dbec9415b
Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents:
34283
diff
changeset
|
337 cache_flush(s); |
34488
01c19d9b1e83
Print an error when streams behave in a way that the cache cannot handle.
reimar
parents:
34487
diff
changeset
|
338 } else if (needs_flush && |
01c19d9b1e83
Print an error when streams behave in a way that the cache cannot handle.
reimar
parents:
34487
diff
changeset
|
339 (old_pos != s->stream->pos || old_eof != s->stream->eof)) |
01c19d9b1e83
Print an error when streams behave in a way that the cache cannot handle.
reimar
parents:
34487
diff
changeset
|
340 mp_msg(MSGT_STREAM, MSGL_ERR, "STREAM_CTRL changed stream pos but returned error, this is not allowed!\n"); |
26833
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
341 s->control = -1; |
30731
5a1ab9923c3a
Threaded cache fixes: do not free the stream_t struct twice on windows
reimar
parents:
30712
diff
changeset
|
342 return 1; |
26833
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
343 } |
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
344 |
34704 | 345 static void *shared_alloc(int64_t size) { |
31147 | 346 #if FORKED_CACHE |
347 return shmem_alloc(size); | |
348 #else | |
349 return malloc(size); | |
350 #endif | |
351 } | |
352 | |
34704 | 353 static void shared_free(void *ptr, int64_t size) { |
31147 | 354 #if FORKED_CACHE |
355 shmem_free(ptr, size); | |
356 #else | |
357 free(ptr); | |
358 #endif | |
359 } | |
360 | |
34704 | 361 static cache_vars_t* cache_init(int64_t size,int sector){ |
362 int64_t num; | |
31147 | 363 cache_vars_t* s=shared_alloc(sizeof(cache_vars_t)); |
12899 | 364 if(s==NULL) return NULL; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
365 |
2322 | 366 memset(s,0,sizeof(cache_vars_t)); |
367 num=size/sector; | |
12835
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
368 if(num < 16){ |
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
369 num = 16; |
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
370 }//32kb min_size |
2322 | 371 s->buffer_size=num*sector; |
372 s->sector_size=sector; | |
31147 | 373 s->buffer=shared_alloc(s->buffer_size); |
12899 | 374 |
375 if(s->buffer == NULL){ | |
31147 | 376 shared_free(s, sizeof(cache_vars_t)); |
12899 | 377 return NULL; |
378 } | |
379 | |
2322 | 380 s->fill_limit=8*sector; |
12835
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
381 s->back_size=s->buffer_size/2; |
34283
3a4adac4e9a5
Make cache process detect when the main process disappeared and
reimar
parents:
33868
diff
changeset
|
382 #if FORKED_CACHE |
3a4adac4e9a5
Make cache process detect when the main process disappeared and
reimar
parents:
33868
diff
changeset
|
383 s->ppid = getpid(); |
3a4adac4e9a5
Make cache process detect when the main process disappeared and
reimar
parents:
33868
diff
changeset
|
384 #endif |
2322 | 385 return s; |
386 } | |
387 | |
9915 | 388 void cache_uninit(stream_t *s) { |
389 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
|
390 if(s->cache_pid) { |
31146 | 391 #if !FORKED_CACHE |
30353 | 392 cache_do_control(s, -2, NULL); |
26077 | 393 #else |
30353 | 394 kill(s->cache_pid,SIGKILL); |
395 waitpid(s->cache_pid,NULL,0); | |
10197 | 396 #endif |
30352 | 397 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
|
398 } |
9915 | 399 if(!c) return; |
31147 | 400 shared_free(c->buffer, c->buffer_size); |
30354 | 401 c->buffer = NULL; |
30731
5a1ab9923c3a
Threaded cache fixes: do not free the stream_t struct twice on windows
reimar
parents:
30712
diff
changeset
|
402 c->stream = NULL; |
31147 | 403 shared_free(s->cache_data, sizeof(cache_vars_t)); |
30352 | 404 s->cache_data = NULL; |
9915 | 405 } |
406 | |
33617
c77bf171b354
cache2: Surround conditionally used functions by appropriate #ifdefs.
diego
parents:
33517
diff
changeset
|
407 #if FORKED_CACHE |
2322 | 408 static void exit_sighandler(int x){ |
409 // close stream | |
410 exit(0); | |
411 } | |
412 | |
31141
3b5e8cc5e128
Add code to wake up cache process when e.g. a seek is needed.
reimar
parents:
30731
diff
changeset
|
413 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
|
414 } |
33617
c77bf171b354
cache2: Surround conditionally used functions by appropriate #ifdefs.
diego
parents:
33517
diff
changeset
|
415 #endif |
31141
3b5e8cc5e128
Add code to wake up cache process when e.g. a seek is needed.
reimar
parents:
30731
diff
changeset
|
416 |
30360
c74a5f8ffab3
Change code to allow playing a stream even if enabling the cache failed
reimar
parents:
30359
diff
changeset
|
417 /** |
31144
c2d5a1f6360b
Extract the cache main loop into a separate function.
reimar
parents:
31142
diff
changeset
|
418 * Main loop of the cache process or thread. |
c2d5a1f6360b
Extract the cache main loop into a separate function.
reimar
parents:
31142
diff
changeset
|
419 */ |
c2d5a1f6360b
Extract the cache main loop into a separate function.
reimar
parents:
31142
diff
changeset
|
420 static void cache_mainloop(cache_vars_t *s) { |
c2d5a1f6360b
Extract the cache main loop into a separate function.
reimar
parents:
31142
diff
changeset
|
421 int sleep_count = 0; |
31189
edfa98275e04
Fix cache process accidentally being killed by SIGUSR1.
reimar
parents:
31181
diff
changeset
|
422 #if FORKED_CACHE |
33835
8d3d721a0532
cache2: merge struct declaration and member assignment
diego
parents:
33823
diff
changeset
|
423 struct sigaction sa = { .sa_handler = SIG_IGN }; |
31672
61eac0d05f20
Use sigaction() instead of signal(), the latter has a unavoidable
reimar
parents:
31311
diff
changeset
|
424 sigaction(SIGUSR1, &sa, NULL); |
31189
edfa98275e04
Fix cache process accidentally being killed by SIGUSR1.
reimar
parents:
31181
diff
changeset
|
425 #endif |
31144
c2d5a1f6360b
Extract the cache main loop into a separate function.
reimar
parents:
31142
diff
changeset
|
426 do { |
c2d5a1f6360b
Extract the cache main loop into a separate function.
reimar
parents:
31142
diff
changeset
|
427 if (!cache_fill(s)) { |
31167 | 428 #if FORKED_CACHE |
429 // Let signal wake us up, we cannot leave this | |
430 // enabled since we do not handle EINTR in most places. | |
431 // This might need extra code to work on BSD. | |
31672
61eac0d05f20
Use sigaction() instead of signal(), the latter has a unavoidable
reimar
parents:
31311
diff
changeset
|
432 sa.sa_handler = dummy_sighandler; |
61eac0d05f20
Use sigaction() instead of signal(), the latter has a unavoidable
reimar
parents:
31311
diff
changeset
|
433 sigaction(SIGUSR1, &sa, NULL); |
31167 | 434 #endif |
31144
c2d5a1f6360b
Extract the cache main loop into a separate function.
reimar
parents:
31142
diff
changeset
|
435 if (sleep_count < INITIAL_FILL_USLEEP_COUNT) { |
c2d5a1f6360b
Extract the cache main loop into a separate function.
reimar
parents:
31142
diff
changeset
|
436 sleep_count++; |
c2d5a1f6360b
Extract the cache main loop into a separate function.
reimar
parents:
31142
diff
changeset
|
437 usec_sleep(INITIAL_FILL_USLEEP_TIME); |
c2d5a1f6360b
Extract the cache main loop into a separate function.
reimar
parents:
31142
diff
changeset
|
438 } else |
c2d5a1f6360b
Extract the cache main loop into a separate function.
reimar
parents:
31142
diff
changeset
|
439 usec_sleep(FILL_USLEEP_TIME); // idle |
31167 | 440 #if FORKED_CACHE |
31672
61eac0d05f20
Use sigaction() instead of signal(), the latter has a unavoidable
reimar
parents:
31311
diff
changeset
|
441 sa.sa_handler = SIG_IGN; |
61eac0d05f20
Use sigaction() instead of signal(), the latter has a unavoidable
reimar
parents:
31311
diff
changeset
|
442 sigaction(SIGUSR1, &sa, NULL); |
31167 | 443 #endif |
31144
c2d5a1f6360b
Extract the cache main loop into a separate function.
reimar
parents:
31142
diff
changeset
|
444 } else |
c2d5a1f6360b
Extract the cache main loop into a separate function.
reimar
parents:
31142
diff
changeset
|
445 sleep_count = 0; |
c2d5a1f6360b
Extract the cache main loop into a separate function.
reimar
parents:
31142
diff
changeset
|
446 } while (cache_execute_control(s)); |
c2d5a1f6360b
Extract the cache main loop into a separate function.
reimar
parents:
31142
diff
changeset
|
447 } |
c2d5a1f6360b
Extract the cache main loop into a separate function.
reimar
parents:
31142
diff
changeset
|
448 |
c2d5a1f6360b
Extract the cache main loop into a separate function.
reimar
parents:
31142
diff
changeset
|
449 /** |
30360
c74a5f8ffab3
Change code to allow playing a stream even if enabling the cache failed
reimar
parents:
30359
diff
changeset
|
450 * \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
|
451 */ |
34704 | 452 int stream_enable_cache(stream_t *stream,int64_t size,int64_t min,int64_t seek_limit){ |
25445
959fca775f43
Fix stream_cache to use sector_size set in stream_t.
ulion
parents:
24697
diff
changeset
|
453 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
|
454 int res = -1; |
5991 | 455 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
|
456 |
29888
5c39c41f38e8
Deobfuscate the special hack to disable cache for live555.
reimar
parents:
29263
diff
changeset
|
457 if (stream->flags & STREAM_NON_CACHEABLE) { |
7204 | 458 mp_msg(MSGT_CACHE,MSGL_STATUS,"\rThis stream is non-cacheable\n"); |
459 return 1; | |
460 } | |
34704 | 461 if (size > SIZE_MAX) { |
462 mp_msg(MSGT_CACHE, MSGL_FATAL, "Cache size larger than max. allocation size\n"); | |
463 return -1; | |
464 } | |
7006
c0b490505298
disable cache if stream->fd<0 (no regular file/pipe but some special thing)
arpi
parents:
5991
diff
changeset
|
465 |
5991 | 466 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
|
467 if(s == NULL) return -1; |
3562 | 468 stream->cache_data=s; |
469 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
|
470 s->seek_limit=seek_limit; |
12835
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
471 |
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
472 |
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
473 //make sure that we won't wait from cache_fill |
31181 | 474 //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
|
475 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
|
476 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
|
477 } |
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
478 if (min > s->buffer_size - s->fill_limit) { |
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
479 min = s->buffer_size - s->fill_limit; |
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
480 } |
31189
edfa98275e04
Fix cache process accidentally being killed by SIGUSR1.
reimar
parents:
31181
diff
changeset
|
481 // 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
|
482 // before continuing |
edfa98275e04
Fix cache process accidentally being killed by SIGUSR1.
reimar
parents:
31181
diff
changeset
|
483 if (min <= 0) |
edfa98275e04
Fix cache process accidentally being killed by SIGUSR1.
reimar
parents:
31181
diff
changeset
|
484 min = 1; |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
485 |
31146 | 486 #if FORKED_CACHE |
3562 | 487 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
|
488 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
|
489 stream->cache_pid = 0; |
10197 | 490 #else |
491 { | |
492 stream_t* stream2=malloc(sizeof(stream_t)); | |
493 memcpy(stream2,s->stream,sizeof(stream_t)); | |
494 s->stream=stream2; | |
27894
d06d8e459ae1
Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents:
27876
diff
changeset
|
495 #if defined(__MINGW32__) |
27770
c8d4cace053d
Avoid CreateThread and especially TerminateThread since they cause a memleak.
reimar
parents:
27769
diff
changeset
|
496 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
|
497 #elif defined(__OS2__) |
d06d8e459ae1
Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents:
27876
diff
changeset
|
498 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
|
499 #else |
27896
4c2232462353
100l, stream->cache_pid can not be used directly in pthread_create,
reimar
parents:
27894
diff
changeset
|
500 { |
4c2232462353
100l, stream->cache_pid can not be used directly in pthread_create,
reimar
parents:
27894
diff
changeset
|
501 pthread_t tid; |
4c2232462353
100l, stream->cache_pid can not be used directly in pthread_create,
reimar
parents:
27894
diff
changeset
|
502 pthread_create(&tid, NULL, ThreadProc, s); |
4c2232462353
100l, stream->cache_pid can not be used directly in pthread_create,
reimar
parents:
27894
diff
changeset
|
503 stream->cache_pid = 1; |
4c2232462353
100l, stream->cache_pid can not be used directly in pthread_create,
reimar
parents:
27894
diff
changeset
|
504 } |
26077 | 505 #endif |
10197 | 506 #endif |
30351
b985db55e78a
Check for fork failing and make sure cache_uninit always frees the cache data
reimar
parents:
29888
diff
changeset
|
507 if (!stream->cache_pid) { |
b985db55e78a
Check for fork failing and make sure cache_uninit always frees the cache data
reimar
parents:
29888
diff
changeset
|
508 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
|
509 "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
|
510 goto err_out; |
30351
b985db55e78a
Check for fork failing and make sure cache_uninit always frees the cache data
reimar
parents:
29888
diff
changeset
|
511 } |
3562 | 512 // wait until cache is filled at least prefill_init % |
34704 | 513 mp_msg(MSGT_CACHE,MSGL_V,"CACHE_PRE_INIT: %"PRId64" [%"PRId64"] %"PRId64" pre:%"PRId64" eof:%d \n", |
34706 | 514 s->min_filepos,s->read_filepos,s->max_filepos,min,s->eof); |
3562 | 515 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
|
516 mp_msg(MSGT_CACHE,MSGL_STATUS,MSGTR_CacheFill, |
3600 | 517 100.0*(float)(s->max_filepos-s->read_filepos)/(float)(s->buffer_size), |
34706 | 518 s->max_filepos-s->read_filepos |
3562 | 519 ); |
520 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
|
521 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
|
522 res = 0; |
48c51ebbe421
Always call cache_uninit to immediately free everything cache-related if we
reimar
parents:
30360
diff
changeset
|
523 goto err_out; |
48c51ebbe421
Always call cache_uninit to immediately free everything cache-related if we
reimar
parents:
30360
diff
changeset
|
524 } |
3562 | 525 } |
16870 | 526 mp_msg(MSGT_CACHE,MSGL_STATUS,"\n"); |
4825
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
3726
diff
changeset
|
527 return 1; // parent exits |
30362
48c51ebbe421
Always call cache_uninit to immediately free everything cache-related if we
reimar
parents:
30360
diff
changeset
|
528 |
48c51ebbe421
Always call cache_uninit to immediately free everything cache-related if we
reimar
parents:
30360
diff
changeset
|
529 err_out: |
48c51ebbe421
Always call cache_uninit to immediately free everything cache-related if we
reimar
parents:
30360
diff
changeset
|
530 cache_uninit(stream); |
48c51ebbe421
Always call cache_uninit to immediately free everything cache-related if we
reimar
parents:
30360
diff
changeset
|
531 return res; |
3562 | 532 } |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
533 |
31146 | 534 #if FORKED_CACHE |
2322 | 535 signal(SIGTERM,exit_sighandler); // kill |
31144
c2d5a1f6360b
Extract the cache main loop into a separate function.
reimar
parents:
31142
diff
changeset
|
536 cache_mainloop(s); |
30355
ca3e3df28fe2
Add an exit() to silence a gcc warning and ensure forked code will never
reimar
parents:
30354
diff
changeset
|
537 // 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
|
538 exit(0); |
30712
75903ab49159
Restructure #ifs to be clearer, also ensures that we return from the thread
reimar
parents:
30691
diff
changeset
|
539 #endif |
2322 | 540 } |
541 | |
31146 | 542 #if !FORKED_CACHE |
543 #if defined(__MINGW32__) || defined(__OS2__) | |
544 static void ThreadProc( void *s ){ | |
545 cache_mainloop(s); | |
546 _endthread(); | |
547 } | |
548 #else | |
31145
47d2e52f61b4
Try reducing the #ifdef mess for the different cache variants.
reimar
parents:
31144
diff
changeset
|
549 static void *ThreadProc( void *s ){ |
47d2e52f61b4
Try reducing the #ifdef mess for the different cache variants.
reimar
parents:
31144
diff
changeset
|
550 cache_mainloop(s); |
47d2e52f61b4
Try reducing the #ifdef mess for the different cache variants.
reimar
parents:
31144
diff
changeset
|
551 return NULL; |
47d2e52f61b4
Try reducing the #ifdef mess for the different cache variants.
reimar
parents:
31144
diff
changeset
|
552 } |
31146 | 553 #endif |
31145
47d2e52f61b4
Try reducing the #ifdef mess for the different cache variants.
reimar
parents:
31144
diff
changeset
|
554 #endif |
47d2e52f61b4
Try reducing the #ifdef mess for the different cache variants.
reimar
parents:
31144
diff
changeset
|
555 |
2322 | 556 int cache_stream_fill_buffer(stream_t *s){ |
557 int len; | |
31835
73f85fc599e0
Add sanity-check for sector size to avoid strange crashes if it is
reimar
parents:
31828
diff
changeset
|
558 int sector_size; |
2322 | 559 if(!s->cache_pid) return stream_fill_buffer(s); |
560 | |
2371 | 561 if(s->pos!=((cache_vars_t*)s->cache_data)->read_filepos) mp_msg(MSGT_CACHE,MSGL_ERR,"!!! read_filepos differs!!! report this bug...\n"); |
31835
73f85fc599e0
Add sanity-check for sector size to avoid strange crashes if it is
reimar
parents:
31828
diff
changeset
|
562 sector_size = ((cache_vars_t*)s->cache_data)->sector_size; |
73f85fc599e0
Add sanity-check for sector size to avoid strange crashes if it is
reimar
parents:
31828
diff
changeset
|
563 if (sector_size > STREAM_MAX_SECTOR_SIZE) { |
73f85fc599e0
Add sanity-check for sector size to avoid strange crashes if it is
reimar
parents:
31828
diff
changeset
|
564 mp_msg(MSGT_CACHE, MSGL_ERR, "Sector size %i larger than maximum %i\n", sector_size, STREAM_MAX_SECTOR_SIZE); |
73f85fc599e0
Add sanity-check for sector size to avoid strange crashes if it is
reimar
parents:
31828
diff
changeset
|
565 sector_size = STREAM_MAX_SECTOR_SIZE; |
73f85fc599e0
Add sanity-check for sector size to avoid strange crashes if it is
reimar
parents:
31828
diff
changeset
|
566 } |
2327 | 567 |
31835
73f85fc599e0
Add sanity-check for sector size to avoid strange crashes if it is
reimar
parents:
31828
diff
changeset
|
568 len=cache_read(s->cache_data,s->buffer, sector_size); |
2352 | 569 //printf("cache_stream_fill_buffer->read -> %d\n",len); |
2327 | 570 |
2322 | 571 if(len<=0){ s->eof=1; s->buf_pos=s->buf_len=0; return 0; } |
31169 | 572 s->eof=0; |
2322 | 573 s->buf_pos=0; |
574 s->buf_len=len; | |
575 s->pos+=len; | |
576 // printf("[%d]",len);fflush(stdout); | |
32438
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32037
diff
changeset
|
577 if (s->capture_file) |
faefba58f413
Implement a basic capture feature, available through -capture.
diego
parents:
32037
diff
changeset
|
578 stream_capture_do(s); |
2322 | 579 return len; |
580 | |
581 } | |
582 | |
32731
005b026b1231
Convert cache_fill_status into a function so we always get the latest state,
reimar
parents:
32728
diff
changeset
|
583 int cache_fill_status(stream_t *s) { |
005b026b1231
Convert cache_fill_status into a function so we always get the latest state,
reimar
parents:
32728
diff
changeset
|
584 cache_vars_t *cv; |
005b026b1231
Convert cache_fill_status into a function so we always get the latest state,
reimar
parents:
32728
diff
changeset
|
585 if (!s || !s->cache_data) |
005b026b1231
Convert cache_fill_status into a function so we always get the latest state,
reimar
parents:
32728
diff
changeset
|
586 return -1; |
005b026b1231
Convert cache_fill_status into a function so we always get the latest state,
reimar
parents:
32728
diff
changeset
|
587 cv = s->cache_data; |
005b026b1231
Convert cache_fill_status into a function so we always get the latest state,
reimar
parents:
32728
diff
changeset
|
588 return (cv->max_filepos-cv->read_filepos)/(cv->buffer_size / 100); |
005b026b1231
Convert cache_fill_status into a function so we always get the latest state,
reimar
parents:
32728
diff
changeset
|
589 } |
005b026b1231
Convert cache_fill_status into a function so we always get the latest state,
reimar
parents:
32728
diff
changeset
|
590 |
34705 | 591 int cache_stream_seek_long(stream_t *stream,int64_t pos){ |
2352 | 592 cache_vars_t* s; |
34705 | 593 int64_t newpos; |
2352 | 594 if(!stream->cache_pid) return stream_seek_long(stream,pos); |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
595 |
2352 | 596 s=stream->cache_data; |
597 // s->seek_lock=1; | |
29263
0f1b5b68af32
whitespace cosmetics: Remove all trailing whitespace.
diego
parents:
28014
diff
changeset
|
598 |
17366 | 599 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 | 600 |
2352 | 601 newpos=pos/s->sector_size; newpos*=s->sector_size; // align |
602 stream->pos=s->read_filepos=newpos; | |
603 s->eof=0; // !!!!!!! | |
31141
3b5e8cc5e128
Add code to wake up cache process when e.g. a seek is needed.
reimar
parents:
30731
diff
changeset
|
604 cache_wakeup(stream); |
2352 | 605 |
606 cache_stream_fill_buffer(stream); | |
2322 | 607 |
2352 | 608 pos-=newpos; |
609 if(pos>=0 && pos<=stream->buf_len){ | |
610 stream->buf_pos=pos; // byte position in sector | |
611 return 1; | |
612 } | |
613 | |
614 // stream->buf_pos=stream->buf_len=0; | |
615 // return 1; | |
616 | |
34706 | 617 mp_msg(MSGT_CACHE,MSGL_V,"cache_stream_seek: WARNING! Can't seek to 0x%"PRIX64" !\n",pos+newpos); |
2322 | 618 return 0; |
619 } | |
26833
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
620 |
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
621 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
|
622 int sleep_count = 0; |
34373
7a4dbec9415b
Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents:
34283
diff
changeset
|
623 int pos_change = 0; |
26833
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
624 cache_vars_t* s = stream->cache_data; |
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
625 switch (cmd) { |
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
626 case STREAM_CTRL_SEEK_TO_TIME: |
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
627 s->control_double_arg = *(double *)arg; |
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
628 s->control = cmd; |
34373
7a4dbec9415b
Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents:
34283
diff
changeset
|
629 pos_change = 1; |
26833
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
630 break; |
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
631 case STREAM_CTRL_SEEK_TO_CHAPTER: |
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
632 case STREAM_CTRL_SET_ANGLE: |
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
633 s->control_uint_arg = *(unsigned *)arg; |
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
634 s->control = cmd; |
34373
7a4dbec9415b
Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents:
34283
diff
changeset
|
635 pos_change = 1; |
26833
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
636 break; |
33517
850a3272e10d
Change code to allow STREAM_CTRL_GET_CURRENT_TIME with cache enabled.
reimar
parents:
33512
diff
changeset
|
637 // the core might call these every frame, so cache them... |
26847
4f875ae5d538
Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents:
26833
diff
changeset
|
638 case STREAM_CTRL_GET_TIME_LENGTH: |
4f875ae5d538
Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents:
26833
diff
changeset
|
639 *(double *)arg = s->stream_time_length; |
4f875ae5d538
Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents:
26833
diff
changeset
|
640 return s->stream_time_length ? STREAM_OK : STREAM_UNSUPPORTED; |
33517
850a3272e10d
Change code to allow STREAM_CTRL_GET_CURRENT_TIME with cache enabled.
reimar
parents:
33512
diff
changeset
|
641 case STREAM_CTRL_GET_CURRENT_TIME: |
850a3272e10d
Change code to allow STREAM_CTRL_GET_CURRENT_TIME with cache enabled.
reimar
parents:
33512
diff
changeset
|
642 *(double *)arg = s->stream_time_pos; |
850a3272e10d
Change code to allow STREAM_CTRL_GET_CURRENT_TIME with cache enabled.
reimar
parents:
33512
diff
changeset
|
643 return s->stream_time_pos != MP_NOPTS_VALUE ? STREAM_OK : STREAM_UNSUPPORTED; |
34648
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34488
diff
changeset
|
644 case STREAM_CTRL_GET_LANG: |
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34488
diff
changeset
|
645 s->control_lang_arg = *(struct stream_lang_req *)arg; |
35164 | 646 case STREAM_CTRL_GET_NUM_TITLES: |
26924
ca50c4a72f68
100l, fix wrong order of cases in cache_do_control
reimar
parents:
26897
diff
changeset
|
647 case STREAM_CTRL_GET_NUM_CHAPTERS: |
35169
3b2c280da1af
Add new stream control command STREAM_CTRL_GET_CURRENT_TITLE for DVDs.
ib
parents:
35164
diff
changeset
|
648 case STREAM_CTRL_GET_CURRENT_TITLE: |
26924
ca50c4a72f68
100l, fix wrong order of cases in cache_do_control
reimar
parents:
26897
diff
changeset
|
649 case STREAM_CTRL_GET_CURRENT_CHAPTER: |
26833
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
650 case STREAM_CTRL_GET_ASPECT_RATIO: |
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
651 case STREAM_CTRL_GET_NUM_ANGLES: |
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
652 case STREAM_CTRL_GET_ANGLE: |
35013 | 653 case STREAM_CTRL_GET_SIZE: |
27770
c8d4cace053d
Avoid CreateThread and especially TerminateThread since they cause a memleak.
reimar
parents:
27769
diff
changeset
|
654 case -2: |
26833
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
655 s->control = cmd; |
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
656 break; |
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
657 default: |
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
658 return STREAM_UNSUPPORTED; |
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
659 } |
31141
3b5e8cc5e128
Add code to wake up cache process when e.g. a seek is needed.
reimar
parents:
30731
diff
changeset
|
660 cache_wakeup(stream); |
31190
8432358f2d32
Improve handling of cache process/thread hanging/being killed.
reimar
parents:
31189
diff
changeset
|
661 while (s->control != -1) { |
8432358f2d32
Improve handling of cache process/thread hanging/being killed.
reimar
parents:
31189
diff
changeset
|
662 if (sleep_count++ == 1000) |
33867
76b818cbb359
Mark two warnings that usually only indicate a performance issue as such.
reimar
parents:
33835
diff
changeset
|
663 mp_msg(MSGT_CACHE, MSGL_WARN, "Cache not responding! [performance issue]\n"); |
31190
8432358f2d32
Improve handling of cache process/thread hanging/being killed.
reimar
parents:
31189
diff
changeset
|
664 if (stream_check_interrupt(CONTROL_SLEEP_TIME)) { |
8432358f2d32
Improve handling of cache process/thread hanging/being killed.
reimar
parents:
31189
diff
changeset
|
665 s->eof = 1; |
8432358f2d32
Improve handling of cache process/thread hanging/being killed.
reimar
parents:
31189
diff
changeset
|
666 return STREAM_UNSUPPORTED; |
8432358f2d32
Improve handling of cache process/thread hanging/being killed.
reimar
parents:
31189
diff
changeset
|
667 } |
8432358f2d32
Improve handling of cache process/thread hanging/being killed.
reimar
parents:
31189
diff
changeset
|
668 } |
34487 | 669 if (s->control_res != STREAM_OK) |
670 return s->control_res; | |
671 // We cannot do this on failure, since this would cause the | |
672 // stream position to jump when e.g. STREAM_CTRL_SEEK_TO_TIME | |
673 // is unsupported - but in that case we need the old value | |
674 // to do the fallback seek. | |
675 // This unfortunately can lead to slightly different behaviour | |
676 // with and without cache if the protocol changes pos even | |
677 // when an error happened. | |
34373
7a4dbec9415b
Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents:
34283
diff
changeset
|
678 if (pos_change) { |
7a4dbec9415b
Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents:
34283
diff
changeset
|
679 stream->pos = s->read_filepos; |
7a4dbec9415b
Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents:
34283
diff
changeset
|
680 stream->eof = s->eof; |
7a4dbec9415b
Flush cache and sync stream position/eof after seeking STREAM_CTRLs.
reimar
parents:
34283
diff
changeset
|
681 } |
26833
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
682 switch (cmd) { |
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
683 case STREAM_CTRL_GET_TIME_LENGTH: |
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
684 case STREAM_CTRL_GET_CURRENT_TIME: |
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
685 case STREAM_CTRL_GET_ASPECT_RATIO: |
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
686 *(double *)arg = s->control_double_arg; |
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
687 break; |
35164 | 688 case STREAM_CTRL_GET_NUM_TITLES: |
26833
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
689 case STREAM_CTRL_GET_NUM_CHAPTERS: |
35169
3b2c280da1af
Add new stream control command STREAM_CTRL_GET_CURRENT_TITLE for DVDs.
ib
parents:
35164
diff
changeset
|
690 case STREAM_CTRL_GET_CURRENT_TITLE: |
26833
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
691 case STREAM_CTRL_GET_CURRENT_CHAPTER: |
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
692 case STREAM_CTRL_GET_NUM_ANGLES: |
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
693 case STREAM_CTRL_GET_ANGLE: |
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
694 *(unsigned *)arg = s->control_uint_arg; |
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
695 break; |
35013 | 696 case STREAM_CTRL_GET_SIZE: |
35266
ceb148e1fe31
Change STREAM_CTRL_GET_SIZE argument type from off_t to
reimar
parents:
35169
diff
changeset
|
697 *(uint64_t *)arg = s->control_uint_arg; |
35013 | 698 break; |
34648
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34488
diff
changeset
|
699 case STREAM_CTRL_GET_LANG: |
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34488
diff
changeset
|
700 *(struct stream_lang_req *)arg = s->control_lang_arg; |
26eddbd6353a
Code cleanup: Use a stream_control instead of global functions to
reimar
parents:
34488
diff
changeset
|
701 break; |
26833
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
702 } |
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
703 return s->control_res; |
77003eb2d9a8
Add basic support for stream controls with cache enabled.
reimar
parents:
26326
diff
changeset
|
704 } |