Mercurial > mplayer.hg
annotate stream/cache2.c @ 26207:55a36b9e708e
Fix wrong res_comment.
author | diego |
---|---|
date | Sat, 15 Mar 2008 08:21:02 +0000 |
parents | d8128689c031 |
children | 5bfc1d8bece9 |
rev | line source |
---|---|
2324 | 1 #include "config.h" |
2 | |
2322 | 3 // Initial draft of my new cache system... |
2352 | 4 // Note it runs in 2 processes (using fork()), but doesn't requires locking!! |
2322 | 5 // TODO: seeking, data consistency checking |
6 | |
2352 | 7 #define READ_USLEEP_TIME 10000 |
8 #define FILL_USLEEP_TIME 50000 | |
4825
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
3726
diff
changeset
|
9 #define PREFILL_SLEEP_TIME 200 |
2322 | 10 |
11 #include <stdio.h> | |
12 #include <stdlib.h> | |
13 #include <string.h> | |
14 #include <signal.h> | |
3726 | 15 #include <sys/types.h> |
16 #include <unistd.h> | |
2322 | 17 |
17012 | 18 #include "osdep/timer.h" |
26077 | 19 #ifdef WIN32 |
20 #include <windows.h> | |
21 static DWORD WINAPI ThreadProc(void* s); | |
22 #elif defined(__OS2__) | |
23 #define INCL_DOS | |
24 #include <os2.h> | |
25 static void ThreadProc( void *s ); | |
26 #else | |
10242 | 27 #include <sys/wait.h> |
17012 | 28 #include "osdep/shmem.h" |
10197 | 29 #endif |
2322 | 30 |
2371 | 31 #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
|
32 #include "help_mp.h" |
2371 | 33 |
2322 | 34 #include "stream.h" |
22142
84f95595f31f
Fix a few gcc warnings, approved by Diego and Reimar.
rathann
parents:
19271
diff
changeset
|
35 #include "input/input.h" |
24697
8f2154e066cf
Make sure forked code does not try to display a GTK message box (and thus crashes)
reimar
parents:
22142
diff
changeset
|
36 extern int use_gui; |
2322 | 37 |
38 int stream_fill_buffer(stream_t *s); | |
39 int stream_seek_long(stream_t *s,off_t pos); | |
40 | |
41 typedef struct { | |
42 // constats: | |
43 unsigned char *buffer; // base pointer of the alllocated buffer memory | |
2352 | 44 int buffer_size; // size of the alllocated buffer memory |
45 int sector_size; // size of a single sector (2048/2324) | |
46 int back_size; // we should keep back_size amount of old bytes for backward seek | |
47 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
|
48 int seek_limit; // keep filling cache if distanse is less that seek limit |
2374 | 49 // filler's pointers: |
50 int eof; | |
51 off_t min_filepos; // buffer contain only a part of the file, from min-max pos | |
52 off_t max_filepos; | |
53 off_t offset; // filepos <-> bufferpos offset value (filepos of the buffer's first byte) | |
2322 | 54 // reader's pointers: |
2374 | 55 off_t read_filepos; |
2322 | 56 // commands/locking: |
2352 | 57 // int seek_lock; // 1 if we will seek/reset buffer, 2 if we are ready for cmd |
58 // int fifo_flag; // 1 if we should use FIFO to notice cache about buffer reads. | |
2322 | 59 // callback |
60 stream_t* stream; | |
61 } cache_vars_t; | |
62 | |
2352 | 63 static int min_fill=0; |
64 | |
65 int cache_fill_status=0; | |
2322 | 66 |
67 void cache_stats(cache_vars_t* s){ | |
68 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
|
69 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
|
70 mp_msg(MSGT_CACHE,MSGL_INFO,"%3d %% (%3d%%)\n",100*newb/s->buffer_size,100*min_fill/s->buffer_size); |
2322 | 71 } |
72 | |
73 int cache_read(cache_vars_t* s,unsigned char* buf,int size){ | |
74 int total=0; | |
75 while(size>0){ | |
76 int pos,newb,len; | |
2352 | 77 |
78 //printf("CACHE2_READ: 0x%X <= 0x%X <= 0x%X \n",s->min_filepos,s->read_filepos,s->max_filepos); | |
2322 | 79 |
2374 | 80 if(s->read_filepos>=s->max_filepos || s->read_filepos<s->min_filepos){ |
2352 | 81 // eof? |
82 if(s->eof) break; | |
83 // waiting for buffer fill... | |
10197 | 84 usec_sleep(READ_USLEEP_TIME); // 10ms |
2352 | 85 continue; // try again... |
86 } | |
87 | |
2374 | 88 newb=s->max_filepos-s->read_filepos; // new bytes in the buffer |
2322 | 89 if(newb<min_fill) min_fill=newb; // statistics... |
90 | |
91 // printf("*** newb: %d bytes ***\n",newb); | |
2352 | 92 |
93 pos=s->read_filepos - s->offset; | |
94 if(pos<0) pos+=s->buffer_size; else | |
95 if(pos>=s->buffer_size) pos-=s->buffer_size; | |
96 | |
2322 | 97 if(newb>s->buffer_size-pos) newb=s->buffer_size-pos; // handle wrap... |
98 if(newb>size) newb=size; | |
99 | |
2352 | 100 // check: |
2371 | 101 if(s->read_filepos<s->min_filepos) mp_msg(MSGT_CACHE,MSGL_ERR,"Ehh. s->read_filepos<s->min_filepos !!! Report bug...\n"); |
2352 | 102 |
2322 | 103 // len=write(mem,newb) |
104 //printf("Buffer read: %d bytes\n",newb); | |
105 memcpy(buf,&s->buffer[pos],newb); | |
106 buf+=newb; | |
2352 | 107 len=newb; |
2322 | 108 // ... |
109 | |
110 s->read_filepos+=len; | |
111 size-=len; | |
112 total+=len; | |
113 | |
114 } | |
18067
ac7eaa0313c2
avoid cache fill status overflow with caches > ca. 20 MB
reimar
parents:
17384
diff
changeset
|
115 cache_fill_status=(s->max_filepos-s->read_filepos)/(s->buffer_size / 100); |
2322 | 116 return total; |
117 } | |
118 | |
119 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
|
120 int back,back2,newb,space,len,pos; |
2374 | 121 off_t read=s->read_filepos; |
2322 | 122 |
2352 | 123 if(read<s->min_filepos || read>s->max_filepos){ |
124 // seek... | |
17366 | 125 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
|
126 // 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
|
127 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
|
128 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
|
129 { |
fc21a94f98c6
do not discard cache content at seeking type=STREAMTYPE_STREAM
arpi
parents:
7862
diff
changeset
|
130 s->offset= // FIXME!? |
fc21a94f98c6
do not discard cache content at seeking type=STREAMTYPE_STREAM
arpi
parents:
7862
diff
changeset
|
131 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
|
132 if(s->stream->eof) stream_reset(s->stream); |
fc21a94f98c6
do not discard cache content at seeking type=STREAMTYPE_STREAM
arpi
parents:
7862
diff
changeset
|
133 stream_seek(s->stream,read); |
17366 | 134 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
|
135 } |
2352 | 136 } |
137 | |
2322 | 138 // calc number of back-bytes: |
139 back=read - s->min_filepos; | |
140 if(back<0) back=0; // strange... | |
141 if(back>s->back_size) back=s->back_size; | |
142 | |
143 // calc number of new bytes: | |
144 newb=s->max_filepos - read; | |
145 if(newb<0) newb=0; // strange... | |
146 | |
147 // calc free buffer space: | |
148 space=s->buffer_size - (newb+back); | |
149 | |
150 // calc bufferpos: | |
151 pos=s->max_filepos - s->offset; | |
152 if(pos>=s->buffer_size) pos-=s->buffer_size; // wrap-around | |
153 | |
154 if(space<s->fill_limit){ | |
155 // printf("Buffer is full (%d bytes free, limit: %d)\n",space,s->fill_limit); | |
156 return 0; // no fill... | |
157 } | |
158 | |
159 // printf("### read=0x%X back=%d newb=%d space=%d pos=%d\n",read,back,newb,space,pos); | |
160 | |
161 // reduce space if needed: | |
162 if(space>s->buffer_size-pos) space=s->buffer_size-pos; | |
163 | |
164 // if(space>32768) space=32768; // limit one-time block size | |
165 if(space>4*s->sector_size) space=4*s->sector_size; | |
166 | |
2352 | 167 // if(s->seek_lock) return 0; // FIXME |
168 | |
169 #if 1 | |
170 // back+newb+space <= buffer_size | |
171 back2=s->buffer_size-(space+newb); // max back size | |
172 if(s->min_filepos<(read-back2)) s->min_filepos=read-back2; | |
173 #else | |
2322 | 174 s->min_filepos=read-back; // avoid seeking-back to temp area... |
2352 | 175 #endif |
2322 | 176 |
177 // .... | |
178 //printf("Buffer fill: %d bytes of %d\n",space,s->buffer_size); | |
179 //len=stream_fill_buffer(s->stream); | |
180 //memcpy(&s->buffer[pos],s->stream->buffer,len); // avoid this extra copy! | |
181 // .... | |
2348 | 182 len=stream_read(s->stream,&s->buffer[pos],space); |
183 if(!len) s->eof=1; | |
2322 | 184 |
185 s->max_filepos+=len; | |
186 if(pos+len>=s->buffer_size){ | |
187 // wrap... | |
188 s->offset+=s->buffer_size; | |
189 } | |
190 | |
191 return len; | |
192 | |
193 } | |
194 | |
195 cache_vars_t* cache_init(int size,int sector){ | |
196 int num; | |
26077 | 197 #if !defined(WIN32) && !defined(__OS2__) |
2322 | 198 cache_vars_t* s=shmem_alloc(sizeof(cache_vars_t)); |
10197 | 199 #else |
200 cache_vars_t* s=malloc(sizeof(cache_vars_t)); | |
201 #endif | |
12899 | 202 if(s==NULL) return NULL; |
203 | |
2322 | 204 memset(s,0,sizeof(cache_vars_t)); |
205 num=size/sector; | |
12835
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
206 if(num < 16){ |
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
207 num = 16; |
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
208 }//32kb min_size |
2322 | 209 s->buffer_size=num*sector; |
210 s->sector_size=sector; | |
26077 | 211 #if !defined(WIN32) && !defined(__OS2__) |
2322 | 212 s->buffer=shmem_alloc(s->buffer_size); |
10197 | 213 #else |
214 s->buffer=malloc(s->buffer_size); | |
215 #endif | |
12899 | 216 |
217 if(s->buffer == NULL){ | |
26077 | 218 #if !defined(WIN32) && !defined(__OS2__) |
12899 | 219 shmem_free(s,sizeof(cache_vars_t)); |
220 #else | |
221 free(s); | |
222 #endif | |
223 return NULL; | |
224 } | |
225 | |
2322 | 226 s->fill_limit=8*sector; |
12835
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
227 s->back_size=s->buffer_size/2; |
2322 | 228 return s; |
229 } | |
230 | |
9915 | 231 void cache_uninit(stream_t *s) { |
232 cache_vars_t* c = s->cache_data; | |
233 if(!s->cache_pid) return; | |
26077 | 234 #ifdef WIN32 |
235 TerminateThread((HANDLE)s->cache_pid,0); | |
236 #elif defined(__OS2__) | |
237 DosKillThread( s->cache_pid ); | |
238 DosWaitThread( &s->cache_pid, DCWW_WAIT ); | |
239 #else | |
9915 | 240 kill(s->cache_pid,SIGKILL); |
241 waitpid(s->cache_pid,NULL,0); | |
10197 | 242 #endif |
9915 | 243 if(!c) return; |
26077 | 244 #if defined(WIN32) || defined(__OS2__) |
245 free(c->stream); | |
246 free(c->buffer); | |
247 free(s->cache_data); | |
248 #else | |
9915 | 249 shmem_free(c->buffer,c->buffer_size); |
250 shmem_free(s->cache_data,sizeof(cache_vars_t)); | |
10197 | 251 #endif |
9915 | 252 } |
253 | |
2322 | 254 static void exit_sighandler(int x){ |
255 // close stream | |
256 exit(0); | |
257 } | |
258 | |
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
|
259 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
|
260 int ss = stream->sector_size ? stream->sector_size : STREAM_BUFFER_SIZE; |
5991 | 261 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
|
262 |
7204 | 263 if (stream->type==STREAMTYPE_STREAM && stream->fd < 0) { |
264 // The stream has no 'fd' behind it, so is non-cacheable | |
265 mp_msg(MSGT_CACHE,MSGL_STATUS,"\rThis stream is non-cacheable\n"); | |
266 return 1; | |
267 } | |
7006
c0b490505298
disable cache if stream->fd<0 (no regular file/pipe but some special thing)
arpi
parents:
5991
diff
changeset
|
268 |
5991 | 269 s=cache_init(size,ss); |
12899 | 270 if(s == NULL) return 0; |
3562 | 271 stream->cache_data=s; |
272 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
|
273 s->seek_limit=seek_limit; |
12835
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
274 |
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 //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
|
277 //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
|
278 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
|
279 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
|
280 } |
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
281 if (min > s->buffer_size - s->fill_limit) { |
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
282 min = s->buffer_size - s->fill_limit; |
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
10272
diff
changeset
|
283 } |
3562 | 284 |
26077 | 285 #if !defined(WIN32) && !defined(__OS2__) |
3562 | 286 if((stream->cache_pid=fork())){ |
10197 | 287 #else |
288 { | |
26077 | 289 #ifdef WIN32 |
10197 | 290 DWORD threadId; |
26077 | 291 #endif |
10197 | 292 stream_t* stream2=malloc(sizeof(stream_t)); |
293 memcpy(stream2,s->stream,sizeof(stream_t)); | |
294 s->stream=stream2; | |
26077 | 295 #ifdef WIN32 |
10197 | 296 stream->cache_pid = CreateThread(NULL,0,ThreadProc,s,0,&threadId); |
26077 | 297 #else // OS2 |
298 stream->cache_pid = _beginthread( ThreadProc, NULL, 256 * 1024, s ); | |
299 #endif | |
10197 | 300 #endif |
3562 | 301 // wait until cache is filled at least prefill_init % |
17366 | 302 mp_msg(MSGT_CACHE,MSGL_V,"CACHE_PRE_INIT: %"PRId64" [%"PRId64"] %"PRId64" pre:%d eof:%d \n", |
17384 | 303 (int64_t)s->min_filepos,(int64_t)s->read_filepos,(int64_t)s->max_filepos,min,s->eof); |
3562 | 304 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
|
305 mp_msg(MSGT_CACHE,MSGL_STATUS,MSGTR_CacheFill, |
3600 | 306 100.0*(float)(s->max_filepos-s->read_filepos)/(float)(s->buffer_size), |
17366 | 307 (int64_t)s->max_filepos-s->read_filepos |
3562 | 308 ); |
309 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
|
310 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
|
311 return 0; |
3562 | 312 } |
16870 | 313 mp_msg(MSGT_CACHE,MSGL_STATUS,"\n"); |
4825
41d2da3bd082
Make blocking call in libmpdemux interuptable (only with new input,
albeu
parents:
3726
diff
changeset
|
314 return 1; // parent exits |
3562 | 315 } |
316 | |
26077 | 317 #if defined(WIN32) || defined(__OS2__) |
10197 | 318 } |
26077 | 319 #ifdef WIN32 |
10197 | 320 static DWORD WINAPI ThreadProc(void*s){ |
26077 | 321 #else // OS2 |
322 static void ThreadProc( void *s ){ | |
323 #endif | |
10197 | 324 #endif |
325 | |
24697
8f2154e066cf
Make sure forked code does not try to display a GTK message box (and thus crashes)
reimar
parents:
22142
diff
changeset
|
326 #ifdef HAVE_NEW_GUI |
8f2154e066cf
Make sure forked code does not try to display a GTK message box (and thus crashes)
reimar
parents:
22142
diff
changeset
|
327 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
|
328 #endif |
2322 | 329 // cache thread mainloop: |
330 signal(SIGTERM,exit_sighandler); // kill | |
331 while(1){ | |
10197 | 332 if(!cache_fill((cache_vars_t*)s)){ |
333 usec_sleep(FILL_USLEEP_TIME); // idle | |
2322 | 334 } |
2327 | 335 // cache_stats(s->cache_data); |
2322 | 336 } |
337 } | |
338 | |
339 int cache_stream_fill_buffer(stream_t *s){ | |
340 int len; | |
341 if(s->eof){ s->buf_pos=s->buf_len=0; return 0; } | |
342 if(!s->cache_pid) return stream_fill_buffer(s); | |
343 | |
2352 | 344 // cache_stats(s->cache_data); |
345 | |
2371 | 346 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 | 347 |
2322 | 348 len=cache_read(s->cache_data,s->buffer, ((cache_vars_t*)s->cache_data)->sector_size); |
2352 | 349 //printf("cache_stream_fill_buffer->read -> %d\n",len); |
2327 | 350 |
2322 | 351 if(len<=0){ s->eof=1; s->buf_pos=s->buf_len=0; return 0; } |
352 s->buf_pos=0; | |
353 s->buf_len=len; | |
354 s->pos+=len; | |
355 // printf("[%d]",len);fflush(stdout); | |
356 return len; | |
357 | |
358 } | |
359 | |
2352 | 360 int cache_stream_seek_long(stream_t *stream,off_t pos){ |
361 cache_vars_t* s; | |
362 off_t newpos; | |
363 if(!stream->cache_pid) return stream_seek_long(stream,pos); | |
364 | |
365 s=stream->cache_data; | |
366 // s->seek_lock=1; | |
367 | |
17366 | 368 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 | 369 |
2352 | 370 newpos=pos/s->sector_size; newpos*=s->sector_size; // align |
371 stream->pos=s->read_filepos=newpos; | |
372 s->eof=0; // !!!!!!! | |
373 | |
374 cache_stream_fill_buffer(stream); | |
2322 | 375 |
2352 | 376 pos-=newpos; |
377 if(pos>=0 && pos<=stream->buf_len){ | |
378 stream->buf_pos=pos; // byte position in sector | |
379 return 1; | |
380 } | |
381 | |
382 // stream->buf_pos=stream->buf_len=0; | |
383 // return 1; | |
384 | |
16750
0a31740dd5e6
Use PRI?64 defines as format strings for 64 bit variables.
reimar
parents:
16152
diff
changeset
|
385 mp_msg(MSGT_CACHE,MSGL_V,"cache_stream_seek: WARNING! Can't seek to 0x%"PRIX64" !\n",(int64_t)(pos+newpos)); |
2322 | 386 return 0; |
387 } |