annotate mp3lib/sr1.c @ 22697:2fe9bd97a7f6

Fix configure -march detection for athlon-xp The configure script uses SSE support to distinguish between athlon and athlon-xp, but SSE support was tested _after_ deciding the basic CPU type. Thus athlon-xp was always misdetected as athlon. Fix this by moving the CPU extensions check before the CPU type check. Patch from Andrew Savchenko, bircoph list ru.
author uau
date Sun, 18 Mar 2007 13:38:55 +0000
parents 0cd17afe1d4b
children 84eaacdc380d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1 // #define NEWBUFFERING
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2 //#define DEBUG_RESYNC
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
4 /* 1 frame = 4608 byte PCM */
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
5
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
6 #ifdef __GNUC__
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
7 #define LOCAL static inline
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
8 #else
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
9 #define LOCAL static _inline
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
10 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
11
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
12 //#undef LOCAL
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
13 //#define LOCAL
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
14
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
15 #include <stdlib.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
16 #include <stdio.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
17 #include <string.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
18 #include <signal.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
19 #include <math.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
20
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
21 #define real float
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
22 // #define int long
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
23
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
24 #include "mpg123.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
25 #include "huffman.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
26 #include "mp3.h"
21372
1767c271d710 Remove bswap.h, use libavutil/bswap.h instead.
diego
parents: 21049
diff changeset
27 #include "libavutil/common.h"
21507
fa99b3d31d13 Hack around libavutil/bswap.h compilation problems due to always_inline undefined.
reimar
parents: 21372
diff changeset
28 #include "mpbswap.h"
16989
e7a129082fda Unify include paths, -I.. is in CFLAGS.
diego
parents: 15167
diff changeset
29 #include "cpudetect.h"
e7a129082fda Unify include paths, -I.. is in CFLAGS.
diego
parents: 15167
diff changeset
30 //#include "liba52/mm_accel.h"
e7a129082fda Unify include paths, -I.. is in CFLAGS.
diego
parents: 15167
diff changeset
31 #include "mp_msg.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
32
19431
ac69ba536915 Explicitly include libmpcodecs/img_format.h and libvo/fastmemcpy.h.
diego
parents: 19133
diff changeset
33 #include "libvo/fastmemcpy.h"
4262
ae847143d1d7 Using cpudetect code instead of d_cpu.s
nick
parents: 4150
diff changeset
34
20575
c6b69870fcd5 mp3lib asm does not compile on AMD64.
reimar
parents: 19500
diff changeset
35 #ifdef ARCH_X86_32
4262
ae847143d1d7 Using cpudetect code instead of d_cpu.s
nick
parents: 4150
diff changeset
36 #define CAN_COMPILE_X86_ASM
ae847143d1d7 Using cpudetect code instead of d_cpu.s
nick
parents: 4150
diff changeset
37 #endif
ae847143d1d7 Using cpudetect code instead of d_cpu.s
nick
parents: 4150
diff changeset
38
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
39 //static FILE* mp3_file=NULL;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
40
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
41 int MP3_frames=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
42 int MP3_eof=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
43 int MP3_pause=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
44 int MP3_filesize=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
45 int MP3_fpos=0; // current file position
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
46 int MP3_framesize=0; // current framesize
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
47 int MP3_bitrate=0; // current bitrate
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
48 int MP3_samplerate=0; // current samplerate
17300
335ca842bf7e Reverse commit 31 Dec 2005 18:56:35 -0000 1.34
gpoirier
parents: 17279
diff changeset
49 int MP3_resync=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
50 int MP3_channels=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
51 int MP3_bps=2;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
52
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
53 static long outscale = 32768;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
54 #include "tabinit.c"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
55
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
56 #if 1
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
57 extern int mplayer_audio_read(char *buf,int size);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
58
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
59 LOCAL int mp3_read(char *buf,int size){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
60 // int len=fread(buf,1,size,mp3_file);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
61 int len=mplayer_audio_read(buf,size);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
62 if(len>0) MP3_fpos+=len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
63 // if(len!=size) MP3_eof=1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
64 return len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
65 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
66 #else
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
67 extern int mp3_read(char *buf,int size);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
68 #endif
15167
07e7a572bd84 Mark modified imported files as such to comply with (L)GPL ¡ø2a.
diego
parents: 13946
diff changeset
69 /*
18783
0783dd397f74 CVS --> Subversion in copyright notices
diego
parents: 18101
diff changeset
70 * Modified for use with MPlayer, for details see the changelog at
0783dd397f74 CVS --> Subversion in copyright notices
diego
parents: 18101
diff changeset
71 * http://svn.mplayerhq.hu/mplayer/trunk/
15167
07e7a572bd84 Mark modified imported files as such to comply with (L)GPL ¡ø2a.
diego
parents: 13946
diff changeset
72 * $Id$
07e7a572bd84 Mark modified imported files as such to comply with (L)GPL ¡ø2a.
diego
parents: 13946
diff changeset
73 */
07e7a572bd84 Mark modified imported files as such to comply with (L)GPL ¡ø2a.
diego
parents: 13946
diff changeset
74
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
75
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
76 //void mp3_seek(int pos){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
77 // fseek(mp3_file,pos,SEEK_SET);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
78 // return (MP3_fpos=ftell(mp3_file));
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
79 //}
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
80
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
81 /* Frame reader */
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
82
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
83 #define MAXFRAMESIZE 1280
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
84 #define MAXFRAMESIZE2 (512+MAXFRAMESIZE)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
85
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
86 static int fsizeold=0,ssize=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
87 static unsigned char bsspace[2][MAXFRAMESIZE2]; /* !!!!! */
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
88 static unsigned char *bsbufold=bsspace[0]+512;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
89 static unsigned char *bsbuf=bsspace[1]+512;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
90 static int bsnum=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
91
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
92 static int bitindex;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
93 static unsigned char *wordpointer;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
94 static int bitsleft;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
95
12131
d155623271e3 fix symbol clashes when linking with libmp3lame including mp3 decoder, man, mp3lib is so much bloated
alex
parents: 11241
diff changeset
96 static unsigned char *pcm_sample; /* outbuffer address */
d155623271e3 fix symbol clashes when linking with libmp3lame including mp3 decoder, man, mp3lib is so much bloated
alex
parents: 11241
diff changeset
97 static int pcm_point = 0; /* outbuffer offset */
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
98
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
99 static struct frame fr;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
100
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
101 static int tabsel_123[2][3][16] = {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
102 { {0,32,64,96,128,160,192,224,256,288,320,352,384,416,448,},
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
103 {0,32,48,56, 64, 80, 96,112,128,160,192,224,256,320,384,},
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
104 {0,32,40,48, 56, 64, 80, 96,112,128,160,192,224,256,320,} },
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
105
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
106 { {0,32,48,56,64,80,96,112,128,144,160,176,192,224,256,},
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
107 {0,8,16,24,32,40,48,56,64,80,96,112,128,144,160,},
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
108 {0,8,16,24,32,40,48,56,64,80,96,112,128,144,160,} }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
109 };
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
110
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
111 static long freqs[9] = { 44100, 48000, 32000, 22050, 24000, 16000 , 11025 , 12000 , 8000 };
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
112
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
113 LOCAL unsigned int getbits(short number_of_bits)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
114 {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
115 unsigned long rval;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
116 // if(MP3_frames>=7741) printf("getbits: bits=%d bitsleft=%d wordptr=%x\n",number_of_bits,bitsleft,wordpointer);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
117 if((bitsleft-=number_of_bits)<0) return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
118 if(!number_of_bits) return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
119 rval = wordpointer[0];
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
120 rval <<= 8;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
121 rval |= wordpointer[1];
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
122 rval <<= 8;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
123 rval |= wordpointer[2];
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
124 rval <<= bitindex;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
125 rval &= 0xffffff;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
126 bitindex += number_of_bits;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
127 rval >>= (24-number_of_bits);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
128 wordpointer += (bitindex>>3);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
129 bitindex &= 7;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
130 return rval;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
131 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
132
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
133
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
134 LOCAL unsigned int getbits_fast(short number_of_bits)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
135 {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
136 unsigned long rval;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
137 // if(MP3_frames>=7741) printf("getbits_fast: bits=%d bitsleft=%d wordptr=%x\n",number_of_bits,bitsleft,wordpointer);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
138 if((bitsleft-=number_of_bits)<0) return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
139 if(!number_of_bits) return 0;
4321
63fb32311b3b Fixing compilation on non-MMX but x86 systems
nick
parents: 4262
diff changeset
140 #if defined(CAN_COMPILE_X86_ASM)
1040
115ef47ef8c3 Minor optimization
nickols_k
parents: 735
diff changeset
141 rval = bswap_16(*((unsigned short *)wordpointer));
1309
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 1276
diff changeset
142 #else
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 1276
diff changeset
143 /*
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 1276
diff changeset
144 * 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
145 * Fall back to some portable code.
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 1276
diff changeset
146 */
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 1276
diff changeset
147 rval = wordpointer[0] << 8 | wordpointer[1];
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 1276
diff changeset
148 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
149 rval <<= bitindex;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
150 rval &= 0xffff;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
151 bitindex += number_of_bits;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
152 rval >>= (16-number_of_bits);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
153 wordpointer += (bitindex>>3);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
154 bitindex &= 7;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
155 return rval;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
156 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
157
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
158 LOCAL unsigned int get1bit(void)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
159 {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
160 unsigned char rval;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
161 // if(MP3_frames>=7741) printf("get1bit: bitsleft=%d wordptr=%x\n",bitsleft,wordpointer);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
162 if((--bitsleft)<0) return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
163 rval = *wordpointer << bitindex;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
164 bitindex++;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
165 wordpointer += (bitindex>>3);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
166 bitindex &= 7;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
167 return ((rval>>7)&1);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
168 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
169
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
170 LOCAL void set_pointer(long backstep)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
171 {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
172 // if(backstep!=512 && backstep>fsizeold)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
173 // printf("\rWarning! backstep (%d>%d) \n",backstep,fsizeold);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
174 wordpointer = bsbuf + ssize - backstep;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
175 if (backstep) memcpy(wordpointer,bsbufold+fsizeold-backstep,backstep);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
176 bitindex = 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
177 bitsleft+=8*backstep;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
178 // printf("Backstep %d (bitsleft=%d)\n",backstep,bitsleft);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
179 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
180
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
181 LOCAL int stream_head_read(unsigned char *hbuf,unsigned long *newhead){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
182 if(mp3_read(hbuf,4) != 4) return FALSE;
4321
63fb32311b3b Fixing compilation on non-MMX but x86 systems
nick
parents: 4262
diff changeset
183 #if defined(CAN_COMPILE_X86_ASM)
1040
115ef47ef8c3 Minor optimization
nickols_k
parents: 735
diff changeset
184 *newhead = bswap_32(*((unsigned long *)hbuf));
1309
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 1276
diff changeset
185 #else
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 1276
diff changeset
186 /*
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 1276
diff changeset
187 * 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
188 * Fall back to some portable code.
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 1276
diff changeset
189 */
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 1276
diff changeset
190 *newhead =
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 1276
diff changeset
191 hbuf[0] << 24 |
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 1276
diff changeset
192 hbuf[1] << 16 |
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 1276
diff changeset
193 hbuf[2] << 8 |
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 1276
diff changeset
194 hbuf[3];
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 1276
diff changeset
195 #endif
1040
115ef47ef8c3 Minor optimization
nickols_k
parents: 735
diff changeset
196 return TRUE;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
197 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
198
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
199 LOCAL int stream_head_shift(unsigned char *hbuf,unsigned long *head){
1040
115ef47ef8c3 Minor optimization
nickols_k
parents: 735
diff changeset
200 *((unsigned long *)hbuf) >>= 8;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
201 if(mp3_read(hbuf+3,1) != 1) return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
202 *head <<= 8;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
203 *head |= hbuf[3];
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
204 return 1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
205 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
206
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
207 /*
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
208 * decode a header and write the information
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
209 * into the frame structure
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
210 */
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
211 LOCAL int decode_header(struct frame *fr,unsigned long newhead){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
212
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
213 // head_check:
1040
115ef47ef8c3 Minor optimization
nickols_k
parents: 735
diff changeset
214 if( (newhead & 0xffe00000) != 0xffe00000 ||
1045
2ee9a18ed6f3 Minor improvements
nickols_k
parents: 1040
diff changeset
215 (newhead & 0x0000fc00) == 0x0000fc00) return FALSE;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
216
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
217 fr->lay = 4-((newhead>>17)&3);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
218 // if(fr->lay!=3) return FALSE;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
219
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
220 if( newhead & ((long)1<<20) ) {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
221 fr->lsf = (newhead & ((long)1<<19)) ? 0x0 : 0x1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
222 fr->mpeg25 = 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
223 } else {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
224 fr->lsf = 1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
225 fr->mpeg25 = 1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
226 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
227
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
228 if(fr->mpeg25)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
229 fr->sampling_frequency = 6 + ((newhead>>10)&0x3);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
230 else
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
231 fr->sampling_frequency = ((newhead>>10)&0x3) + (fr->lsf*3);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
232
1166
95f6f14176c6 fr->sampling_frequency limitation (thanx to pl <p_l@tfz.net>)
arpi_esp
parents: 1045
diff changeset
233 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
234
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
235 fr->error_protection = ((newhead>>16)&0x1)^0x1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
236 fr->bitrate_index = ((newhead>>12)&0xf);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
237 fr->padding = ((newhead>>9)&0x1);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
238 fr->extension = ((newhead>>8)&0x1);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
239 fr->mode = ((newhead>>6)&0x3);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
240 fr->mode_ext = ((newhead>>4)&0x3);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
241 fr->copyright = ((newhead>>3)&0x1);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
242 fr->original = ((newhead>>2)&0x1);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
243 fr->emphasis = newhead & 0x3;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
244
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
245 MP3_channels = fr->stereo = (fr->mode == MPG_MD_MONO) ? 1 : 2;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
246
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
247 if(!fr->bitrate_index){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
248 // fprintf(stderr,"Free format not supported.\n");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
249 return FALSE;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
250 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
251
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
252 switch(fr->lay){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
253 case 2:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
254 MP3_bitrate=tabsel_123[fr->lsf][1][fr->bitrate_index];
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
255 MP3_samplerate=freqs[fr->sampling_frequency];
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
256 fr->framesize = (long) MP3_bitrate * 144000;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
257 fr->framesize /= MP3_samplerate;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
258 MP3_framesize=fr->framesize;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
259 fr->framesize += fr->padding - 4;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
260 break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
261 case 3:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
262 if(fr->lsf)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
263 ssize = (fr->stereo == 1) ? 9 : 17;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
264 else
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
265 ssize = (fr->stereo == 1) ? 17 : 32;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
266 if(fr->error_protection) ssize += 2;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
267
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
268 MP3_bitrate=tabsel_123[fr->lsf][2][fr->bitrate_index];
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
269 MP3_samplerate=freqs[fr->sampling_frequency];
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
270 fr->framesize = (long) MP3_bitrate * 144000;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
271 fr->framesize /= MP3_samplerate<<(fr->lsf);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
272 MP3_framesize=fr->framesize;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
273 fr->framesize += fr->padding - 4;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
274 break;
7520
8d21936b31d6 layer-1 stream parsing (NOT decoding) support
arpi
parents: 7461
diff changeset
275 case 1:
8d21936b31d6 layer-1 stream parsing (NOT decoding) support
arpi
parents: 7461
diff changeset
276 // fr->jsbound = (fr->mode == MPG_MD_JOINT_STEREO) ? (fr->mode_ext<<2)+4 : 32;
8d21936b31d6 layer-1 stream parsing (NOT decoding) support
arpi
parents: 7461
diff changeset
277 MP3_bitrate=tabsel_123[fr->lsf][0][fr->bitrate_index];
8d21936b31d6 layer-1 stream parsing (NOT decoding) support
arpi
parents: 7461
diff changeset
278 MP3_samplerate=freqs[fr->sampling_frequency];
8d21936b31d6 layer-1 stream parsing (NOT decoding) support
arpi
parents: 7461
diff changeset
279 fr->framesize = (long) MP3_bitrate * 12000;
8d21936b31d6 layer-1 stream parsing (NOT decoding) support
arpi
parents: 7461
diff changeset
280 fr->framesize /= MP3_samplerate;
10468
e2979f202bb2 layer-1 support
arpi
parents: 8545
diff changeset
281 MP3_framesize = ((fr->framesize+fr->padding)<<2);
e2979f202bb2 layer-1 support
arpi
parents: 8545
diff changeset
282 fr->framesize = MP3_framesize-4;
10552
a54dbea02a72 remove debug message
nexus
parents: 10468
diff changeset
283 // printf("framesize=%d\n",fr->framesize);
7520
8d21936b31d6 layer-1 stream parsing (NOT decoding) support
arpi
parents: 7461
diff changeset
284 break;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
285 default:
7520
8d21936b31d6 layer-1 stream parsing (NOT decoding) support
arpi
parents: 7461
diff changeset
286 MP3_framesize=fr->framesize=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
287 // fprintf(stderr,"Sorry, unsupported layer type.\n");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
288 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
289 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
290 if(fr->framesize<=0 || fr->framesize>MAXFRAMESIZE) return FALSE;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
291
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
292 return 1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
293 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
294
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
295
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
296 LOCAL int stream_read_frame_body(int size){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
297
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
298 /* flip/init buffer for Layer 3 */
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
299 bsbufold = bsbuf;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
300 bsbuf = bsspace[bsnum]+512;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
301 bsnum = (bsnum + 1) & 1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
302
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
303 if( mp3_read(bsbuf,size) != size) return 0; // broken frame
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
304
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
305 bitindex = 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
306 wordpointer = (unsigned char *) bsbuf;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
307 bitsleft=8*size;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
308
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
309 return 1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
310 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
311
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
312
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
313 /*****************************************************************
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
314 * read next frame return number of frames read.
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
315 */
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
316 LOCAL int read_frame(struct frame *fr){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
317 unsigned long newhead;
22140
0cd17afe1d4b Make sure buffer is aligned so no unaligned access happens.
reimar
parents: 21507
diff changeset
318 union {
0cd17afe1d4b Make sure buffer is aligned so no unaligned access happens.
reimar
parents: 21507
diff changeset
319 unsigned char buf[8];
0cd17afe1d4b Make sure buffer is aligned so no unaligned access happens.
reimar
parents: 21507
diff changeset
320 unsigned long dummy; // for alignment
0cd17afe1d4b Make sure buffer is aligned so no unaligned access happens.
reimar
parents: 21507
diff changeset
321 } hbuf;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
322 int skipped,resyncpos;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
323 int frames=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
324
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
325 resync:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
326 skipped=MP3_fpos;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
327 resyncpos=MP3_fpos;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
328
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
329 set_pointer(512);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
330 fsizeold=fr->framesize; /* for Layer3 */
22140
0cd17afe1d4b Make sure buffer is aligned so no unaligned access happens.
reimar
parents: 21507
diff changeset
331 if(!stream_head_read(hbuf.buf,&newhead)) return 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
332 if(!decode_header(fr,newhead)){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
333 // invalid header! try to resync stream!
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
334 #ifdef DEBUG_RESYNC
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
335 printf("ReSync: searching for a valid header... (pos=%X)\n",MP3_fpos);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
336 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
337 retry1:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
338 while(!decode_header(fr,newhead)){
22140
0cd17afe1d4b Make sure buffer is aligned so no unaligned access happens.
reimar
parents: 21507
diff changeset
339 if(!stream_head_shift(hbuf.buf,&newhead)) return 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
340 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
341 resyncpos=MP3_fpos-4;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
342 // found valid header
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
343 #ifdef DEBUG_RESYNC
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
344 printf("ReSync: found valid hdr at %X fsize=%ld ",resyncpos,fr->framesize);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
345 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
346 if(!stream_read_frame_body(fr->framesize)) return 0; // read body
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
347 set_pointer(512);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
348 fsizeold=fr->framesize; /* for Layer3 */
22140
0cd17afe1d4b Make sure buffer is aligned so no unaligned access happens.
reimar
parents: 21507
diff changeset
349 if(!stream_head_read(hbuf.buf,&newhead)) return 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
350 if(!decode_header(fr,newhead)){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
351 // invalid hdr! go back...
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
352 #ifdef DEBUG_RESYNC
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
353 printf("INVALID\n");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
354 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
355 // mp3_seek(resyncpos+1);
22140
0cd17afe1d4b Make sure buffer is aligned so no unaligned access happens.
reimar
parents: 21507
diff changeset
356 if(!stream_head_read(hbuf.buf,&newhead)) return 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
357 goto retry1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
358 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
359 #ifdef DEBUG_RESYNC
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
360 printf("OK!\n");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
361 ++frames;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
362 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
363 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
364
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
365 skipped=resyncpos-skipped;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
366 // if(skipped && !MP3_resync) printf("\r%d bad bytes skipped (resync at 0x%X) \n",skipped,resyncpos);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
367
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
368 // 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":"");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
369
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
370 /* read main data into memory */
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
371 if(!stream_read_frame_body(fr->framesize)){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
372 printf("\nBroken frame at 0x%X \n",resyncpos);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
373 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
374 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
375 ++frames;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
376
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
377 if(MP3_resync){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
378 MP3_resync=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
379 if(frames==1) goto resync;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
380 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
381
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
382 return frames;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
383 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
384
12131
d155623271e3 fix symbol clashes when linking with libmp3lame including mp3 decoder, man, mp3lib is so much bloated
alex
parents: 11241
diff changeset
385 static int _has_mmx = 0; // used by layer2.c, layer3.c to pre-scale coeffs
4262
ae847143d1d7 Using cpudetect code instead of d_cpu.s
nick
parents: 4150
diff changeset
386
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
387 #include "layer2.c"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
388 #include "layer3.c"
10468
e2979f202bb2 layer-1 support
arpi
parents: 8545
diff changeset
389 #include "layer1.c"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
390
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
391 /******************************************************************************/
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
392 /* PUBLIC FUNCTIONS */
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
393 /******************************************************************************/
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
394
1245
03b7e2955a20 Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents: 1166
diff changeset
395 /* It's hidden from gcc in assembler */
11240
5403367c7032 removed the stdcall convention
alex
parents: 10552
diff changeset
396 extern void dct64_MMX(real *, real *, real *);
5403367c7032 removed the stdcall convention
alex
parents: 10552
diff changeset
397 extern void dct64_MMX_3dnow(real *, real *, real *);
5403367c7032 removed the stdcall convention
alex
parents: 10552
diff changeset
398 extern void dct64_MMX_3dnowex(real *, real *, real *);
18932
69c665e91946 Add dct64_sse, a replacement for dct64_MMX. About 60% faster on its author's Pentium III
gpoirier
parents: 18783
diff changeset
399 extern void dct64_sse(real *, real *, real *);
11240
5403367c7032 removed the stdcall convention
alex
parents: 10552
diff changeset
400 void (*dct64_MMX_func)(real *, real *, real *);
1245
03b7e2955a20 Added newest MMX-optimized decore which speedups decoding at least on 13% for any cpu.
nick
parents: 1166
diff changeset
401
16989
e7a129082fda Unify include paths, -I.. is in CFLAGS.
diego
parents: 15167
diff changeset
402 #include "cpudetect.h"
3088
73c2e9304d08 changed to use cpudetect.c (to use change te #if 1 -> #if 0 :)
alex
parents: 1393
diff changeset
403
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
404 // Init decoder tables. Call first, once!
732
e14114170e01 applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents: 73
diff changeset
405 #ifdef USE_FAKE_MONO
e14114170e01 applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents: 73
diff changeset
406 void MP3_Init(int fakemono){
e14114170e01 applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents: 73
diff changeset
407 #else
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
408 void MP3_Init(){
732
e14114170e01 applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents: 73
diff changeset
409 #endif
8545
b22b29178258 cleanup & fix cpu detection & init stuff
arpi
parents: 7520
diff changeset
410
b22b29178258 cleanup & fix cpu detection & init stuff
arpi
parents: 7520
diff changeset
411 //gCpuCaps.hasMMX=gCpuCaps.hasMMX2=gCpuCaps.hasSSE=0; // for testing!
b22b29178258 cleanup & fix cpu detection & init stuff
arpi
parents: 7520
diff changeset
412
b22b29178258 cleanup & fix cpu detection & init stuff
arpi
parents: 7520
diff changeset
413 _has_mmx = 0;
b22b29178258 cleanup & fix cpu detection & init stuff
arpi
parents: 7520
diff changeset
414 dct36_func = dct36;
b22b29178258 cleanup & fix cpu detection & init stuff
arpi
parents: 7520
diff changeset
415
b22b29178258 cleanup & fix cpu detection & init stuff
arpi
parents: 7520
diff changeset
416 make_decode_tables(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
417
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 #ifdef CAN_COMPILE_X86_ASM
4262
ae847143d1d7 Using cpudetect code instead of d_cpu.s
nick
parents: 4150
diff changeset
419
19133
f569aadfa921 10l, i missed ifdefs around the calls
rfelker
parents: 18932
diff changeset
420 #ifdef HAVE_MMX
8545
b22b29178258 cleanup & fix cpu detection & init stuff
arpi
parents: 7520
diff changeset
421 if (gCpuCaps.hasMMX)
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
422 {
4262
ae847143d1d7 Using cpudetect code instead of d_cpu.s
nick
parents: 4150
diff changeset
423 _has_mmx = 1;
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
424 make_decode_tables_MMX(outscale);
6138
523014df7d32 big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents: 5888
diff changeset
425 mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: made decode tables with MMX optimization\n");
8545
b22b29178258 cleanup & fix cpu detection & init stuff
arpi
parents: 7520
diff changeset
426 synth_func = synth_1to1_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
427 }
19133
f569aadfa921 10l, i missed ifdefs around the calls
rfelker
parents: 18932
diff changeset
428 #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
429
19133
f569aadfa921 10l, i missed ifdefs around the calls
rfelker
parents: 18932
diff changeset
430 #ifdef HAVE_3DNOWEX
8545
b22b29178258 cleanup & fix cpu detection & init stuff
arpi
parents: 7520
diff changeset
431 if (gCpuCaps.has3DNowExt)
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
432 {
4262
ae847143d1d7 Using cpudetect code instead of d_cpu.s
nick
parents: 4150
diff changeset
433 dct36_func=dct36_3dnowex;
19500
2c458473fc5d always use 3dnowext version of dct64 when supported by the CPU (K6-3+ and up).
gpoirier
parents: 19431
diff changeset
434 dct64_MMX_func= dct64_MMX_3dnowex;
6138
523014df7d32 big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents: 5888
diff changeset
435 mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: using 3DNow!Ex optimized decore!\n");
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
436 }
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 else
19133
f569aadfa921 10l, i missed ifdefs around the calls
rfelker
parents: 18932
diff changeset
438 #endif
f569aadfa921 10l, i missed ifdefs around the calls
rfelker
parents: 18932
diff changeset
439 #ifdef HAVE_3DNOW
8545
b22b29178258 cleanup & fix cpu detection & init stuff
arpi
parents: 7520
diff changeset
440 if (gCpuCaps.has3DNow)
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
441 {
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 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
443 dct64_MMX_func = dct64_MMX_3dnow;
6138
523014df7d32 big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents: 5888
diff changeset
444 mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: using 3DNow! optimized decore!\n");
4262
ae847143d1d7 Using cpudetect code instead of d_cpu.s
nick
parents: 4150
diff changeset
445 }
ae847143d1d7 Using cpudetect code instead of d_cpu.s
nick
parents: 4150
diff changeset
446 else
19133
f569aadfa921 10l, i missed ifdefs around the calls
rfelker
parents: 18932
diff changeset
447 #endif
f569aadfa921 10l, i missed ifdefs around the calls
rfelker
parents: 18932
diff changeset
448 #ifdef HAVE_SSE
18932
69c665e91946 Add dct64_sse, a replacement for dct64_MMX. About 60% faster on its author's Pentium III
gpoirier
parents: 18783
diff changeset
449 if (gCpuCaps.hasSSE)
69c665e91946 Add dct64_sse, a replacement for dct64_MMX. About 60% faster on its author's Pentium III
gpoirier
parents: 18783
diff changeset
450 {
69c665e91946 Add dct64_sse, a replacement for dct64_MMX. About 60% faster on its author's Pentium III
gpoirier
parents: 18783
diff changeset
451 dct64_MMX_func = dct64_sse;
69c665e91946 Add dct64_sse, a replacement for dct64_MMX. About 60% faster on its author's Pentium III
gpoirier
parents: 18783
diff changeset
452 mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: using SSE optimized decore!\n");
69c665e91946 Add dct64_sse, a replacement for dct64_MMX. About 60% faster on its author's Pentium III
gpoirier
parents: 18783
diff changeset
453 }
69c665e91946 Add dct64_sse, a replacement for dct64_MMX. About 60% faster on its author's Pentium III
gpoirier
parents: 18783
diff changeset
454 else
19133
f569aadfa921 10l, i missed ifdefs around the calls
rfelker
parents: 18932
diff changeset
455 #endif
f569aadfa921 10l, i missed ifdefs around the calls
rfelker
parents: 18932
diff changeset
456 #ifdef HAVE_MMX
8545
b22b29178258 cleanup & fix cpu detection & init stuff
arpi
parents: 7520
diff changeset
457 if (gCpuCaps.hasMMX)
4262
ae847143d1d7 Using cpudetect code instead of d_cpu.s
nick
parents: 4150
diff changeset
458 {
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
459 dct64_MMX_func = dct64_MMX;
6138
523014df7d32 big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents: 5888
diff changeset
460 mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: using MMX optimized decore!\n");
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
461 }
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 else
19133
f569aadfa921 10l, i missed ifdefs around the calls
rfelker
parents: 18932
diff changeset
463 #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
464 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
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 = synth_1to1_pent;
6138
523014df7d32 big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents: 5888
diff changeset
467 mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: using Pentium optimized decore!\n");
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
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
8545
b22b29178258 cleanup & fix cpu detection & init stuff
arpi
parents: 7520
diff changeset
470 #endif
18101
a3d76e5ea6c2 Make mp3lib say that it's using Altivec to decode instead of generic C
diego
parents: 17566
diff changeset
471 #ifdef HAVE_ALTIVEC
a3d76e5ea6c2 Make mp3lib say that it's using Altivec to decode instead of generic C
diego
parents: 17566
diff changeset
472 if (gCpuCaps.hasAltiVec)
a3d76e5ea6c2 Make mp3lib say that it's using Altivec to decode instead of generic C
diego
parents: 17566
diff changeset
473 {
a3d76e5ea6c2 Make mp3lib say that it's using Altivec to decode instead of generic C
diego
parents: 17566
diff changeset
474 mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: using AltiVec optimized decore!\n");
a3d76e5ea6c2 Make mp3lib say that it's using Altivec to decode instead of generic C
diego
parents: 17566
diff changeset
475 }
a3d76e5ea6c2 Make mp3lib say that it's using Altivec to decode instead of generic C
diego
parents: 17566
diff changeset
476 else
a3d76e5ea6c2 Make mp3lib say that it's using Altivec to decode instead of generic C
diego
parents: 17566
diff changeset
477 #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
478 {
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 synth_func = NULL; /* use default c version */
6138
523014df7d32 big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents: 5888
diff changeset
480 mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: using generic C decore!\n");
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
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
732
e14114170e01 applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents: 73
diff changeset
483 #ifdef USE_FAKE_MONO
e14114170e01 applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents: 73
diff changeset
484 if (fakemono == 1)
e14114170e01 applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents: 73
diff changeset
485 fr.synth=synth_1to1_l;
e14114170e01 applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents: 73
diff changeset
486 else if (fakemono == 2)
e14114170e01 applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents: 73
diff changeset
487 fr.synth=synth_1to1_r;
e14114170e01 applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents: 73
diff changeset
488 else
e14114170e01 applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents: 73
diff changeset
489 fr.synth=synth_1to1;
e14114170e01 applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents: 73
diff changeset
490 #else
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
491 fr.synth=synth_1to1;
732
e14114170e01 applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents: 73
diff changeset
492 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
493 fr.synth_mono=synth_1to1_mono2stereo;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
494 fr.down_sample=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
495 fr.down_sample_sblimit = SBLIMIT>>(fr.down_sample);
8545
b22b29178258 cleanup & fix cpu detection & init stuff
arpi
parents: 7520
diff changeset
496
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
497 init_layer2();
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
498 init_layer3(fr.down_sample_sblimit);
13946
e632b43f0598 Reduce excessive verbosity.
diego
parents: 12131
diff changeset
499 mp_msg(MSGT_DECAUDIO,MSGL_V,"MP3lib: init layer2&3 finished, tables done\n");
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
500 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
501
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
502 #if 0
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
503
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
504 void MP3_Close(){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
505 MP3_eof=1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
506 if(mp3_file) fclose(mp3_file);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
507 mp3_file=NULL;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
508 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
509
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
510 // Open a file, init buffers. Call once per file!
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
511 int MP3_Open(char *filename,int buffsize){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
512 MP3_eof=1; // lock decoding
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
513 MP3_pause=1; // lock playing
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
514 if(mp3_file) MP3_Close(); // close prev. file
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
515 MP3_frames=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
516
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
517 mp3_file=fopen(filename,"rb");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
518 // printf("MP3_Open: file='%s'",filename);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
519 // if(!mp3_file){ printf(" not found!\n"); return 0;} else printf("Ok!\n");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
520 if(!mp3_file) return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
521
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
522 MP3_filesize=MP3_PrintTAG();
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
523 fseek(mp3_file,0,SEEK_SET);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
524
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
525 MP3_InitBuffers(buffsize);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
526 if(!tables_done_flag) MP3_Init();
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
527 MP3_eof=0; // allow decoding
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
528 MP3_pause=0; // allow playing
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
529 return MP3_filesize;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
530 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
531
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
532 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
533
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
534 // Read & decode a single frame. Called by sound driver.
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
535 int MP3_DecodeFrame(unsigned char *hova,short single){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
536 pcm_sample = hova;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
537 pcm_point = 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
538 if(!read_frame(&fr))return(0);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
539 if(single==-2){ set_pointer(512); return(1); }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
540 if(fr.error_protection) getbits(16); /* skip crc */
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
541 fr.single=single;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
542 switch(fr.lay){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
543 case 2: do_layer2(&fr,single);break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
544 case 3: do_layer3(&fr,single);break;
10468
e2979f202bb2 layer-1 support
arpi
parents: 8545
diff changeset
545 case 1: do_layer1(&fr,single);break;
6138
523014df7d32 big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents: 5888
diff changeset
546 default:
523014df7d32 big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents: 5888
diff changeset
547 return 0; // unsupported
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
548 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
549 // ++MP3_frames;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
550 return(pcm_point?pcm_point:2);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
551 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
552
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
553 // Prints last frame header in ascii.
17566
f580a7755ac5 Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents: 17300
diff changeset
554 void MP3_PrintHeader(void){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
555 static char *modes[4] = { "Stereo", "Joint-Stereo", "Dual-Channel", "Single-Channel" };
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
556 static char *layers[4] = { "???" , "I", "II", "III" };
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
557
6138
523014df7d32 big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents: 5888
diff changeset
558 mp_msg(MSGT_DECAUDIO,MSGL_V,"\rMPEG %s, Layer %s, %ld Hz %d kbit %s, BPF: %ld\n",
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
559 fr.mpeg25 ? "2.5" : (fr.lsf ? "2.0" : "1.0"),
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
560 layers[fr.lay],freqs[fr.sampling_frequency],
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
561 tabsel_123[fr.lsf][fr.lay-1][fr.bitrate_index],
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
562 modes[fr.mode],fr.framesize+4);
6138
523014df7d32 big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents: 5888
diff changeset
563 mp_msg(MSGT_DECAUDIO,MSGL_V,"Channels: %d, copyright: %s, original: %s, CRC: %s, emphasis: %d\n",
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
564 fr.stereo,fr.copyright?"Yes":"No",
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
565 fr.original?"Yes":"No",fr.error_protection?"Yes":"No",
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
566 fr.emphasis);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
567 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
568
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
569 #if 0
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
570 #include "genre.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
571
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
572 // Read & print ID3 TAG. Do not call when playing!!! returns filesize.
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
573 int MP3_PrintTAG(){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
574 struct id3tag {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
575 char tag[3];
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
576 char title[30];
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
577 char artist[30];
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
578 char album[30];
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
579 char year[4];
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
580 char comment[30];
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
581 unsigned char genre;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
582 };
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
583 struct id3tag tag;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
584 char title[31]={0,};
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
585 char artist[31]={0,};
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
586 char album[31]={0,};
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
587 char year[5]={0,};
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
588 char comment[31]={0,};
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
589 char genre[31]={0,};
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
590 int fsize;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
591 int ret;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
592
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
593 fseek(mp3_file,0,SEEK_END);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
594 fsize=ftell(mp3_file);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
595 if(fseek(mp3_file,-128,SEEK_END)) return fsize;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
596 ret=fread(&tag,128,1,mp3_file);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
597 if(ret!=1 || tag.tag[0]!='T' || tag.tag[1]!='A' || tag.tag[2]!='G') return fsize;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
598
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
599 strncpy(title,tag.title,30);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
600 strncpy(artist,tag.artist,30);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
601 strncpy(album,tag.album,30);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
602 strncpy(year,tag.year,4);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
603 strncpy(comment,tag.comment,30);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
604
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
605 if ( tag.genre <= sizeof(genre_table)/sizeof(*genre_table) ) {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
606 strncpy(genre, genre_table[tag.genre], 30);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
607 } else {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
608 strncpy(genre,"Unknown",30);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
609 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
610
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
611 // printf("\n");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
612 printf("Title : %30s Artist: %s\n",title,artist);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
613 printf("Album : %30s Year : %4s\n",album,year);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
614 printf("Comment: %30s Genre : %s\n",comment,genre);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
615 printf("\n");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
616 return fsize-128;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
617 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
618
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
619 #endif