annotate libmpdemux/cache2.c @ 3511:70a686041bbe

better benchmarking
author michael
date Sun, 16 Dec 2001 02:47:03 +0000
parents eb6f70125851
children e84d6c8ff59b
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
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
11
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
12 #include <stdio.h>
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
13 #include <stdlib.h>
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
14 #include <string.h>
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
15 #include <signal.h>
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
16
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
17 #include "../linux/shmem.h"
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
18
2371
0f2cad867121 printf->mp_msg
arpi
parents: 2352
diff changeset
19 #include "mp_msg.h"
0f2cad867121 printf->mp_msg
arpi
parents: 2352
diff changeset
20
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
21 #include "stream.h"
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
22
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
23 int stream_fill_buffer(stream_t *s);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
24 int stream_seek_long(stream_t *s,off_t pos);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
25
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
26
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
27 typedef struct {
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
28 // constats:
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
29 unsigned char *buffer; // base pointer of the alllocated buffer memory
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
30 int buffer_size; // size of the alllocated buffer memory
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
31 int sector_size; // size of a single sector (2048/2324)
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
32 int back_size; // we should keep back_size amount of old bytes for backward seek
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
33 int fill_limit; // we should fill buffer only if space>=fill_limit
2374
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
34 // filler's pointers:
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
35 int eof;
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
36 off_t min_filepos; // buffer contain only a part of the file, from min-max pos
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
37 off_t max_filepos;
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
38 off_t offset; // filepos <-> bufferpos offset value (filepos of the buffer's first byte)
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
39 // reader's pointers:
2374
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
40 off_t read_filepos;
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
41 // commands/locking:
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
42 // 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
43 // int fifo_flag; // 1 if we should use FIFO to notice cache about buffer reads.
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
44 // callback
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
45 stream_t* stream;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
46 } cache_vars_t;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
47
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
48 static int min_fill=0;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
49 static int sleep_flag=0;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
50
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
51 int cache_fill_status=0;
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
52
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
53 void cache_stats(cache_vars_t* s){
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
54 int newb=s->max_filepos-s->read_filepos; // new bytes in the buffer
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
55 printf("0x%06X [0x%06X] 0x%06X ",s->min_filepos,s->read_filepos,s->max_filepos);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
56 printf("%3d %% (%3d%%)\n",100*newb/s->buffer_size,100*min_fill/s->buffer_size);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
57 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
58
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
59 int cache_read(cache_vars_t* s,unsigned char* buf,int size){
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
60 int total=0;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
61 while(size>0){
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
62 int pos,newb,len;
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
63
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
64 //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
65
2374
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
66 if(s->read_filepos>=s->max_filepos || s->read_filepos<s->min_filepos){
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
67 // eof?
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
68 if(s->eof) break;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
69 // waiting for buffer fill...
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
70 usleep(READ_USLEEP_TIME); // 10ms
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
71 continue; // try again...
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
72 }
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
73
2374
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
74 newb=s->max_filepos-s->read_filepos; // new bytes in the buffer
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
75 if(newb<min_fill) min_fill=newb; // statistics...
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
76
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
77 // printf("*** newb: %d bytes ***\n",newb);
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
78
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
79 pos=s->read_filepos - s->offset;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
80 if(pos<0) pos+=s->buffer_size; else
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
81 if(pos>=s->buffer_size) pos-=s->buffer_size;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
82
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
83 if(newb>s->buffer_size-pos) newb=s->buffer_size-pos; // handle wrap...
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
84 if(newb>size) newb=size;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
85
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
86 // check:
2371
0f2cad867121 printf->mp_msg
arpi
parents: 2352
diff changeset
87 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
88
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
89 // len=write(mem,newb)
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
90 //printf("Buffer read: %d bytes\n",newb);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
91 memcpy(buf,&s->buffer[pos],newb);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
92 buf+=newb;
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
93 len=newb;
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
94 // ...
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
95
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
96 s->read_filepos+=len;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
97 size-=len;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
98 total+=len;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
99
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
100 }
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
101 cache_fill_status=100*(s->max_filepos-s->read_filepos)/s->buffer_size;
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
102 return total;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
103 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
104
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
105 int cache_fill(cache_vars_t* s){
2374
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
106 int back,back2,newb,space,len,pos,endpos;
eb6f70125851 largefileization
arpi
parents: 2371
diff changeset
107 off_t read=s->read_filepos;
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
108
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
109 if(read<s->min_filepos || read>s->max_filepos){
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
110 // seek...
2371
0f2cad867121 printf->mp_msg
arpi
parents: 2352
diff changeset
111 mp_msg(MSGT_CACHE,MSGL_DBG2,"Out of boundaries... seeking to 0x%X \n",read);
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
112 s->offset= // FIXME!?
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
113 s->min_filepos=s->max_filepos=read; // drop cache content :(
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
114 if(s->stream->eof) stream_reset(s->stream);
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
115 stream_seek(s->stream,read);
2371
0f2cad867121 printf->mp_msg
arpi
parents: 2352
diff changeset
116 mp_msg(MSGT_CACHE,MSGL_DBG2,"Seek done. new pos: 0x%X \n",(int)stream_tell(s->stream));
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
117 }
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
118
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
119 // calc number of back-bytes:
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
120 back=read - s->min_filepos;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
121 if(back<0) back=0; // strange...
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
122 if(back>s->back_size) back=s->back_size;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
123
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
124 // calc number of new bytes:
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
125 newb=s->max_filepos - read;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
126 if(newb<0) newb=0; // strange...
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
127
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
128 // calc free buffer space:
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
129 space=s->buffer_size - (newb+back);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
130
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
131 // calc bufferpos:
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
132 pos=s->max_filepos - s->offset;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
133 if(pos>=s->buffer_size) pos-=s->buffer_size; // wrap-around
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
134
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
135 if(space<s->fill_limit){
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
136 // printf("Buffer is full (%d bytes free, limit: %d)\n",space,s->fill_limit);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
137 return 0; // no fill...
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
138 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
139
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
140 // 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
141
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
142 // reduce space if needed:
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
143 if(space>s->buffer_size-pos) space=s->buffer_size-pos;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
144
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
145 // if(space>32768) space=32768; // limit one-time block size
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
146 if(space>4*s->sector_size) space=4*s->sector_size;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
147
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
148 // if(s->seek_lock) return 0; // FIXME
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
149
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
150 #if 1
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
151 // back+newb+space <= buffer_size
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
152 back2=s->buffer_size-(space+newb); // max back size
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
153 if(s->min_filepos<(read-back2)) s->min_filepos=read-back2;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
154 #else
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
155 s->min_filepos=read-back; // avoid seeking-back to temp area...
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
156 #endif
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
157
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
158 // ....
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
159 //printf("Buffer fill: %d bytes of %d\n",space,s->buffer_size);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
160 //len=stream_fill_buffer(s->stream);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
161 //memcpy(&s->buffer[pos],s->stream->buffer,len); // avoid this extra copy!
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
162 // ....
2348
76778e307ddc EOF bug fixed
arpi
parents: 2327
diff changeset
163 len=stream_read(s->stream,&s->buffer[pos],space);
76778e307ddc EOF bug fixed
arpi
parents: 2327
diff changeset
164 if(!len) s->eof=1;
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
165
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
166 s->max_filepos+=len;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
167 if(pos+len>=s->buffer_size){
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
168 // wrap...
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
169 s->offset+=s->buffer_size;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
170 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
171
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
172 return len;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
173
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
174 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
175
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
176 cache_vars_t* cache_init(int size,int sector){
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
177 int num;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
178 cache_vars_t* s=shmem_alloc(sizeof(cache_vars_t));
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
179 memset(s,0,sizeof(cache_vars_t));
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
180 num=size/sector;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
181 s->buffer_size=num*sector;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
182 s->sector_size=sector;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
183 s->buffer=shmem_alloc(s->buffer_size);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
184 s->fill_limit=8*sector;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
185 s->back_size=size/2;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
186 return s;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
187 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
188
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
189 static void exit_sighandler(int x){
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
190 // close stream
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
191 exit(0);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
192 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
193
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
194 void stream_enable_cache(stream_t *s,int size){
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
195 int ss=(s->type==STREAMTYPE_VCD)?VCD_SECTOR_DATA:STREAM_BUFFER_SIZE;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
196 s->cache_data=cache_init(size,ss);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
197 ((cache_vars_t*)s->cache_data)->stream=s; // callback
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
198 if((s->cache_pid=fork())) return; // parent exits
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
199 // cache thread mainloop:
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
200 signal(SIGTERM,exit_sighandler); // kill
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
201 while(1){
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
202 if(!cache_fill(s->cache_data)){
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
203 usleep(FILL_USLEEP_TIME); // idle
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
204 }
2327
2332ba356d03 print stats at read instead of fill
arpi
parents: 2324
diff changeset
205 // cache_stats(s->cache_data);
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
206 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
207 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
208
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
209 int cache_stream_fill_buffer(stream_t *s){
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
210 int len;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
211 if(s->eof){ s->buf_pos=s->buf_len=0; return 0; }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
212 if(!s->cache_pid) return stream_fill_buffer(s);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
213
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
214 // cache_stats(s->cache_data);
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
215
2371
0f2cad867121 printf->mp_msg
arpi
parents: 2352
diff changeset
216 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
217
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
218 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
219 //printf("cache_stream_fill_buffer->read -> %d\n",len);
2327
2332ba356d03 print stats at read instead of fill
arpi
parents: 2324
diff changeset
220
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
221 if(len<=0){ s->eof=1; s->buf_pos=s->buf_len=0; return 0; }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
222 s->buf_pos=0;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
223 s->buf_len=len;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
224 s->pos+=len;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
225 // printf("[%d]",len);fflush(stdout);
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
226 return len;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
227
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
228 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
229
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
230 int cache_stream_seek_long(stream_t *stream,off_t pos){
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
231 cache_vars_t* s;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
232 off_t newpos;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
233 if(!stream->cache_pid) return stream_seek_long(stream,pos);
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
234
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
235 s=stream->cache_data;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
236 // s->seek_lock=1;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
237
2371
0f2cad867121 printf->mp_msg
arpi
parents: 2352
diff changeset
238 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
239
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
240 newpos=pos/s->sector_size; newpos*=s->sector_size; // align
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
241 stream->pos=s->read_filepos=newpos;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
242 s->eof=0; // !!!!!!!
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
243
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
244 cache_stream_fill_buffer(stream);
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
245
2352
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
246 pos-=newpos;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
247 if(pos>=0 && pos<=stream->buf_len){
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
248 stream->buf_pos=pos; // byte position in sector
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
249 return 1;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
250 }
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
251
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
252 // stream->buf_pos=stream->buf_len=0;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
253 // return 1;
3b22db95aaf6 cache seeking fixed(?)
arpi
parents: 2348
diff changeset
254
2371
0f2cad867121 printf->mp_msg
arpi
parents: 2352
diff changeset
255 #ifdef _LARGEFILE_SOURCE
0f2cad867121 printf->mp_msg
arpi
parents: 2352
diff changeset
256 mp_msg(MSGT_CACHE,MSGL_V,"cache_stream_seek: WARNING! Can't seek to 0x%llX !\n",(long long)(pos+newpos));
0f2cad867121 printf->mp_msg
arpi
parents: 2352
diff changeset
257 #else
0f2cad867121 printf->mp_msg
arpi
parents: 2352
diff changeset
258 mp_msg(MSGT_CACHE,MSGL_V,"cache_stream_seek: WARNING! Can't seek to 0x%X !\n",(pos+newpos));
0f2cad867121 printf->mp_msg
arpi
parents: 2352
diff changeset
259 #endif
2322
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
260 return 0;
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
261 }
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
262
e22ec6fce385 cache2 support
arpi
parents:
diff changeset
263 #endif