annotate libmpdemux/cache2.c @ 17147:ede872cdaaba

Remove some inactive maintainers.
author diego
date Fri, 09 Dec 2005 10:22:41 +0000
parents 6ff3379a0862
children 934380353fd6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2324
0e4210657f0e ehh. include config.h... 10l
arpi
parents: 2322
diff changeset
1 #include "config.h"
0e4210657f0e ehh. include config.h... 10l
arpi
parents: 2322
diff changeset
2
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
3 #ifdef USE_STREAM_CACHE
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
4
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
5 // Initial draft of my new cache system...
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
6 // Note it runs in 2 processes (using fork()), but doesn't requires locking!!
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
7 // TODO: seeking, data consistency checking
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
8
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
9 #define READ_USLEEP_TIME 10000
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
10 #define FILL_USLEEP_TIME 50000
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 3726
diff changeset
11 #define PREFILL_SLEEP_TIME 200
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
12
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
13 #include <stdio.h>
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
14 #include <stdlib.h>
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
15 #include <string.h>
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
16 #include <signal.h>
3726
1acf2f1f9dc8 missing #include's
pl
parents: 3600
diff changeset
17 #include <sys/types.h>
1acf2f1f9dc8 missing #include's
pl
parents: 3600
diff changeset
18 #include <unistd.h>
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
19
17012
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 16870
diff changeset
20 #include "osdep/timer.h"
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
21 #ifndef WIN32
10242
4e34d468f549 warning fixes by Dominik
alex
parents: 10197
diff changeset
22 #include <sys/wait.h>
17012
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 16870
diff changeset
23 #include "osdep/shmem.h"
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
24 #else
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
25 #include <windows.h>
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
26 static DWORD WINAPI ThreadProc(void* s);
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
27 #endif
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
28
2371
0f2cad867121 printf->mp_msg
arpi
parents: 2352
diff changeset
29 #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
30 #include "help_mp.h"
2371
0f2cad867121 printf->mp_msg
arpi
parents: 2352
diff changeset
31
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
32 #include "stream.h"
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
33
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
34 int stream_fill_buffer(stream_t *s);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
35 int stream_seek_long(stream_t *s,off_t pos);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
36
7862
013c255225d8 mpdemux.c|h moved to libinput, mpdemux_check_interrupt() -> mp_input_check_interrupt()
arpi
parents: 7472
diff changeset
37 extern int mp_input_check_interrupt(int time);
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
38
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
39 typedef struct {
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
40 // constats:
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
41 unsigned char *buffer; // base pointer of the alllocated buffer memory
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
42 int buffer_size; // size of the alllocated buffer memory
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
43 int sector_size; // size of a single sector (2048/2324)
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
44 int back_size; // we should keep back_size amount of old bytes for backward seek
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
45 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
46 int seek_limit; // keep filling cache if distanse is less that seek limit
2374
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
47 // filler's pointers:
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
48 int eof;
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
49 off_t min_filepos; // buffer contain only a part of the file, from min-max pos
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
50 off_t max_filepos;
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
51 off_t offset; // filepos <-> bufferpos offset value (filepos of the buffer's first byte)
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
52 // reader's pointers:
2374
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
53 off_t read_filepos;
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
54 // commands/locking:
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
55 // 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
56 // int fifo_flag; // 1 if we should use FIFO to notice cache about buffer reads.
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
57 // callback
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
58 stream_t* stream;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
59 } cache_vars_t;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
60
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
61 static int min_fill=0;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
62
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
63 int cache_fill_status=0;
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
64
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
65 void cache_stats(cache_vars_t* s){
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
66 int newb=s->max_filepos-s->read_filepos; // new bytes in the buffer
7472
c4434bdf6e51 tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
arpi
parents: 7204
diff changeset
67 printf("0x%06X [0x%06X] 0x%06X ",(int)s->min_filepos,(int)s->read_filepos,(int)s->max_filepos);
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
68 printf("%3d %% (%3d%%)\n",100*newb/s->buffer_size,100*min_fill/s->buffer_size);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
69 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
70
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
71 int cache_read(cache_vars_t* s,unsigned char* buf,int size){
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
72 int total=0;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
73 while(size>0){
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
74 int pos,newb,len;
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
75
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
76 //printf("CACHE2_READ: 0x%X <= 0x%X <= 0x%X \n",s->min_filepos,s->read_filepos,s->max_filepos);
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
77
2374
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
78 if(s->read_filepos>=s->max_filepos || s->read_filepos<s->min_filepos){
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
79 // eof?
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
80 if(s->eof) break;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
81 // waiting for buffer fill...
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
82 usec_sleep(READ_USLEEP_TIME); // 10ms
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
83 continue; // try again...
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
84 }
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
85
2374
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
86 newb=s->max_filepos-s->read_filepos; // new bytes in the buffer
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
87 if(newb<min_fill) min_fill=newb; // statistics...
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
88
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
89 // printf("*** newb: %d bytes ***\n",newb);
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
90
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
91 pos=s->read_filepos - s->offset;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
92 if(pos<0) pos+=s->buffer_size; else
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
93 if(pos>=s->buffer_size) pos-=s->buffer_size;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
94
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
95 if(newb>s->buffer_size-pos) newb=s->buffer_size-pos; // handle wrap...
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
96 if(newb>size) newb=size;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
97
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
98 // check:
2371
0f2cad867121 printf->mp_msg
arpi
parents: 2352
diff changeset
99 if(s->read_filepos<s->min_filepos) mp_msg(MSGT_CACHE,MSGL_ERR,"Ehh. s->read_filepos<s->min_filepos !!! Report bug...\n");
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
100
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
101 // len=write(mem,newb)
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
102 //printf("Buffer read: %d bytes\n",newb);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
103 memcpy(buf,&s->buffer[pos],newb);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
104 buf+=newb;
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
105 len=newb;
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
106 // ...
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
107
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
108 s->read_filepos+=len;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
109 size-=len;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
110 total+=len;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
111
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
112 }
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
113 cache_fill_status=100*(s->max_filepos-s->read_filepos)/s->buffer_size;
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
114 return total;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
115 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
116
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
117 int cache_fill(cache_vars_t* s){
7472
c4434bdf6e51 tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug
arpi
parents: 7204
diff changeset
118 int back,back2,newb,space,len,pos;
2374
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
119 off_t read=s->read_filepos;
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
120
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
121 if(read<s->min_filepos || read>s->max_filepos){
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
122 // seek...
2371
0f2cad867121 printf->mp_msg
arpi
parents: 2352
diff changeset
123 mp_msg(MSGT_CACHE,MSGL_DBG2,"Out of boundaries... seeking to 0x%X \n",read);
8938
fc21a94f98c6 do not discard cache content at seeking type=STREAMTYPE_STREAM
arpi
parents: 7862
diff changeset
124 // 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
125 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
126 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
127 {
fc21a94f98c6 do not discard cache content at seeking type=STREAMTYPE_STREAM
arpi
parents: 7862
diff changeset
128 s->offset= // FIXME!?
fc21a94f98c6 do not discard cache content at seeking type=STREAMTYPE_STREAM
arpi
parents: 7862
diff changeset
129 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
130 if(s->stream->eof) stream_reset(s->stream);
fc21a94f98c6 do not discard cache content at seeking type=STREAMTYPE_STREAM
arpi
parents: 7862
diff changeset
131 stream_seek(s->stream,read);
fc21a94f98c6 do not discard cache content at seeking type=STREAMTYPE_STREAM
arpi
parents: 7862
diff changeset
132 mp_msg(MSGT_CACHE,MSGL_DBG2,"Seek done. new pos: 0x%X \n",(int)stream_tell(s->stream));
fc21a94f98c6 do not discard cache content at seeking type=STREAMTYPE_STREAM
arpi
parents: 7862
diff changeset
133 }
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
134 }
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
135
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
136 // calc number of back-bytes:
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
137 back=read - s->min_filepos;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
138 if(back<0) back=0; // strange...
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
139 if(back>s->back_size) back=s->back_size;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
140
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
141 // calc number of new bytes:
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
142 newb=s->max_filepos - read;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
143 if(newb<0) newb=0; // strange...
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
144
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
145 // calc free buffer space:
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
146 space=s->buffer_size - (newb+back);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
147
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
148 // calc bufferpos:
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
149 pos=s->max_filepos - s->offset;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
150 if(pos>=s->buffer_size) pos-=s->buffer_size; // wrap-around
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
151
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
152 if(space<s->fill_limit){
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
153 // printf("Buffer is full (%d bytes free, limit: %d)\n",space,s->fill_limit);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
154 return 0; // no fill...
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
155 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
156
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
157 // printf("### read=0x%X back=%d newb=%d space=%d pos=%d\n",read,back,newb,space,pos);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
158
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
159 // reduce space if needed:
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
160 if(space>s->buffer_size-pos) space=s->buffer_size-pos;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
161
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
162 // if(space>32768) space=32768; // limit one-time block size
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
163 if(space>4*s->sector_size) space=4*s->sector_size;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
164
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
165 // if(s->seek_lock) return 0; // FIXME
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
166
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
167 #if 1
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
168 // back+newb+space <= buffer_size
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
169 back2=s->buffer_size-(space+newb); // max back size
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
170 if(s->min_filepos<(read-back2)) s->min_filepos=read-back2;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
171 #else
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
172 s->min_filepos=read-back; // avoid seeking-back to temp area...
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
173 #endif
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
174
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
175 // ....
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
176 //printf("Buffer fill: %d bytes of %d\n",space,s->buffer_size);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
177 //len=stream_fill_buffer(s->stream);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
178 //memcpy(&s->buffer[pos],s->stream->buffer,len); // avoid this extra copy!
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
179 // ....
2348
76778e307ddc EOF bug fixed
arpi
parents: 2327
diff changeset
180 len=stream_read(s->stream,&s->buffer[pos],space);
76778e307ddc EOF bug fixed
arpi
parents: 2327
diff changeset
181 if(!len) s->eof=1;
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
182
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
183 s->max_filepos+=len;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
184 if(pos+len>=s->buffer_size){
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
185 // wrap...
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
186 s->offset+=s->buffer_size;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
187 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
188
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
189 return len;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
190
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
191 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
192
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
193 cache_vars_t* cache_init(int size,int sector){
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
194 int num;
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
195 #ifndef WIN32
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
196 cache_vars_t* s=shmem_alloc(sizeof(cache_vars_t));
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
197 #else
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
198 cache_vars_t* s=malloc(sizeof(cache_vars_t));
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
199 #endif
12899
061dd89b6a23 prevent segfault on shmem failer
iive
parents: 12835
diff changeset
200 if(s==NULL) return NULL;
061dd89b6a23 prevent segfault on shmem failer
iive
parents: 12835
diff changeset
201
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
202 memset(s,0,sizeof(cache_vars_t));
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
203 num=size/sector;
12835
4235ae5a2d60 cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents: 10272
diff changeset
204 if(num < 16){
4235ae5a2d60 cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents: 10272
diff changeset
205 num = 16;
4235ae5a2d60 cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents: 10272
diff changeset
206 }//32kb min_size
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
207 s->buffer_size=num*sector;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
208 s->sector_size=sector;
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
209 #ifndef WIN32
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
210 s->buffer=shmem_alloc(s->buffer_size);
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
211 #else
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
212 s->buffer=malloc(s->buffer_size);
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
213 #endif
12899
061dd89b6a23 prevent segfault on shmem failer
iive
parents: 12835
diff changeset
214
061dd89b6a23 prevent segfault on shmem failer
iive
parents: 12835
diff changeset
215 if(s->buffer == NULL){
061dd89b6a23 prevent segfault on shmem failer
iive
parents: 12835
diff changeset
216 #ifndef WIN32
061dd89b6a23 prevent segfault on shmem failer
iive
parents: 12835
diff changeset
217 shmem_free(s,sizeof(cache_vars_t));
061dd89b6a23 prevent segfault on shmem failer
iive
parents: 12835
diff changeset
218 #else
061dd89b6a23 prevent segfault on shmem failer
iive
parents: 12835
diff changeset
219 free(s);
061dd89b6a23 prevent segfault on shmem failer
iive
parents: 12835
diff changeset
220 #endif
061dd89b6a23 prevent segfault on shmem failer
iive
parents: 12835
diff changeset
221 return NULL;
061dd89b6a23 prevent segfault on shmem failer
iive
parents: 12835
diff changeset
222 }
061dd89b6a23 prevent segfault on shmem failer
iive
parents: 12835
diff changeset
223
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
224 s->fill_limit=8*sector;
12835
4235ae5a2d60 cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents: 10272
diff changeset
225 s->back_size=s->buffer_size/2;
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
226 return s;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
227 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
228
9915
eabe876ab5e2 Fix cache uninit
albeu
parents: 9380
diff changeset
229 void cache_uninit(stream_t *s) {
eabe876ab5e2 Fix cache uninit
albeu
parents: 9380
diff changeset
230 cache_vars_t* c = s->cache_data;
eabe876ab5e2 Fix cache uninit
albeu
parents: 9380
diff changeset
231 if(!s->cache_pid) return;
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
232 #ifndef WIN32
9915
eabe876ab5e2 Fix cache uninit
albeu
parents: 9380
diff changeset
233 kill(s->cache_pid,SIGKILL);
eabe876ab5e2 Fix cache uninit
albeu
parents: 9380
diff changeset
234 waitpid(s->cache_pid,NULL,0);
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
235 #else
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
236 TerminateThread((HANDLE)s->cache_pid,0);
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
237 free(c->stream);
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
238 #endif
9915
eabe876ab5e2 Fix cache uninit
albeu
parents: 9380
diff changeset
239 if(!c) return;
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
240 #ifndef WIN32
9915
eabe876ab5e2 Fix cache uninit
albeu
parents: 9380
diff changeset
241 shmem_free(c->buffer,c->buffer_size);
eabe876ab5e2 Fix cache uninit
albeu
parents: 9380
diff changeset
242 shmem_free(s->cache_data,sizeof(cache_vars_t));
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
243 #else
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
244 free(c->buffer);
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
245 free(s->cache_data);
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
246 #endif
9915
eabe876ab5e2 Fix cache uninit
albeu
parents: 9380
diff changeset
247 }
eabe876ab5e2 Fix cache uninit
albeu
parents: 9380
diff changeset
248
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
249 static void exit_sighandler(int x){
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
250 // close stream
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
251 exit(0);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
252 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
253
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
254 int stream_enable_cache(stream_t *stream,int size,int min,int seek_limit){
3562
e84d6c8ff59b initial precaching
arpi
parents: 2374
diff changeset
255 int ss=(stream->type==STREAMTYPE_VCD)?VCD_SECTOR_DATA:STREAM_BUFFER_SIZE;
5991
ddfae38afc28 cache lower limit 32kb
arpi
parents: 5931
diff changeset
256 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
257
7204
eee464fa02c1 fix cache disable for live.com
atmos4
parents: 7202
diff changeset
258 if (stream->type==STREAMTYPE_STREAM && stream->fd < 0) {
eee464fa02c1 fix cache disable for live.com
atmos4
parents: 7202
diff changeset
259 // The stream has no 'fd' behind it, so is non-cacheable
eee464fa02c1 fix cache disable for live.com
atmos4
parents: 7202
diff changeset
260 mp_msg(MSGT_CACHE,MSGL_STATUS,"\rThis stream is non-cacheable\n");
eee464fa02c1 fix cache disable for live.com
atmos4
parents: 7202
diff changeset
261 return 1;
eee464fa02c1 fix cache disable for live.com
atmos4
parents: 7202
diff changeset
262 }
7006
c0b490505298 disable cache if stream->fd<0 (no regular file/pipe but some special thing)
arpi
parents: 5991
diff changeset
263
5991
ddfae38afc28 cache lower limit 32kb
arpi
parents: 5931
diff changeset
264 s=cache_init(size,ss);
12899
061dd89b6a23 prevent segfault on shmem failer
iive
parents: 12835
diff changeset
265 if(s == NULL) return 0;
3562
e84d6c8ff59b initial precaching
arpi
parents: 2374
diff changeset
266 stream->cache_data=s;
e84d6c8ff59b initial precaching
arpi
parents: 2374
diff changeset
267 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
268 s->seek_limit=seek_limit;
12835
4235ae5a2d60 cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents: 10272
diff changeset
269
4235ae5a2d60 cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents: 10272
diff changeset
270
4235ae5a2d60 cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents: 10272
diff changeset
271 //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
272 //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
273 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
274 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
275 }
4235ae5a2d60 cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents: 10272
diff changeset
276 if (min > s->buffer_size - s->fill_limit) {
4235ae5a2d60 cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents: 10272
diff changeset
277 min = s->buffer_size - s->fill_limit;
4235ae5a2d60 cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents: 10272
diff changeset
278 }
3562
e84d6c8ff59b initial precaching
arpi
parents: 2374
diff changeset
279
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
280 #ifndef WIN32
3562
e84d6c8ff59b initial precaching
arpi
parents: 2374
diff changeset
281 if((stream->cache_pid=fork())){
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
282 #else
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
283 {
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
284 DWORD threadId;
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
285 stream_t* stream2=malloc(sizeof(stream_t));
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
286 memcpy(stream2,s->stream,sizeof(stream_t));
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
287 s->stream=stream2;
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
288 stream->cache_pid = CreateThread(NULL,0,ThreadProc,s,0,&threadId);
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
289 #endif
3562
e84d6c8ff59b initial precaching
arpi
parents: 2374
diff changeset
290 // wait until cache is filled at least prefill_init %
5931
95c14d5dbb22 printf to mp_msg
albeu
parents: 4825
diff changeset
291 mp_msg(MSGT_CACHE,MSGL_V,"CACHE_PRE_INIT: %d [%d] %d pre:%d eof:%d \n",
3600
3094e7b6a15b pre-cache fixed
arpi
parents: 3562
diff changeset
292 s->min_filepos,s->read_filepos,s->max_filepos,min,s->eof);
3562
e84d6c8ff59b initial precaching
arpi
parents: 2374
diff changeset
293 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
294 mp_msg(MSGT_CACHE,MSGL_STATUS,MSGTR_CacheFill,
3600
3094e7b6a15b pre-cache fixed
arpi
parents: 3562
diff changeset
295 100.0*(float)(s->max_filepos-s->read_filepos)/(float)(s->buffer_size),
3562
e84d6c8ff59b initial precaching
arpi
parents: 2374
diff changeset
296 s->max_filepos-s->read_filepos
e84d6c8ff59b initial precaching
arpi
parents: 2374
diff changeset
297 );
e84d6c8ff59b initial precaching
arpi
parents: 2374
diff changeset
298 if(s->eof) break; // file is smaller than prefill size
7862
013c255225d8 mpdemux.c|h moved to libinput, mpdemux_check_interrupt() -> mp_input_check_interrupt()
arpi
parents: 7472
diff changeset
299 if(mp_input_check_interrupt(PREFILL_SLEEP_TIME))
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 3726
diff changeset
300 return 0;
3562
e84d6c8ff59b initial precaching
arpi
parents: 2374
diff changeset
301 }
16870
09ad0b5e6643 add a \n after whole cache fill.
ods15
parents: 16793
diff changeset
302 mp_msg(MSGT_CACHE,MSGL_STATUS,"\n");
4825
41d2da3bd082 Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents: 3726
diff changeset
303 return 1; // parent exits
3562
e84d6c8ff59b initial precaching
arpi
parents: 2374
diff changeset
304 }
e84d6c8ff59b initial precaching
arpi
parents: 2374
diff changeset
305
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
306 #ifdef WIN32
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
307 }
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
308 static DWORD WINAPI ThreadProc(void*s){
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
309 #endif
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
310
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
311 // cache thread mainloop:
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
312 signal(SIGTERM,exit_sighandler); // kill
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
313 while(1){
10197
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
314 if(!cache_fill((cache_vars_t*)s)){
9e11a478a3bc use threads on windows
faust3
parents: 9915
diff changeset
315 usec_sleep(FILL_USLEEP_TIME); // idle
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
316 }
2327
2332ba356d03 print stats at read instead of fill
arpi
parents: 2324
diff changeset
317 // cache_stats(s->cache_data);
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
318 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
319 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
320
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
321 int cache_stream_fill_buffer(stream_t *s){
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
322 int len;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
323 if(s->eof){ s->buf_pos=s->buf_len=0; return 0; }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
324 if(!s->cache_pid) return stream_fill_buffer(s);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
325
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
326 // cache_stats(s->cache_data);
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
327
2371
0f2cad867121 printf->mp_msg
arpi
parents: 2352
diff changeset
328 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
329
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
330 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
331 //printf("cache_stream_fill_buffer->read -> %d\n",len);
2327
2332ba356d03 print stats at read instead of fill
arpi
parents: 2324
diff changeset
332
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
333 if(len<=0){ s->eof=1; s->buf_pos=s->buf_len=0; return 0; }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
334 s->buf_pos=0;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
335 s->buf_len=len;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
336 s->pos+=len;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
337 // printf("[%d]",len);fflush(stdout);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
338 return len;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
339
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
340 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
341
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
342 int cache_stream_seek_long(stream_t *stream,off_t pos){
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
343 cache_vars_t* s;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
344 off_t newpos;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
345 if(!stream->cache_pid) return stream_seek_long(stream,pos);
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
346
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
347 s=stream->cache_data;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
348 // s->seek_lock=1;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
349
2371
0f2cad867121 printf->mp_msg
arpi
parents: 2352
diff changeset
350 mp_msg(MSGT_CACHE,MSGL_DBG2,"CACHE2_SEEK: 0x%X <= 0x%X (0x%X) <= 0x%X \n",s->min_filepos,(int)pos,s->read_filepos,s->max_filepos);
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
351
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
352 newpos=pos/s->sector_size; newpos*=s->sector_size; // align
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
353 stream->pos=s->read_filepos=newpos;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
354 s->eof=0; // !!!!!!!
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
355
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
356 cache_stream_fill_buffer(stream);
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
357
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
358 pos-=newpos;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
359 if(pos>=0 && pos<=stream->buf_len){
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
360 stream->buf_pos=pos; // byte position in sector
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
361 return 1;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
362 }
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
363
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
364 // stream->buf_pos=stream->buf_len=0;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
365 // return 1;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
366
16750
0a31740dd5e6 Use PRI?64 defines as format strings for 64 bit variables.
reimar
parents: 16152
diff changeset
367 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
368 return 0;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
369 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
370
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
371 #endif