annotate stream/cache2.c @ 30626:27b133678bbd

Do not discard stream buffer on eof, instead reuse it to slightly improve format autodetection with -nocache and non-seekable streams.
author reimar
date Sat, 20 Feb 2010 18:53:07 +0000
parents 74a6c2a3dcce
children f73aca2453a3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
0e4210657f0e ehh. include config.h... 10l
arpi
parents: 2322
diff changeset
19 #include "config.h"
0e4210657f0e ehh. include config.h... 10l
arpi
parents: 2322
diff changeset
20
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
21 // Initial draft of my new cache system...
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
22 // Note it runs in 2 processes (using fork()), but doesn't requires locking!!
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
23 // TODO: seeking, data consistency checking
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
24
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
25 #define READ_USLEEP_TIME 10000
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
26 #define FILL_USLEEP_TIME 50000
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 3726
diff changeset
27 #define PREFILL_SLEEP_TIME 200
26833
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
28 #define CONTROL_SLEEP_TIME 0
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
29
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
30 #include <stdio.h>
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
31 #include <stdlib.h>
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
32 #include <string.h>
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
33 #include <signal.h>
3726
1acf2f1f9dc8 missing #include's
pl
parents: 3600
diff changeset
34 #include <sys/types.h>
1acf2f1f9dc8 missing #include's
pl
parents: 3600
diff changeset
35 #include <unistd.h>
30351
b985db55e78a Check for fork failing and make sure cache_uninit always frees the cache data
reimar
parents: 29888
diff changeset
36 #include <errno.h>
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
37
27723
fb67a8f56bfc Unconditionally #include osdep/shem.h, fixes the warnings on Cygwin:
diego
parents: 27343
diff changeset
38 #include "osdep/shmem.h"
17012
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 16870
diff changeset
39 #include "osdep/timer.h"
27894
d06d8e459ae1 Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents: 27876
diff changeset
40 #if defined(__MINGW32__)
26077
d8128689c031 cache support for OS/2
diego
parents: 25445
diff changeset
41 #include <windows.h>
27770
c8d4cace053d Avoid CreateThread and especially TerminateThread since they cause a memleak.
reimar
parents: 27769
diff changeset
42 static void ThreadProc( void *s );
26077
d8128689c031 cache support for OS/2
diego
parents: 25445
diff changeset
43 #elif defined(__OS2__)
d8128689c031 cache support for OS/2
diego
parents: 25445
diff changeset
44 #define INCL_DOS
d8128689c031 cache support for OS/2
diego
parents: 25445
diff changeset
45 #include <os2.h>
27756
1266470a5651 Revert declaring ThreadProc as void, it breaks the WINAPI.
diego
parents: 27727
diff changeset
46 static void ThreadProc( void *s );
27894
d06d8e459ae1 Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents: 27876
diff changeset
47 #elif defined(PTHREAD_CACHE)
d06d8e459ae1 Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents: 27876
diff changeset
48 #include <pthread.h>
d06d8e459ae1 Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents: 27876
diff changeset
49 static void *ThreadProc(void *s);
26077
d8128689c031 cache support for OS/2
diego
parents: 25445
diff changeset
50 #else
10242
4e34d468f549 warning fixes by Dominik
alex
parents: 10197
diff changeset
51 #include <sys/wait.h>
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
52 #endif
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
53
2371
0f2cad867121 printf->mp_msg
arpi
parents: 2352
diff changeset
54 #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
55 #include "help_mp.h"
2371
0f2cad867121 printf->mp_msg
arpi
parents: 2352
diff changeset
56
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
57 #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
58 #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
59 extern int use_gui;
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
60
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
61 int stream_fill_buffer(stream_t *s);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
62 int stream_seek_long(stream_t *s,off_t pos);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
63
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
64 typedef struct {
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
65 // constats:
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
66 unsigned char *buffer; // base pointer of the alllocated buffer memory
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
67 int buffer_size; // size of the alllocated buffer memory
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
68 int sector_size; // size of a single sector (2048/2324)
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
69 int back_size; // we should keep back_size amount of old bytes for backward seek
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
70 int fill_limit; // we should fill buffer only if space>=fill_limit
16152
10a69a812eff remove unused cache-prefill and create cache-seek-min that controls when seek_long is prefered over waiting for cache to fill
iive
parents: 12899
diff changeset
71 int seek_limit; // keep filling cache if distanse is less that seek limit
2374
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
72 // filler's pointers:
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
73 int eof;
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
74 off_t min_filepos; // buffer contain only a part of the file, from min-max pos
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
75 off_t max_filepos;
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
76 off_t offset; // filepos <-> bufferpos offset value (filepos of the buffer's first byte)
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
77 // reader's pointers:
2374
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
78 off_t read_filepos;
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
79 // commands/locking:
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
80 // int seek_lock; // 1 if we will seek/reset buffer, 2 if we are ready for cmd
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
81 // int fifo_flag; // 1 if we should use FIFO to notice cache about buffer reads.
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
82 // callback
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
83 stream_t* stream;
26833
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
84 volatile int control;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
85 volatile unsigned control_uint_arg;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
86 volatile double control_double_arg;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
87 volatile int control_res;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
88 volatile off_t control_new_pos;
26847
4f875ae5d538 Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents: 26833
diff changeset
89 volatile double stream_time_length;
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
90 } cache_vars_t;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
91
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
92 static int min_fill=0;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
93
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
94 int cache_fill_status=0;
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
95
30557
74a6c2a3dcce stream: Mark functions not used outside of their files as static.
diego
parents: 30426
diff changeset
96 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
97 {
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
98 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
99 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
100 mp_msg(MSGT_CACHE,MSGL_INFO,"%3d %% (%3d%%)\n",100*newb/s->buffer_size,100*min_fill/s->buffer_size);
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
101 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
102
30557
74a6c2a3dcce stream: Mark functions not used outside of their files as static.
diego
parents: 30426
diff changeset
103 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
104 {
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
105 int total=0;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
106 while(size>0){
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
107 int pos,newb,len;
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
108
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
109 //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
110
2374
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
111 if(s->read_filepos>=s->max_filepos || s->read_filepos<s->min_filepos){
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
112 // eof?
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
113 if(s->eof) break;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
114 // waiting for buffer fill...
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
115 usec_sleep(READ_USLEEP_TIME); // 10ms
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
116 continue; // try again...
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
117 }
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
118
2374
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
119 newb=s->max_filepos-s->read_filepos; // new bytes in the buffer
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
120 if(newb<min_fill) min_fill=newb; // statistics...
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
121
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
122 // printf("*** newb: %d bytes ***\n",newb);
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
123
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
124 pos=s->read_filepos - s->offset;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
125 if(pos<0) pos+=s->buffer_size; else
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
126 if(pos>=s->buffer_size) pos-=s->buffer_size;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
127
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
128 if(newb>s->buffer_size-pos) newb=s->buffer_size-pos; // handle wrap...
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
129 if(newb>size) newb=size;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28014
diff changeset
130
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
131 // check:
2371
0f2cad867121 printf->mp_msg
arpi
parents: 2352
diff changeset
132 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
133
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
134 // len=write(mem,newb)
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
135 //printf("Buffer read: %d bytes\n",newb);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
136 memcpy(buf,&s->buffer[pos],newb);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
137 buf+=newb;
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
138 len=newb;
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
139 // ...
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28014
diff changeset
140
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
141 s->read_filepos+=len;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
142 size-=len;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
143 total+=len;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28014
diff changeset
144
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
145 }
18067
ac7eaa0313c2 avoid cache fill status overflow with caches > ca. 20 MB
reimar
parents: 17384
diff changeset
146 cache_fill_status=(s->max_filepos-s->read_filepos)/(s->buffer_size / 100);
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
147 return total;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
148 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
149
30557
74a6c2a3dcce stream: Mark functions not used outside of their files as static.
diego
parents: 30426
diff changeset
150 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
151 {
7472
c4434bdf6e51 tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
arpi
parents: 7204
diff changeset
152 int back,back2,newb,space,len,pos;
2374
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
153 off_t read=s->read_filepos;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28014
diff changeset
154
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
155 if(read<s->min_filepos || read>s->max_filepos){
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
156 // seek...
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17012
diff changeset
157 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
158 // 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
159 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
160 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
161 {
fc21a94f98c6 do not discard cache content at seeking type=STREAMTYPE_STREAM
arpi
parents: 7862
diff changeset
162 s->offset= // FIXME!?
fc21a94f98c6 do not discard cache content at seeking type=STREAMTYPE_STREAM
arpi
parents: 7862
diff changeset
163 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
164 if(s->stream->eof) stream_reset(s->stream);
fc21a94f98c6 do not discard cache content at seeking type=STREAMTYPE_STREAM
arpi
parents: 7862
diff changeset
165 stream_seek(s->stream,read);
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17012
diff changeset
166 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
167 }
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
168 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28014
diff changeset
169
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
170 // calc number of back-bytes:
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
171 back=read - s->min_filepos;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
172 if(back<0) back=0; // strange...
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
173 if(back>s->back_size) back=s->back_size;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28014
diff changeset
174
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
175 // calc number of new bytes:
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
176 newb=s->max_filepos - read;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
177 if(newb<0) newb=0; // strange...
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
178
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
179 // calc free buffer space:
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
180 space=s->buffer_size - (newb+back);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28014
diff changeset
181
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
182 // calc bufferpos:
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
183 pos=s->max_filepos - s->offset;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
184 if(pos>=s->buffer_size) pos-=s->buffer_size; // wrap-around
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28014
diff changeset
185
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
186 if(space<s->fill_limit){
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
187 // printf("Buffer is full (%d bytes free, limit: %d)\n",space,s->fill_limit);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
188 return 0; // no fill...
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
189 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
190
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
191 // 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
192
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
193 // reduce space if needed:
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
194 if(space>s->buffer_size-pos) space=s->buffer_size-pos;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28014
diff changeset
195
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
196 // if(space>32768) space=32768; // limit one-time block size
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
197 if(space>4*s->sector_size) space=4*s->sector_size;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28014
diff changeset
198
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
199 // if(s->seek_lock) return 0; // FIXME
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
200
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
201 #if 1
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
202 // back+newb+space <= buffer_size
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
203 back2=s->buffer_size-(space+newb); // max back size
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
204 if(s->min_filepos<(read-back2)) s->min_filepos=read-back2;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
205 #else
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
206 s->min_filepos=read-back; // avoid seeking-back to temp area...
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
207 #endif
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28014
diff changeset
208
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
209 // ....
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
210 //printf("Buffer fill: %d bytes of %d\n",space,s->buffer_size);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
211 //len=stream_fill_buffer(s->stream);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
212 //memcpy(&s->buffer[pos],s->stream->buffer,len); // avoid this extra copy!
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
213 // ....
2348
76778e307ddc EOF bug fixed
arpi
parents: 2327
diff changeset
214 len=stream_read(s->stream,&s->buffer[pos],space);
76778e307ddc EOF bug fixed
arpi
parents: 2327
diff changeset
215 if(!len) s->eof=1;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28014
diff changeset
216
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
217 s->max_filepos+=len;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
218 if(pos+len>=s->buffer_size){
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
219 // wrap...
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
220 s->offset+=s->buffer_size;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
221 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28014
diff changeset
222
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
223 return len;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28014
diff changeset
224
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
225 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
226
27770
c8d4cace053d Avoid CreateThread and especially TerminateThread since they cause a memleak.
reimar
parents: 27769
diff changeset
227 static int cache_execute_control(cache_vars_t *s) {
c8d4cace053d Avoid CreateThread and especially TerminateThread since they cause a memleak.
reimar
parents: 27769
diff changeset
228 int res = 1;
26847
4f875ae5d538 Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents: 26833
diff changeset
229 static unsigned last;
26897
23c3741dc490 Handle NULL control function in cache_execute_control, fixes crash with http urls.
reimar
parents: 26847
diff changeset
230 if (!s->stream->control) {
23c3741dc490 Handle NULL control function in cache_execute_control, fixes crash with http urls.
reimar
parents: 26847
diff changeset
231 s->stream_time_length = 0;
23c3741dc490 Handle NULL control function in cache_execute_control, fixes crash with http urls.
reimar
parents: 26847
diff changeset
232 s->control_new_pos = 0;
23c3741dc490 Handle NULL control function in cache_execute_control, fixes crash with http urls.
reimar
parents: 26847
diff changeset
233 s->control_res = STREAM_UNSUPPORTED;
23c3741dc490 Handle NULL control function in cache_execute_control, fixes crash with http urls.
reimar
parents: 26847
diff changeset
234 s->control = -1;
27770
c8d4cace053d Avoid CreateThread and especially TerminateThread since they cause a memleak.
reimar
parents: 27769
diff changeset
235 return res;
26897
23c3741dc490 Handle NULL control function in cache_execute_control, fixes crash with http urls.
reimar
parents: 26847
diff changeset
236 }
26847
4f875ae5d538 Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents: 26833
diff changeset
237 if (GetTimerMS() - last > 99) {
4f875ae5d538 Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents: 26833
diff changeset
238 double len;
4f875ae5d538 Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents: 26833
diff changeset
239 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
240 s->stream_time_length = len;
4f875ae5d538 Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents: 26833
diff changeset
241 else
4f875ae5d538 Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents: 26833
diff changeset
242 s->stream_time_length = 0;
4f875ae5d538 Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents: 26833
diff changeset
243 last = GetTimerMS();
4f875ae5d538 Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents: 26833
diff changeset
244 }
27770
c8d4cace053d Avoid CreateThread and especially TerminateThread since they cause a memleak.
reimar
parents: 27769
diff changeset
245 if (s->control == -1) return res;
26833
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
246 switch (s->control) {
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
247 case STREAM_CTRL_GET_CURRENT_TIME:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
248 case STREAM_CTRL_SEEK_TO_TIME:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
249 case STREAM_CTRL_GET_ASPECT_RATIO:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
250 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
251 break;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
252 case STREAM_CTRL_SEEK_TO_CHAPTER:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
253 case STREAM_CTRL_GET_NUM_CHAPTERS:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
254 case STREAM_CTRL_GET_CURRENT_CHAPTER:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
255 case STREAM_CTRL_GET_NUM_ANGLES:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
256 case STREAM_CTRL_GET_ANGLE:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
257 case STREAM_CTRL_SET_ANGLE:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
258 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
259 break;
27770
c8d4cace053d Avoid CreateThread and especially TerminateThread since they cause a memleak.
reimar
parents: 27769
diff changeset
260 case -2:
c8d4cace053d Avoid CreateThread and especially TerminateThread since they cause a memleak.
reimar
parents: 27769
diff changeset
261 res = 0;
26833
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
262 default:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
263 s->control_res = STREAM_UNSUPPORTED;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
264 break;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
265 }
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
266 s->control_new_pos = s->stream->pos;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
267 s->control = -1;
27770
c8d4cace053d Avoid CreateThread and especially TerminateThread since they cause a memleak.
reimar
parents: 27769
diff changeset
268 return res;
26833
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
269 }
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
270
30359
44b8f698fd15 Make cache_init static, it is not used outside this file
reimar
parents: 30355
diff changeset
271 static cache_vars_t* cache_init(int size,int sector){
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
272 int num;
27894
d06d8e459ae1 Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents: 27876
diff changeset
273 #if !defined(__MINGW32__) && !defined(PTHREAD_CACHE) && !defined(__OS2__)
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
274 cache_vars_t* s=shmem_alloc(sizeof(cache_vars_t));
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
275 #else
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
276 cache_vars_t* s=malloc(sizeof(cache_vars_t));
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
277 #endif
12899
061dd89b6a23 prevent segfault on shmem failer
iive
parents: 12835
diff changeset
278 if(s==NULL) return NULL;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28014
diff changeset
279
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
280 memset(s,0,sizeof(cache_vars_t));
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
281 num=size/sector;
12835
4235ae5a2d60 cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents: 10272
diff changeset
282 if(num < 16){
4235ae5a2d60 cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents: 10272
diff changeset
283 num = 16;
4235ae5a2d60 cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents: 10272
diff changeset
284 }//32kb min_size
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
285 s->buffer_size=num*sector;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
286 s->sector_size=sector;
27894
d06d8e459ae1 Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents: 27876
diff changeset
287 #if !defined(__MINGW32__) && !defined(PTHREAD_CACHE) && !defined(__OS2__)
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
288 s->buffer=shmem_alloc(s->buffer_size);
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
289 #else
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
290 s->buffer=malloc(s->buffer_size);
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
291 #endif
12899
061dd89b6a23 prevent segfault on shmem failer
iive
parents: 12835
diff changeset
292
061dd89b6a23 prevent segfault on shmem failer
iive
parents: 12835
diff changeset
293 if(s->buffer == NULL){
27894
d06d8e459ae1 Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents: 27876
diff changeset
294 #if !defined(__MINGW32__) && !defined(PTHREAD_CACHE) && !defined(__OS2__)
12899
061dd89b6a23 prevent segfault on shmem failer
iive
parents: 12835
diff changeset
295 shmem_free(s,sizeof(cache_vars_t));
061dd89b6a23 prevent segfault on shmem failer
iive
parents: 12835
diff changeset
296 #else
061dd89b6a23 prevent segfault on shmem failer
iive
parents: 12835
diff changeset
297 free(s);
061dd89b6a23 prevent segfault on shmem failer
iive
parents: 12835
diff changeset
298 #endif
061dd89b6a23 prevent segfault on shmem failer
iive
parents: 12835
diff changeset
299 return NULL;
061dd89b6a23 prevent segfault on shmem failer
iive
parents: 12835
diff changeset
300 }
061dd89b6a23 prevent segfault on shmem failer
iive
parents: 12835
diff changeset
301
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
302 s->fill_limit=8*sector;
12835
4235ae5a2d60 cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents: 10272
diff changeset
303 s->back_size=s->buffer_size/2;
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
304 return s;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
305 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
306
9915
eabe876ab5e2 Fix cache uninit
albeu
parents: 9380
diff changeset
307 void cache_uninit(stream_t *s) {
eabe876ab5e2 Fix cache uninit
albeu
parents: 9380
diff changeset
308 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
309 if(s->cache_pid) {
27894
d06d8e459ae1 Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents: 27876
diff changeset
310 #if defined(__MINGW32__) || defined(PTHREAD_CACHE) || defined(__OS2__)
30353
3c131287a33e Reindent.
reimar
parents: 30352
diff changeset
311 cache_do_control(s, -2, NULL);
26077
d8128689c031 cache support for OS/2
diego
parents: 25445
diff changeset
312 #else
30353
3c131287a33e Reindent.
reimar
parents: 30352
diff changeset
313 kill(s->cache_pid,SIGKILL);
3c131287a33e Reindent.
reimar
parents: 30352
diff changeset
314 waitpid(s->cache_pid,NULL,0);
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
315 #endif
30352
dff74677e2fd Zero freed pointers.
reimar
parents: 30351
diff changeset
316 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
317 }
9915
eabe876ab5e2 Fix cache uninit
albeu
parents: 9380
diff changeset
318 if(!c) return;
27894
d06d8e459ae1 Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents: 27876
diff changeset
319 #if defined(__MINGW32__) || defined(PTHREAD_CACHE) || defined(__OS2__)
26077
d8128689c031 cache support for OS/2
diego
parents: 25445
diff changeset
320 free(c->stream);
d8128689c031 cache support for OS/2
diego
parents: 25445
diff changeset
321 free(c->buffer);
30354
1b2de14c5233 100l, shouldn't write to memory after freeing it.
reimar
parents: 30353
diff changeset
322 c->buffer = NULL;
26077
d8128689c031 cache support for OS/2
diego
parents: 25445
diff changeset
323 free(s->cache_data);
d8128689c031 cache support for OS/2
diego
parents: 25445
diff changeset
324 #else
9915
eabe876ab5e2 Fix cache uninit
albeu
parents: 9380
diff changeset
325 shmem_free(c->buffer,c->buffer_size);
30354
1b2de14c5233 100l, shouldn't write to memory after freeing it.
reimar
parents: 30353
diff changeset
326 c->buffer = NULL;
9915
eabe876ab5e2 Fix cache uninit
albeu
parents: 9380
diff changeset
327 shmem_free(s->cache_data,sizeof(cache_vars_t));
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
328 #endif
30352
dff74677e2fd Zero freed pointers.
reimar
parents: 30351
diff changeset
329 s->cache_data = NULL;
9915
eabe876ab5e2 Fix cache uninit
albeu
parents: 9380
diff changeset
330 }
eabe876ab5e2 Fix cache uninit
albeu
parents: 9380
diff changeset
331
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
332 static void exit_sighandler(int x){
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
333 // close stream
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
334 exit(0);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
335 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
336
30360
c74a5f8ffab3 Change code to allow playing a stream even if enabling the cache failed
reimar
parents: 30359
diff changeset
337 /**
c74a5f8ffab3 Change code to allow playing a stream even if enabling the cache failed
reimar
parents: 30359
diff changeset
338 * \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
339 */
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
340 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
341 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
342 int res = -1;
5991
ddfae38afc28 cache lower limit 32kb
arpi
parents: 5931
diff changeset
343 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
344
29888
5c39c41f38e8 Deobfuscate the special hack to disable cache for live555.
reimar
parents: 29263
diff changeset
345 if (stream->flags & STREAM_NON_CACHEABLE) {
7204
eee464fa02c1 fix cache disable for live.com
atmos4
parents: 7202
diff changeset
346 mp_msg(MSGT_CACHE,MSGL_STATUS,"\rThis stream is non-cacheable\n");
eee464fa02c1 fix cache disable for live.com
atmos4
parents: 7202
diff changeset
347 return 1;
eee464fa02c1 fix cache disable for live.com
atmos4
parents: 7202
diff changeset
348 }
7006
c0b490505298 disable cache if stream->fd<0 (no regular file/pipe but some special thing)
arpi
parents: 5991
diff changeset
349
5991
ddfae38afc28 cache lower limit 32kb
arpi
parents: 5931
diff changeset
350 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
351 if(s == NULL) return -1;
3562
e84d6c8ff59b initial precaching
arpi
parents: 2374
diff changeset
352 stream->cache_data=s;
e84d6c8ff59b initial precaching
arpi
parents: 2374
diff changeset
353 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
354 s->seek_limit=seek_limit;
12835
4235ae5a2d60 cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents: 10272
diff changeset
355
4235ae5a2d60 cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents: 10272
diff changeset
356
4235ae5a2d60 cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents: 10272
diff changeset
357 //make sure that we won't wait from cache_fill
4235ae5a2d60 cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents: 10272
diff changeset
358 //more data than it is alowed to fill
16152
10a69a812eff remove unused cache-prefill and create cache-seek-min that controls when seek_long is prefered over waiting for cache to fill
iive
parents: 12899
diff changeset
359 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
360 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
361 }
4235ae5a2d60 cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents: 10272
diff changeset
362 if (min > s->buffer_size - s->fill_limit) {
4235ae5a2d60 cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents: 10272
diff changeset
363 min = s->buffer_size - s->fill_limit;
4235ae5a2d60 cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents: 10272
diff changeset
364 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28014
diff changeset
365
27894
d06d8e459ae1 Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents: 27876
diff changeset
366 #if !defined(__MINGW32__) && !defined(PTHREAD_CACHE) && !defined(__OS2__)
3562
e84d6c8ff59b initial precaching
arpi
parents: 2374
diff changeset
367 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
368 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
369 stream->cache_pid = 0;
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
370 #else
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
371 {
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
372 stream_t* stream2=malloc(sizeof(stream_t));
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
373 memcpy(stream2,s->stream,sizeof(stream_t));
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
374 s->stream=stream2;
27894
d06d8e459ae1 Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents: 27876
diff changeset
375 #if defined(__MINGW32__)
27770
c8d4cace053d Avoid CreateThread and especially TerminateThread since they cause a memleak.
reimar
parents: 27769
diff changeset
376 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
377 #elif defined(__OS2__)
d06d8e459ae1 Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents: 27876
diff changeset
378 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
379 #else
27896
4c2232462353 100l, stream->cache_pid can not be used directly in pthread_create,
reimar
parents: 27894
diff changeset
380 {
4c2232462353 100l, stream->cache_pid can not be used directly in pthread_create,
reimar
parents: 27894
diff changeset
381 pthread_t tid;
4c2232462353 100l, stream->cache_pid can not be used directly in pthread_create,
reimar
parents: 27894
diff changeset
382 pthread_create(&tid, NULL, ThreadProc, s);
4c2232462353 100l, stream->cache_pid can not be used directly in pthread_create,
reimar
parents: 27894
diff changeset
383 stream->cache_pid = 1;
4c2232462353 100l, stream->cache_pid can not be used directly in pthread_create,
reimar
parents: 27894
diff changeset
384 }
26077
d8128689c031 cache support for OS/2
diego
parents: 25445
diff changeset
385 #endif
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
386 #endif
30351
b985db55e78a Check for fork failing and make sure cache_uninit always frees the cache data
reimar
parents: 29888
diff changeset
387 if (!stream->cache_pid) {
b985db55e78a Check for fork failing and make sure cache_uninit always frees the cache data
reimar
parents: 29888
diff changeset
388 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
389 "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
390 goto err_out;
30351
b985db55e78a Check for fork failing and make sure cache_uninit always frees the cache data
reimar
parents: 29888
diff changeset
391 }
3562
e84d6c8ff59b initial precaching
arpi
parents: 2374
diff changeset
392 // wait until cache is filled at least prefill_init %
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17012
diff changeset
393 mp_msg(MSGT_CACHE,MSGL_V,"CACHE_PRE_INIT: %"PRId64" [%"PRId64"] %"PRId64" pre:%d eof:%d \n",
17384
95d02479f1d6 1l - one cast too many
rathann
parents: 17366
diff changeset
394 (int64_t)s->min_filepos,(int64_t)s->read_filepos,(int64_t)s->max_filepos,min,s->eof);
3562
e84d6c8ff59b initial precaching
arpi
parents: 2374
diff changeset
395 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
396 mp_msg(MSGT_CACHE,MSGL_STATUS,MSGTR_CacheFill,
3600
3094e7b6a15b pre-cache fixed
arpi
parents: 3562
diff changeset
397 100.0*(float)(s->max_filepos-s->read_filepos)/(float)(s->buffer_size),
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17012
diff changeset
398 (int64_t)s->max_filepos-s->read_filepos
3562
e84d6c8ff59b initial precaching
arpi
parents: 2374
diff changeset
399 );
e84d6c8ff59b initial precaching
arpi
parents: 2374
diff changeset
400 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
401 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
402 res = 0;
48c51ebbe421 Always call cache_uninit to immediately free everything cache-related if we
reimar
parents: 30360
diff changeset
403 goto err_out;
48c51ebbe421 Always call cache_uninit to immediately free everything cache-related if we
reimar
parents: 30360
diff changeset
404 }
3562
e84d6c8ff59b initial precaching
arpi
parents: 2374
diff changeset
405 }
16870
09ad0b5e6643 add a \n after whole cache fill.
ods15
parents: 16793
diff changeset
406 mp_msg(MSGT_CACHE,MSGL_STATUS,"\n");
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 3726
diff changeset
407 return 1; // parent exits
30362
48c51ebbe421 Always call cache_uninit to immediately free everything cache-related if we
reimar
parents: 30360
diff changeset
408
48c51ebbe421 Always call cache_uninit to immediately free everything cache-related if we
reimar
parents: 30360
diff changeset
409 err_out:
48c51ebbe421 Always call cache_uninit to immediately free everything cache-related if we
reimar
parents: 30360
diff changeset
410 cache_uninit(stream);
48c51ebbe421 Always call cache_uninit to immediately free everything cache-related if we
reimar
parents: 30360
diff changeset
411 return res;
3562
e84d6c8ff59b initial precaching
arpi
parents: 2374
diff changeset
412 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28014
diff changeset
413
27894
d06d8e459ae1 Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents: 27876
diff changeset
414 #if defined(__MINGW32__) || defined(PTHREAD_CACHE) || defined(__OS2__)
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
415 }
27894
d06d8e459ae1 Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents: 27876
diff changeset
416 #ifdef PTHREAD_CACHE
d06d8e459ae1 Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents: 27876
diff changeset
417 static void *ThreadProc( void *s ){
d06d8e459ae1 Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents: 27876
diff changeset
418 #else
26077
d8128689c031 cache support for OS/2
diego
parents: 25445
diff changeset
419 static void ThreadProc( void *s ){
d8128689c031 cache support for OS/2
diego
parents: 25445
diff changeset
420 #endif
27894
d06d8e459ae1 Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents: 27876
diff changeset
421 #endif
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28014
diff changeset
422
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 26924
diff changeset
423 #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
424 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
425 #endif
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
426 // cache thread mainloop:
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
427 signal(SIGTERM,exit_sighandler); // kill
27770
c8d4cace053d Avoid CreateThread and especially TerminateThread since they cause a memleak.
reimar
parents: 27769
diff changeset
428 do {
27769
80d3dab37bb2 Remove useless casts.
reimar
parents: 27756
diff changeset
429 if(!cache_fill(s)){
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
430 usec_sleep(FILL_USLEEP_TIME); // idle
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
431 }
2327
2332ba356d03 print stats at read instead of fill
arpi
parents: 2324
diff changeset
432 // cache_stats(s->cache_data);
27770
c8d4cace053d Avoid CreateThread and especially TerminateThread since they cause a memleak.
reimar
parents: 27769
diff changeset
433 } while (cache_execute_control(s));
27894
d06d8e459ae1 Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents: 27876
diff changeset
434 #if defined(__MINGW32__) || defined(__OS2__)
27770
c8d4cace053d Avoid CreateThread and especially TerminateThread since they cause a memleak.
reimar
parents: 27769
diff changeset
435 _endthread();
c8d4cace053d Avoid CreateThread and especially TerminateThread since they cause a memleak.
reimar
parents: 27769
diff changeset
436 #endif
27894
d06d8e459ae1 Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents: 27876
diff changeset
437 #ifdef PTHREAD_CACHE
d06d8e459ae1 Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents: 27876
diff changeset
438 return NULL;
d06d8e459ae1 Use pthreads for the cache on Cygwin, since _beginthread is not available
reimar
parents: 27876
diff changeset
439 #endif
30355
ca3e3df28fe2 Add an exit() to silence a gcc warning and ensure forked code will never
reimar
parents: 30354
diff changeset
440 // 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
441 exit(0);
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
442 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
443
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
444 int cache_stream_fill_buffer(stream_t *s){
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
445 int len;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
446 if(s->eof){ s->buf_pos=s->buf_len=0; return 0; }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
447 if(!s->cache_pid) return stream_fill_buffer(s);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
448
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
449 // cache_stats(s->cache_data);
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
450
2371
0f2cad867121 printf->mp_msg
arpi
parents: 2352
diff changeset
451 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
2332ba356d03 print stats at read instead of fill
arpi
parents: 2324
diff changeset
452
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
453 len=cache_read(s->cache_data,s->buffer, ((cache_vars_t*)s->cache_data)->sector_size);
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
454 //printf("cache_stream_fill_buffer->read -> %d\n",len);
2327
2332ba356d03 print stats at read instead of fill
arpi
parents: 2324
diff changeset
455
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
456 if(len<=0){ s->eof=1; s->buf_pos=s->buf_len=0; return 0; }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
457 s->buf_pos=0;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
458 s->buf_len=len;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
459 s->pos+=len;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
460 // printf("[%d]",len);fflush(stdout);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
461 return len;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
462
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
463 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
464
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
465 int cache_stream_seek_long(stream_t *stream,off_t pos){
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
466 cache_vars_t* s;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
467 off_t newpos;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
468 if(!stream->cache_pid) return stream_seek_long(stream,pos);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28014
diff changeset
469
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
470 s=stream->cache_data;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
471 // s->seek_lock=1;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28014
diff changeset
472
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 17012
diff changeset
473 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
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
474
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
475 newpos=pos/s->sector_size; newpos*=s->sector_size; // align
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
476 stream->pos=s->read_filepos=newpos;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
477 s->eof=0; // !!!!!!!
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
478
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
479 cache_stream_fill_buffer(stream);
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
480
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
481 pos-=newpos;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
482 if(pos>=0 && pos<=stream->buf_len){
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
483 stream->buf_pos=pos; // byte position in sector
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
484 return 1;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
485 }
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
486
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
487 // stream->buf_pos=stream->buf_len=0;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
488 // return 1;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
489
16750
0a31740dd5e6 Use PRI?64 defines as format strings for 64 bit variables.
reimar
parents: 16152
diff changeset
490 mp_msg(MSGT_CACHE,MSGL_V,"cache_stream_seek: WARNING! Can't seek to 0x%"PRIX64" !\n",(int64_t)(pos+newpos));
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
491 return 0;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
492 }
26833
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
493
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
494 int cache_do_control(stream_t *stream, int cmd, void *arg) {
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
495 cache_vars_t* s = stream->cache_data;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
496 switch (cmd) {
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
497 case STREAM_CTRL_SEEK_TO_TIME:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
498 s->control_double_arg = *(double *)arg;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
499 s->control = cmd;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
500 break;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
501 case STREAM_CTRL_SEEK_TO_CHAPTER:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
502 case STREAM_CTRL_SET_ANGLE:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
503 s->control_uint_arg = *(unsigned *)arg;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
504 s->control = cmd;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
505 break;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
506 // 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
507 case STREAM_CTRL_GET_TIME_LENGTH:
26924
ca50c4a72f68 100l, fix wrong order of cases in cache_do_control
reimar
parents: 26897
diff changeset
508 // case STREAM_CTRL_GET_CURRENT_TIME:
26847
4f875ae5d538 Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents: 26833
diff changeset
509 *(double *)arg = s->stream_time_length;
4f875ae5d538 Emulate STREAM_CTRL_GET_TIME_LENGTH if cache is used.
reimar
parents: 26833
diff changeset
510 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
511 case STREAM_CTRL_GET_NUM_CHAPTERS:
ca50c4a72f68 100l, fix wrong order of cases in cache_do_control
reimar
parents: 26897
diff changeset
512 case STREAM_CTRL_GET_CURRENT_CHAPTER:
26833
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
513 case STREAM_CTRL_GET_ASPECT_RATIO:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
514 case STREAM_CTRL_GET_NUM_ANGLES:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
515 case STREAM_CTRL_GET_ANGLE:
27770
c8d4cace053d Avoid CreateThread and especially TerminateThread since they cause a memleak.
reimar
parents: 27769
diff changeset
516 case -2:
26833
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
517 s->control = cmd;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
518 break;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
519 default:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
520 return STREAM_UNSUPPORTED;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
521 }
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
522 while (s->control != -1)
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
523 usec_sleep(CONTROL_SLEEP_TIME);
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
524 switch (cmd) {
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
525 case STREAM_CTRL_GET_TIME_LENGTH:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
526 case STREAM_CTRL_GET_CURRENT_TIME:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
527 case STREAM_CTRL_GET_ASPECT_RATIO:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
528 *(double *)arg = s->control_double_arg;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
529 break;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
530 case STREAM_CTRL_GET_NUM_CHAPTERS:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
531 case STREAM_CTRL_GET_CURRENT_CHAPTER:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
532 case STREAM_CTRL_GET_NUM_ANGLES:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
533 case STREAM_CTRL_GET_ANGLE:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
534 *(unsigned *)arg = s->control_uint_arg;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
535 break;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
536 case STREAM_CTRL_SEEK_TO_CHAPTER:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
537 case STREAM_CTRL_SEEK_TO_TIME:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
538 case STREAM_CTRL_SET_ANGLE:
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
539 stream->pos = s->read_filepos = s->control_new_pos;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
540 break;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
541 }
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
542 return s->control_res;
77003eb2d9a8 Add basic support for stream controls with cache enabled.
reimar
parents: 26326
diff changeset
543 }