Mercurial > mplayer.hg
annotate mp3lib/sr1.c @ 4150:01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
author | alex |
---|---|
date | Mon, 14 Jan 2002 16:18:43 +0000 |
parents | 2998f74ad64e |
children | ae847143d1d7 |
rev | line source |
---|---|
1 | 1 // #define NEWBUFFERING |
2 //#define DEBUG_RESYNC | |
3 | |
4 /* 1 frame = 4608 byte PCM */ | |
5 | |
6 #ifdef __GNUC__ | |
7 #define LOCAL static inline | |
8 #else | |
9 #define LOCAL static _inline | |
10 #endif | |
11 | |
12 //#undef LOCAL | |
13 //#define LOCAL | |
14 | |
15 #include <stdlib.h> | |
16 #include <stdio.h> | |
17 #include <string.h> | |
18 #include <signal.h> | |
19 #include <math.h> | |
20 | |
21 #define real float | |
22 // #define int long | |
23 | |
24 #include "mpg123.h" | |
25 #include "huffman.h" | |
26 #include "mp3.h" | |
1040 | 27 #include "bswap.h" |
1 | 28 #include "d_cpu.h" |
29 | |
1045 | 30 #include "fastmemcpy.h" |
1 | 31 //static FILE* mp3_file=NULL; |
32 | |
33 int MP3_frames=0; | |
34 int MP3_eof=0; | |
35 int MP3_pause=0; | |
36 int MP3_filesize=0; | |
37 int MP3_fpos=0; // current file position | |
38 int MP3_framesize=0; // current framesize | |
39 int MP3_bitrate=0; // current bitrate | |
40 int MP3_samplerate=0; // current samplerate | |
41 int MP3_resync=0; | |
42 int MP3_channels=0; | |
43 int MP3_bps=2; | |
44 | |
4150
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
45 static long outscale = 32768; |
1 | 46 #include "tabinit.c" |
47 | |
4150
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
48 #if 1 |
1 | 49 extern int mplayer_audio_read(char *buf,int size); |
50 | |
51 LOCAL int mp3_read(char *buf,int size){ | |
52 // int len=fread(buf,1,size,mp3_file); | |
53 int len=mplayer_audio_read(buf,size); | |
54 if(len>0) MP3_fpos+=len; | |
55 // if(len!=size) MP3_eof=1; | |
56 return len; | |
57 } | |
58 #else | |
59 extern int mp3_read(char *buf,int size); | |
60 #endif | |
61 | |
62 //void mp3_seek(int pos){ | |
63 // fseek(mp3_file,pos,SEEK_SET); | |
64 // return (MP3_fpos=ftell(mp3_file)); | |
65 //} | |
66 | |
67 /* Frame reader */ | |
68 | |
69 #define MAXFRAMESIZE 1280 | |
70 #define MAXFRAMESIZE2 (512+MAXFRAMESIZE) | |
71 | |
72 static int fsizeold=0,ssize=0; | |
73 static unsigned char bsspace[2][MAXFRAMESIZE2]; /* !!!!! */ | |
74 static unsigned char *bsbufold=bsspace[0]+512; | |
75 static unsigned char *bsbuf=bsspace[1]+512; | |
76 static int bsnum=0; | |
77 | |
78 static int bitindex; | |
79 static unsigned char *wordpointer; | |
80 static int bitsleft; | |
81 | |
4150
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
82 unsigned char *pcm_sample; /* outbuffer address */ |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
83 int pcm_point = 0; /* outbuffer offset */ |
1 | 84 |
85 static struct frame fr; | |
86 | |
87 static int tabsel_123[2][3][16] = { | |
88 { {0,32,64,96,128,160,192,224,256,288,320,352,384,416,448,}, | |
89 {0,32,48,56, 64, 80, 96,112,128,160,192,224,256,320,384,}, | |
90 {0,32,40,48, 56, 64, 80, 96,112,128,160,192,224,256,320,} }, | |
91 | |
92 { {0,32,48,56,64,80,96,112,128,144,160,176,192,224,256,}, | |
93 {0,8,16,24,32,40,48,56,64,80,96,112,128,144,160,}, | |
94 {0,8,16,24,32,40,48,56,64,80,96,112,128,144,160,} } | |
95 }; | |
96 | |
97 static long freqs[9] = { 44100, 48000, 32000, 22050, 24000, 16000 , 11025 , 12000 , 8000 }; | |
98 | |
99 LOCAL unsigned int getbits(short number_of_bits) | |
100 { | |
101 unsigned long rval; | |
102 // if(MP3_frames>=7741) printf("getbits: bits=%d bitsleft=%d wordptr=%x\n",number_of_bits,bitsleft,wordpointer); | |
103 if((bitsleft-=number_of_bits)<0) return 0; | |
104 if(!number_of_bits) return 0; | |
105 rval = wordpointer[0]; | |
106 rval <<= 8; | |
107 rval |= wordpointer[1]; | |
108 rval <<= 8; | |
109 rval |= wordpointer[2]; | |
110 rval <<= bitindex; | |
111 rval &= 0xffffff; | |
112 bitindex += number_of_bits; | |
113 rval >>= (24-number_of_bits); | |
114 wordpointer += (bitindex>>3); | |
115 bitindex &= 7; | |
116 return rval; | |
117 } | |
118 | |
119 | |
120 LOCAL unsigned int getbits_fast(short number_of_bits) | |
121 { | |
122 unsigned long rval; | |
123 // if(MP3_frames>=7741) printf("getbits_fast: bits=%d bitsleft=%d wordptr=%x\n",number_of_bits,bitsleft,wordpointer); | |
124 if((bitsleft-=number_of_bits)<0) return 0; | |
125 if(!number_of_bits) return 0; | |
4150
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
126 #if (defined(RUNTIME_CPUDETECT) && defined(CAN_COMPILE_X86_ASM)) || defined(ARCH_X86) |
1040 | 127 rval = bswap_16(*((unsigned short *)wordpointer)); |
1309
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1276
diff
changeset
|
128 #else |
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1276
diff
changeset
|
129 /* |
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1276
diff
changeset
|
130 * we may not be able to address unaligned 16-bit data on non-x86 cpus. |
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1276
diff
changeset
|
131 * Fall back to some portable code. |
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1276
diff
changeset
|
132 */ |
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1276
diff
changeset
|
133 rval = wordpointer[0] << 8 | wordpointer[1]; |
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1276
diff
changeset
|
134 #endif |
1 | 135 rval <<= bitindex; |
136 rval &= 0xffff; | |
137 bitindex += number_of_bits; | |
138 rval >>= (16-number_of_bits); | |
139 wordpointer += (bitindex>>3); | |
140 bitindex &= 7; | |
141 return rval; | |
142 } | |
143 | |
144 LOCAL unsigned int get1bit(void) | |
145 { | |
146 unsigned char rval; | |
147 // if(MP3_frames>=7741) printf("get1bit: bitsleft=%d wordptr=%x\n",bitsleft,wordpointer); | |
148 if((--bitsleft)<0) return 0; | |
149 rval = *wordpointer << bitindex; | |
150 bitindex++; | |
151 wordpointer += (bitindex>>3); | |
152 bitindex &= 7; | |
153 return ((rval>>7)&1); | |
154 } | |
155 | |
156 LOCAL void set_pointer(long backstep) | |
157 { | |
158 // if(backstep!=512 && backstep>fsizeold) | |
159 // printf("\rWarning! backstep (%d>%d) \n",backstep,fsizeold); | |
160 wordpointer = bsbuf + ssize - backstep; | |
161 if (backstep) memcpy(wordpointer,bsbufold+fsizeold-backstep,backstep); | |
162 bitindex = 0; | |
163 bitsleft+=8*backstep; | |
164 // printf("Backstep %d (bitsleft=%d)\n",backstep,bitsleft); | |
165 } | |
166 | |
167 LOCAL int stream_head_read(unsigned char *hbuf,unsigned long *newhead){ | |
168 if(mp3_read(hbuf,4) != 4) return FALSE; | |
4150
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
169 #if (defined(RUNTIME_CPUDETECT) && defined(CAN_COMPILE_X86_ASM)) || defined(ARCH_X86) |
1040 | 170 *newhead = bswap_32(*((unsigned long *)hbuf)); |
1309
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1276
diff
changeset
|
171 #else |
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1276
diff
changeset
|
172 /* |
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1276
diff
changeset
|
173 * we may not be able to address unaligned 32-bit data on non-x86 cpus. |
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1276
diff
changeset
|
174 * Fall back to some portable code. |
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1276
diff
changeset
|
175 */ |
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1276
diff
changeset
|
176 *newhead = |
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1276
diff
changeset
|
177 hbuf[0] << 24 | |
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1276
diff
changeset
|
178 hbuf[1] << 16 | |
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1276
diff
changeset
|
179 hbuf[2] << 8 | |
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1276
diff
changeset
|
180 hbuf[3]; |
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1276
diff
changeset
|
181 #endif |
1040 | 182 return TRUE; |
1 | 183 } |
184 | |
185 LOCAL int stream_head_shift(unsigned char *hbuf,unsigned long *head){ | |
1040 | 186 *((unsigned long *)hbuf) >>= 8; |
1 | 187 if(mp3_read(hbuf+3,1) != 1) return 0; |
188 *head <<= 8; | |
189 *head |= hbuf[3]; | |
190 return 1; | |
191 } | |
192 | |
193 /* | |
194 * decode a header and write the information | |
195 * into the frame structure | |
196 */ | |
197 LOCAL int decode_header(struct frame *fr,unsigned long newhead){ | |
198 | |
199 // head_check: | |
1040 | 200 if( (newhead & 0xffe00000) != 0xffe00000 || |
1045 | 201 (newhead & 0x0000fc00) == 0x0000fc00) return FALSE; |
1 | 202 |
203 fr->lay = 4-((newhead>>17)&3); | |
204 // if(fr->lay!=3) return FALSE; | |
205 | |
206 if( newhead & ((long)1<<20) ) { | |
207 fr->lsf = (newhead & ((long)1<<19)) ? 0x0 : 0x1; | |
208 fr->mpeg25 = 0; | |
209 } else { | |
210 fr->lsf = 1; | |
211 fr->mpeg25 = 1; | |
212 } | |
213 | |
214 if(fr->mpeg25) | |
215 fr->sampling_frequency = 6 + ((newhead>>10)&0x3); | |
216 else | |
217 fr->sampling_frequency = ((newhead>>10)&0x3) + (fr->lsf*3); | |
218 | |
1166
95f6f14176c6
fr->sampling_frequency limitation (thanx to pl <p_l@tfz.net>)
arpi_esp
parents:
1045
diff
changeset
|
219 if(fr->sampling_frequency>8) return FALSE; // valid: 0..8 |
95f6f14176c6
fr->sampling_frequency limitation (thanx to pl <p_l@tfz.net>)
arpi_esp
parents:
1045
diff
changeset
|
220 |
1 | 221 fr->error_protection = ((newhead>>16)&0x1)^0x1; |
222 fr->bitrate_index = ((newhead>>12)&0xf); | |
223 fr->padding = ((newhead>>9)&0x1); | |
224 fr->extension = ((newhead>>8)&0x1); | |
225 fr->mode = ((newhead>>6)&0x3); | |
226 fr->mode_ext = ((newhead>>4)&0x3); | |
227 fr->copyright = ((newhead>>3)&0x1); | |
228 fr->original = ((newhead>>2)&0x1); | |
229 fr->emphasis = newhead & 0x3; | |
230 | |
231 MP3_channels = fr->stereo = (fr->mode == MPG_MD_MONO) ? 1 : 2; | |
232 | |
233 if(!fr->bitrate_index){ | |
234 // fprintf(stderr,"Free format not supported.\n"); | |
235 return FALSE; | |
236 } | |
237 | |
238 switch(fr->lay){ | |
239 case 2: | |
240 MP3_bitrate=tabsel_123[fr->lsf][1][fr->bitrate_index]; | |
241 MP3_samplerate=freqs[fr->sampling_frequency]; | |
242 fr->framesize = (long) MP3_bitrate * 144000; | |
243 fr->framesize /= MP3_samplerate; | |
244 MP3_framesize=fr->framesize; | |
245 fr->framesize += fr->padding - 4; | |
246 break; | |
247 case 3: | |
248 if(fr->lsf) | |
249 ssize = (fr->stereo == 1) ? 9 : 17; | |
250 else | |
251 ssize = (fr->stereo == 1) ? 17 : 32; | |
252 if(fr->error_protection) ssize += 2; | |
253 | |
254 MP3_bitrate=tabsel_123[fr->lsf][2][fr->bitrate_index]; | |
255 MP3_samplerate=freqs[fr->sampling_frequency]; | |
256 fr->framesize = (long) MP3_bitrate * 144000; | |
257 fr->framesize /= MP3_samplerate<<(fr->lsf); | |
258 MP3_framesize=fr->framesize; | |
259 fr->framesize += fr->padding - 4; | |
260 break; | |
261 default: | |
262 // fprintf(stderr,"Sorry, unsupported layer type.\n"); | |
263 return 0; | |
264 } | |
265 if(fr->framesize<=0 || fr->framesize>MAXFRAMESIZE) return FALSE; | |
266 | |
267 return 1; | |
268 } | |
269 | |
270 | |
271 LOCAL int stream_read_frame_body(int size){ | |
272 | |
273 /* flip/init buffer for Layer 3 */ | |
274 bsbufold = bsbuf; | |
275 bsbuf = bsspace[bsnum]+512; | |
276 bsnum = (bsnum + 1) & 1; | |
277 | |
278 if( mp3_read(bsbuf,size) != size) return 0; // broken frame | |
279 | |
280 bitindex = 0; | |
281 wordpointer = (unsigned char *) bsbuf; | |
282 bitsleft=8*size; | |
283 | |
284 return 1; | |
285 } | |
286 | |
287 | |
288 /***************************************************************** | |
289 * read next frame return number of frames read. | |
290 */ | |
291 LOCAL int read_frame(struct frame *fr){ | |
292 unsigned long newhead; | |
293 unsigned char hbuf[8]; | |
294 int skipped,resyncpos; | |
295 int frames=0; | |
296 | |
297 resync: | |
298 skipped=MP3_fpos; | |
299 resyncpos=MP3_fpos; | |
300 | |
301 set_pointer(512); | |
302 fsizeold=fr->framesize; /* for Layer3 */ | |
303 if(!stream_head_read(hbuf,&newhead)) return 0; | |
304 if(!decode_header(fr,newhead)){ | |
305 // invalid header! try to resync stream! | |
306 #ifdef DEBUG_RESYNC | |
307 printf("ReSync: searching for a valid header... (pos=%X)\n",MP3_fpos); | |
308 #endif | |
309 retry1: | |
310 while(!decode_header(fr,newhead)){ | |
311 if(!stream_head_shift(hbuf,&newhead)) return 0; | |
312 } | |
313 resyncpos=MP3_fpos-4; | |
314 // found valid header | |
315 #ifdef DEBUG_RESYNC | |
316 printf("ReSync: found valid hdr at %X fsize=%ld ",resyncpos,fr->framesize); | |
317 #endif | |
318 if(!stream_read_frame_body(fr->framesize)) return 0; // read body | |
319 set_pointer(512); | |
320 fsizeold=fr->framesize; /* for Layer3 */ | |
321 if(!stream_head_read(hbuf,&newhead)) return 0; | |
322 if(!decode_header(fr,newhead)){ | |
323 // invalid hdr! go back... | |
324 #ifdef DEBUG_RESYNC | |
325 printf("INVALID\n"); | |
326 #endif | |
327 // mp3_seek(resyncpos+1); | |
328 if(!stream_head_read(hbuf,&newhead)) return 0; | |
329 goto retry1; | |
330 } | |
331 #ifdef DEBUG_RESYNC | |
332 printf("OK!\n"); | |
333 ++frames; | |
334 #endif | |
335 } | |
336 | |
337 skipped=resyncpos-skipped; | |
338 // if(skipped && !MP3_resync) printf("\r%d bad bytes skipped (resync at 0x%X) \n",skipped,resyncpos); | |
339 | |
340 // printf("%8X [%08X] %d %d (%d)%s%s\n",MP3_fpos-4,newhead,fr->framesize,fr->mode,fr->mode_ext,fr->error_protection?" CRC":"",fr->padding?" PAD":""); | |
341 | |
342 /* read main data into memory */ | |
343 if(!stream_read_frame_body(fr->framesize)){ | |
344 printf("\nBroken frame at 0x%X \n",resyncpos); | |
345 return 0; | |
346 } | |
347 ++frames; | |
348 | |
349 if(MP3_resync){ | |
350 MP3_resync=0; | |
351 if(frames==1) goto resync; | |
352 } | |
353 | |
354 return frames; | |
355 } | |
356 | |
357 #include "layer2.c" | |
358 #include "layer3.c" | |
359 | |
360 /******************************************************************************/ | |
361 /* PUBLIC FUNCTIONS */ | |
362 /******************************************************************************/ | |
363 | |
364 static int tables_done_flag=0; | |
365 | |
1245
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
366 /* It's hidden from gcc in assembler */ |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
367 extern void dct64_MMX( void ); |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
368 extern void dct64_MMX_3dnow( void ); |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
369 extern void dct64_MMX_3dnowex( void ); |
1393 | 370 extern void dct64_MMX_sse( void ); |
1245
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
371 void (*dct64_MMX_func)( void ); |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
372 |
3088
73c2e9304d08
changed to use cpudetect.c (to use change te #if 1 -> #if 0 :)
alex
parents:
1393
diff
changeset
|
373 #include "../cpudetect.h" |
73c2e9304d08
changed to use cpudetect.c (to use change te #if 1 -> #if 0 :)
alex
parents:
1393
diff
changeset
|
374 |
1 | 375 // Init decoder tables. Call first, once! |
732
e14114170e01
applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents:
73
diff
changeset
|
376 #ifdef USE_FAKE_MONO |
e14114170e01
applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents:
73
diff
changeset
|
377 void MP3_Init(int fakemono){ |
e14114170e01
applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents:
73
diff
changeset
|
378 #else |
1 | 379 void MP3_Init(){ |
732
e14114170e01
applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents:
73
diff
changeset
|
380 #endif |
4150
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
381 |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
382 #if 0 |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
383 #ifdef RUNTIME_CPUDETECT |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
384 #ifdef CAN_COMPILE_X86_ASM |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
385 if (gCpuCaps.hasMMX) |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
386 { |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
387 make_decode_tables_MMX(outscale); |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
388 printf("mp3lib: made decode tables with MMX optimization\n"); |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
389 } |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
390 else |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
391 make_decode_tables(outscale); |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
392 #else |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
393 make_decode_tables(outscale); |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
394 #endif |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
395 #else /* RUNTIME_CPUDETECT */ |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
396 #ifdef HAVE_MMX |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
397 make_decode_tables_MMX(outscale); |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
398 printf("mp3lib: made decode tables with MMX optimization\n"); |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
399 #else |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
400 make_decode_tables(outscale); |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
401 #endif |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
402 #endif /* RUNTIME_CPUDTECT */ |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
403 |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
404 #ifdef USE_FAKE_MONO |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
405 if (fakemono == 1) |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
406 fr.synth = synth_1to1_l; |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
407 else if (fakemono == 2) |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
408 fr.synth = synth_1to1_r; |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
409 else |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
410 fr.synth = synth_1to1; |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
411 #else |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
412 fr.synth = synth_1to1; |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
413 #endif |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
414 fr.synth_mono = synth_1to1_mono2stereo; |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
415 fr.down_sample = 0; |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
416 fr.down_sample_sblimit = SBLIMIT>>(fr.down_sample); |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
417 init_layer2(); |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
418 init_layer3(fr.down_sample_sblimit); |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
419 tables_done_flag = 1; |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
420 |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
421 dct36_func = dct36; |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
422 printf("init layer2&3 finished, tables done\n"); |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
423 |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
424 #ifdef RUNTIME_CPUDETECT |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
425 #ifdef CAN_COMPILE_X86_ASM |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
426 #if 0 |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
427 if(gCpuCaps.hasSSE) |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
428 { |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
429 /* SSE version is buggy */ |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
430 synth_func = synth_1to1_MMX; |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
431 dct64_MMX_func = dct64_MMX_sse; |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
432 printf("mp3lib: using SSE optimized decore!\n"); |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
433 } |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
434 else |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
435 #endif |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
436 if (gCpuCaps.has3DNowExt) |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
437 { |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
438 synth_func = synth_1to1_MMX; |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
439 dct36_func = dct36_3dnowex; |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
440 dct64_MMX_func = dct64_MMX_3dnowex; |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
441 printf("mp3lib: using 3DNow!Ex optimized decore!\n"); |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
442 } |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
443 else |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
444 if (gCpuCaps.has3DNow) |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
445 { |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
446 synth_func = synth_1to1_MMX; |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
447 dct36_func = dct36_3dnow; |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
448 dct64_MMX_func = dct64_MMX_3dnow; |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
449 printf("mp3lib: using 3DNow! optimized decore!\n"); |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
450 } |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
451 else |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
452 if (gCpuCaps.hasMMX) |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
453 { |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
454 synth_func = synth_1to1_MMX; |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
455 dct64_MMX_func = dct64_MMX; |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
456 printf("mp3lib: using MMX optimized decore!\n"); |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
457 } |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
458 else |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
459 if (gCpuCaps.cpuType >= CPUTYPE_I586) |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
460 { |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
461 synth_func = synth_1to1_pent; |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
462 printf("mp3lib: using Pentium optimized decore!\n"); |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
463 } |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
464 else |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
465 { |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
466 synth_func = NULL; /* use default c version */ |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
467 printf("mp3lib: using generic decore!\n"); |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
468 } |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
469 #else /* CAN_COMPILE_X86_ASM */ |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
470 synth_func = NULL; |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
471 printf("mp3lib: using generic decore!\n"); |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
472 #endif |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
473 #else /* RUNTIME_CPUDETECT */ |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
474 |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
475 #if 0 |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
476 /* SSE version is buggy */ |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
477 synth_func = synth_1to1_MMX; |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
478 dct64_MMX_func = dct64_MMX_sse; |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
479 printf("mp3lib: using SSE optimized decore!\n"); |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
480 #endif |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
481 |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
482 #ifdef HAVE_3DNOWEX |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
483 synth_func = synth_1to1_MMX; |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
484 dct36_func = dct36_3dnowex; |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
485 dct64_MMX_func = dct64_MMX_3dnowex; |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
486 printf("mp3lib: using 3DNow!Ex optimized decore!\n"); |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
487 #elif defined(HAVE_3DNOW) |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
488 synth_func = synth_1to1_MMX; |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
489 dct36_func = dct36_3dnow; |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
490 dct64_MMX_func = dct64_MMX_3dnow; |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
491 printf("mp3lib: using 3DNow! optimized decore!\n"); |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
492 #elif defined(HAVE_MMX) |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
493 synth_func = synth_1to1_MMX; |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
494 dct64_MMX_func = dct64_MMX; |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
495 printf("mp3lib: using MMX optimized decore!\n"); |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
496 #elif defined(__CPU__ > 586) |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
497 synth_func = synth_1to1_pent; |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
498 printf("mp3lib: using Pentium optimized decore!\n"); |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
499 #else |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
500 synth_func = NULL; /* use default c version */ |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
501 printf("mp3lib: using generic decore!\n"); |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
502 #endif |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
503 #endif /* RUNTIME_CPUDETECT */ |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
504 |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
505 #else |
1253 | 506 #ifdef ARCH_X86 |
1 | 507 _CpuID=CpuDetect(); |
508 _i586=ipentium(); | |
1245
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
509 #ifndef HAVE_MMX |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
510 _i586 &= 1; |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
511 #endif |
1 | 512 _3dnow=a3dnow(); |
1245
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
513 #ifndef HAVE_3DNOW |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
514 _3dnow = 0; |
1 | 515 #endif |
1245
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
516 #ifndef HAVE_3DNOWEX |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
517 _3dnow &= 1; |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
518 #endif |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
519 _isse=isse(); |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
520 #ifndef HAVE_SSE |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
521 _isse = 0; |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
522 #endif |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
523 #ifndef HAVE_SSE2 |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
524 _isse &= 1; |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
525 #endif |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
526 _has_mmx=_i586>1||_3dnow||_isse; |
1 | 527 printf( "mp3lib: Processor ID: %x\n",_CpuID ); |
1245
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
528 if(_i586&&!_3dnow&&!_isse) |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
529 printf( "mp3lib: Using Pentium%s optimized decore.\n",(_i586>1?"-MMX":"")); |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
530 else |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
531 if(_isse) |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
532 /* |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
533 Note: It's ok, Since K8 will have SSE2 support and will much faster |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
534 of P4 ;) |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
535 */ |
3203
8312f4bc8dab
Disable SSE code and reenable FPU dct for SSE cpus (fpu code is 0.3% faster and I don't get data aligned in dct64_sse.s, so I can't finish optimizing it)
atmos4
parents:
3088
diff
changeset
|
536 // printf( "mp3lib: Using SSE%s! optimized decore.\n",(_isse>1?"2":"")); |
8312f4bc8dab
Disable SSE code and reenable FPU dct for SSE cpus (fpu code is 0.3% faster and I don't get data aligned in dct64_sse.s, so I can't finish optimizing it)
atmos4
parents:
3088
diff
changeset
|
537 printf( "mp3lib: Using Pentium%s optimized decore.\n",(_i586>1?"-MMX":"")); |
1245
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
538 else |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
539 if(_3dnow) |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
540 printf( "mp3lib: Using AMD 3dnow%s! optimized decore.\n",(_3dnow>1?"-dsp(k7)":"")); |
1253 | 541 #else |
542 _CpuID = _i586 = _3dnow = _isse = _has_mmx = 0; | |
543 printf( "mp3lib: Using generic decore.\n"); | |
544 #endif | |
1276 | 545 #ifdef HAVE_MMX |
1245
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
546 /* Use it for any MMX cpu */ |
1276 | 547 if(_has_mmx) |
4150
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
548 { |
1276 | 549 make_decode_tables_MMX(outscale); |
4150
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
550 printf("mp3lib: made decode tables with MMX optimization\n"); |
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
551 } |
1276 | 552 else |
553 #endif | |
554 make_decode_tables(outscale); | |
732
e14114170e01
applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents:
73
diff
changeset
|
555 #ifdef USE_FAKE_MONO |
e14114170e01
applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents:
73
diff
changeset
|
556 if (fakemono == 1) |
e14114170e01
applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents:
73
diff
changeset
|
557 fr.synth=synth_1to1_l; |
e14114170e01
applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents:
73
diff
changeset
|
558 else if (fakemono == 2) |
e14114170e01
applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents:
73
diff
changeset
|
559 fr.synth=synth_1to1_r; |
e14114170e01
applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents:
73
diff
changeset
|
560 else |
e14114170e01
applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents:
73
diff
changeset
|
561 fr.synth=synth_1to1; |
e14114170e01
applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents:
73
diff
changeset
|
562 #else |
1 | 563 fr.synth=synth_1to1; |
732
e14114170e01
applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents:
73
diff
changeset
|
564 #endif |
1 | 565 fr.synth_mono=synth_1to1_mono2stereo; |
566 fr.down_sample=0; | |
567 fr.down_sample_sblimit = SBLIMIT>>(fr.down_sample); | |
568 init_layer2(); | |
569 init_layer3(fr.down_sample_sblimit); | |
570 tables_done_flag=1; | |
1245
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
571 |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
572 dct36_func=dct36; |
3203
8312f4bc8dab
Disable SSE code and reenable FPU dct for SSE cpus (fpu code is 0.3% faster and I don't get data aligned in dct64_sse.s, so I can't finish optimizing it)
atmos4
parents:
3088
diff
changeset
|
573 /*#ifdef HAVE_SSE |
1245
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
574 if(_isse) |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
575 { |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
576 synth_func=synth_1to1_MMX; |
1393 | 577 dct64_MMX_func=dct64_MMX_sse; |
1245
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
578 } |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
579 else |
3203
8312f4bc8dab
Disable SSE code and reenable FPU dct for SSE cpus (fpu code is 0.3% faster and I don't get data aligned in dct64_sse.s, so I can't finish optimizing it)
atmos4
parents:
3088
diff
changeset
|
580 #endif*/ |
1258 | 581 #ifdef HAVE_3DNOWEX |
1245
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
582 if ( _3dnow > 1 ) |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
583 { |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
584 synth_func=synth_1to1_MMX; |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
585 dct36_func=dct36_3dnowex; |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
586 dct64_MMX_func=dct64_MMX_3dnowex; |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
587 } |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
588 else |
1258 | 589 #endif |
590 #ifdef HAVE_3DNOW | |
1245
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
591 if ( _3dnow ) |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
592 { |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
593 synth_func=synth_1to1_MMX; |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
594 dct36_func=dct36_3dnow; |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
595 dct64_MMX_func=dct64_MMX_3dnow; |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
596 } |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
597 else |
1258 | 598 #endif |
599 #ifdef HAVE_MMX | |
1245
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
600 if ( _i586 > 1) |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
601 { |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
602 synth_func=synth_1to1_MMX; |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
603 dct64_MMX_func=dct64_MMX; |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
604 } |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
605 else |
1258 | 606 #endif |
607 #ifdef ARCH_X86 | |
1245
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
608 if ( _i586 ) |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
609 { |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
610 synth_func=synth_1to1_pent; |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
611 } |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
612 else |
1258 | 613 #endif |
1245
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
614 { |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
615 synth_func = NULL; |
03b7e2955a20
Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents:
1166
diff
changeset
|
616 } |
3088
73c2e9304d08
changed to use cpudetect.c (to use change te #if 1 -> #if 0 :)
alex
parents:
1393
diff
changeset
|
617 #endif |
1 | 618 } |
619 | |
620 #if 0 | |
621 | |
622 void MP3_Close(){ | |
623 MP3_eof=1; | |
624 if(mp3_file) fclose(mp3_file); | |
625 mp3_file=NULL; | |
626 } | |
627 | |
628 // Open a file, init buffers. Call once per file! | |
629 int MP3_Open(char *filename,int buffsize){ | |
630 MP3_eof=1; // lock decoding | |
631 MP3_pause=1; // lock playing | |
632 if(mp3_file) MP3_Close(); // close prev. file | |
633 MP3_frames=0; | |
634 | |
635 mp3_file=fopen(filename,"rb"); | |
636 // printf("MP3_Open: file='%s'",filename); | |
637 // if(!mp3_file){ printf(" not found!\n"); return 0;} else printf("Ok!\n"); | |
638 if(!mp3_file) return 0; | |
639 | |
640 MP3_filesize=MP3_PrintTAG(); | |
641 fseek(mp3_file,0,SEEK_SET); | |
642 | |
643 MP3_InitBuffers(buffsize); | |
644 if(!tables_done_flag) MP3_Init(); | |
645 MP3_eof=0; // allow decoding | |
646 MP3_pause=0; // allow playing | |
647 return MP3_filesize; | |
648 } | |
649 | |
650 #endif | |
651 | |
652 // Read & decode a single frame. Called by sound driver. | |
653 int MP3_DecodeFrame(unsigned char *hova,short single){ | |
654 pcm_sample = hova; | |
655 pcm_point = 0; | |
656 if(!read_frame(&fr))return(0); | |
657 if(single==-2){ set_pointer(512); return(1); } | |
658 if(fr.error_protection) getbits(16); /* skip crc */ | |
659 fr.single=single; | |
660 switch(fr.lay){ | |
661 case 2: do_layer2(&fr,single);break; | |
662 case 3: do_layer3(&fr,single);break; | |
663 } | |
664 // ++MP3_frames; | |
665 return(pcm_point?pcm_point:2); | |
666 } | |
667 | |
668 // Prints last frame header in ascii. | |
669 void MP3_PrintHeader(){ | |
670 static char *modes[4] = { "Stereo", "Joint-Stereo", "Dual-Channel", "Single-Channel" }; | |
671 static char *layers[4] = { "???" , "I", "II", "III" }; | |
672 | |
4150
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
673 printf("\rMPEG %s, Layer %s, %ld Hz %d kbit %s, BPF: %ld\n", |
1 | 674 fr.mpeg25 ? "2.5" : (fr.lsf ? "2.0" : "1.0"), |
675 layers[fr.lay],freqs[fr.sampling_frequency], | |
676 tabsel_123[fr.lsf][fr.lay-1][fr.bitrate_index], | |
677 modes[fr.mode],fr.framesize+4); | |
4150
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
678 printf("Channels: %d, copyright: %s, original: %s, CRC: %s, emphasis: %d\n", |
1 | 679 fr.stereo,fr.copyright?"Yes":"No", |
680 fr.original?"Yes":"No",fr.error_protection?"Yes":"No", | |
681 fr.emphasis); | |
682 } | |
683 | |
4150
01d0a5fabf65
runtime cpudetect support #2 - still not working (i can't identify the problems ground, also it produces no sound (no noises), but the init seems to be ok (also i didn't changed anything)...very annoying :( snipp
alex
parents:
3219
diff
changeset
|
684 #if 0 |
1 | 685 #include "genre.h" |
686 | |
687 // Read & print ID3 TAG. Do not call when playing!!! returns filesize. | |
688 int MP3_PrintTAG(){ | |
689 struct id3tag { | |
690 char tag[3]; | |
691 char title[30]; | |
692 char artist[30]; | |
693 char album[30]; | |
694 char year[4]; | |
695 char comment[30]; | |
696 unsigned char genre; | |
697 }; | |
698 struct id3tag tag; | |
699 char title[31]={0,}; | |
700 char artist[31]={0,}; | |
701 char album[31]={0,}; | |
702 char year[5]={0,}; | |
703 char comment[31]={0,}; | |
704 char genre[31]={0,}; | |
705 int fsize; | |
706 int ret; | |
707 | |
708 fseek(mp3_file,0,SEEK_END); | |
709 fsize=ftell(mp3_file); | |
710 if(fseek(mp3_file,-128,SEEK_END)) return fsize; | |
711 ret=fread(&tag,128,1,mp3_file); | |
712 if(ret!=1 || tag.tag[0]!='T' || tag.tag[1]!='A' || tag.tag[2]!='G') return fsize; | |
713 | |
714 strncpy(title,tag.title,30); | |
715 strncpy(artist,tag.artist,30); | |
716 strncpy(album,tag.album,30); | |
717 strncpy(year,tag.year,4); | |
718 strncpy(comment,tag.comment,30); | |
719 | |
720 if ( tag.genre <= sizeof(genre_table)/sizeof(*genre_table) ) { | |
721 strncpy(genre, genre_table[tag.genre], 30); | |
722 } else { | |
723 strncpy(genre,"Unknown",30); | |
724 } | |
725 | |
726 // printf("\n"); | |
727 printf("Title : %30s Artist: %s\n",title,artist); | |
728 printf("Album : %30s Year : %4s\n",album,year); | |
729 printf("Comment: %30s Genre : %s\n",comment,genre); | |
730 printf("\n"); | |
731 return fsize-128; | |
732 } | |
733 | |
734 #endif |