annotate mp3lib/sr1.c @ 31805:05ca6dd36faf

Fix subtitle selection: make selecting -sid 0 work again by replacing the M_PROPERTY_STEP_UP hack by M_PROPERTY_SET and set the global sub pos also when we do not yet have a subtitle stream but do know the number of subs from out-of-band as e.g. for DVD.
author reimar
date Sun, 01 Aug 2010 13:30:26 +0000
parents 0e32a6a1fb95
children 9b4d2a805d63
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 #define LOCAL static inline
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
7
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
8 //#undef LOCAL
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
9 //#define LOCAL
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
10
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
11 #include <stdlib.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
12 #include <stdio.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
13 #include <string.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
14 #include <math.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
15
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
16 #include "mpg123.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
17 #include "huffman.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
18 #include "mp3.h"
21507
fa99b3d31d13 Hack around libavutil/bswap.h compilation problems due to always_inline undefined.
reimar
parents: 21372
diff changeset
19 #include "mpbswap.h"
16989
e7a129082fda Unify include paths, -I.. is in CFLAGS.
diego
parents: 15167
diff changeset
20 #include "cpudetect.h"
e7a129082fda Unify include paths, -I.. is in CFLAGS.
diego
parents: 15167
diff changeset
21 #include "mp_msg.h"
30552
8d2b4cef28d3 Add header file for mplayer_audio_read() instead of forward declaring it.
diego
parents: 30167
diff changeset
22 #include "libmpcodecs/ad_mp3lib.h"
19431
ac69ba536915 Explicitly include libmpcodecs/img_format.h and libvo/fastmemcpy.h.
diego
parents: 19133
diff changeset
23 #include "libvo/fastmemcpy.h"
4262
ae847143d1d7 Using cpudetect code instead of d_cpu.s
nick
parents: 4150
diff changeset
24
28587
1064e9bbaeea Move libavutil #includes below all others so that they do not override
diego
parents: 28338
diff changeset
25 #include "libavutil/common.h"
1064e9bbaeea Move libavutil #includes below all others so that they do not override
diego
parents: 28338
diff changeset
26 #include "libavutil/internal.h"
1064e9bbaeea Move libavutil #includes below all others so that they do not override
diego
parents: 28338
diff changeset
27
28327
c39a1fd7d45c Fix compilation after DECLARE_ASM_CONST/DECLARE_ALIGNED moving within FFmpeg.
diego
parents: 28326
diff changeset
28 #undef fprintf
c39a1fd7d45c Fix compilation after DECLARE_ASM_CONST/DECLARE_ALIGNED moving within FFmpeg.
diego
parents: 28326
diff changeset
29 #undef printf
c39a1fd7d45c Fix compilation after DECLARE_ASM_CONST/DECLARE_ALIGNED moving within FFmpeg.
diego
parents: 28326
diff changeset
30
28290
25337a2147e7 Lots and lots of #ifdef ARCH_... -> #if ARCH_...
reimar
parents: 28232
diff changeset
31 #if ARCH_X86_64
23495
059d7c379fb3 Enable SIMD optmizations for mp3lib on AMD64
zuxy
parents: 23457
diff changeset
32 // 3DNow! and 3DNow!Ext routines don't compile under AMD64
28338
f375e517f6f6 some more HAVE_3DNOW --> HAVE_AMD3DNOW
diego
parents: 28327
diff changeset
33 #undef HAVE_AMD3DNOW
f375e517f6f6 some more HAVE_3DNOW --> HAVE_AMD3DNOW
diego
parents: 28327
diff changeset
34 #undef HAVE_AMD3DNOWEXT
f375e517f6f6 some more HAVE_3DNOW --> HAVE_AMD3DNOW
diego
parents: 28327
diff changeset
35 #define HAVE_AMD3DNOW 0
f375e517f6f6 some more HAVE_3DNOW --> HAVE_AMD3DNOW
diego
parents: 28327
diff changeset
36 #define HAVE_AMD3DNOWEXT 0
4262
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 LOCAL int mp3_read(char *buf,int size){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
58 // int len=fread(buf,1,size,mp3_file);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
59 int len=mplayer_audio_read(buf,size);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
60 if(len>0) MP3_fpos+=len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
61 // if(len!=size) MP3_eof=1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
62 return len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
63 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
64 #else
28051
9e739bdb049c Get rid of pointless 'extern' keywords.
diego
parents: 27341
diff changeset
65 int mp3_read(char *buf,int size);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
66 #endif
15167
07e7a572bd84 Mark modified imported files as such to comply with (L)GPL ¡ø2a.
diego
parents: 13946
diff changeset
67 /*
18783
0783dd397f74 CVS --> Subversion in copyright notices
diego
parents: 18101
diff changeset
68 * Modified for use with MPlayer, for details see the changelog at
0783dd397f74 CVS --> Subversion in copyright notices
diego
parents: 18101
diff changeset
69 * 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
70 * $Id$
07e7a572bd84 Mark modified imported files as such to comply with (L)GPL ¡ø2a.
diego
parents: 13946
diff changeset
71 */
07e7a572bd84 Mark modified imported files as such to comply with (L)GPL ¡ø2a.
diego
parents: 13946
diff changeset
72
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
73
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
74 //void mp3_seek(int pos){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
75 // fseek(mp3_file,pos,SEEK_SET);
29717
afc8b80eb027 cosmetics: Remove some pointless parentheses from return calls.
diego
parents: 29263
diff changeset
76 // return MP3_fpos = ftell(mp3_file);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
77 //}
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
78
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
79 /* Frame reader */
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
80
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
81 #define MAXFRAMESIZE 1280
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
82 #define MAXFRAMESIZE2 (512+MAXFRAMESIZE)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
83
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
84 static int fsizeold=0,ssize=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
85 static unsigned char bsspace[2][MAXFRAMESIZE2]; /* !!!!! */
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
86 static unsigned char *bsbufold=bsspace[0]+512;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
87 static unsigned char *bsbuf=bsspace[1]+512;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
88 static int bsnum=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
89
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
90 static int bitindex;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
91 static unsigned char *wordpointer;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
92 static int bitsleft;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
93
12131
d155623271e3 fix symbol clashes when linking with libmp3lame including mp3 decoder, man, mp3lib is so much bloated
alex
parents: 11241
diff changeset
94 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
95 static int pcm_point = 0; /* outbuffer offset */
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
96
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
97 static struct frame fr;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
98
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
99 static int tabsel_123[2][3][16] = {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
100 { {0,32,64,96,128,160,192,224,256,288,320,352,384,416,448,},
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
101 {0,32,48,56, 64, 80, 96,112,128,160,192,224,256,320,384,},
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
102 {0,32,40,48, 56, 64, 80, 96,112,128,160,192,224,256,320,} },
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
103
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
104 { {0,32,48,56,64,80,96,112,128,144,160,176,192,224,256,},
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
105 {0,8,16,24,32,40,48,56,64,80,96,112,128,144,160,},
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
106 {0,8,16,24,32,40,48,56,64,80,96,112,128,144,160,} }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
107 };
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
108
23434
d986b47f1451 Use int and uint32_t instead of long and unsigned long, when appropriate.
zuxy
parents: 23365
diff changeset
109 static int freqs[9] = { 44100, 48000, 32000, 22050, 24000, 16000 , 11025 , 12000 , 8000 };
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
110
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
111 LOCAL unsigned int getbits(short number_of_bits)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
112 {
23434
d986b47f1451 Use int and uint32_t instead of long and unsigned long, when appropriate.
zuxy
parents: 23365
diff changeset
113 unsigned rval;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
114 // 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
115 if((bitsleft-=number_of_bits)<0) return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
116 if(!number_of_bits) return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
117 rval = wordpointer[0];
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
118 rval <<= 8;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
119 rval |= wordpointer[1];
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
120 rval <<= 8;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
121 rval |= wordpointer[2];
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
122 rval <<= bitindex;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
123 rval &= 0xffffff;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
124 bitindex += number_of_bits;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
125 rval >>= (24-number_of_bits);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
126 wordpointer += (bitindex>>3);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
127 bitindex &= 7;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
128 return rval;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
129 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
130
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
131
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
132 LOCAL unsigned int getbits_fast(short number_of_bits)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
133 {
23434
d986b47f1451 Use int and uint32_t instead of long and unsigned long, when appropriate.
zuxy
parents: 23365
diff changeset
134 unsigned rval;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
135 // 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
136 if((bitsleft-=number_of_bits)<0) return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
137 if(!number_of_bits) return 0;
28290
25337a2147e7 Lots and lots of #ifdef ARCH_... -> #if ARCH_...
reimar
parents: 28232
diff changeset
138 #if ARCH_X86
23434
d986b47f1451 Use int and uint32_t instead of long and unsigned long, when appropriate.
zuxy
parents: 23365
diff changeset
139 rval = bswap_16(*((uint16_t *)wordpointer));
1309
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 1276
diff changeset
140 #else
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 1276
diff changeset
141 /*
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 1276
diff changeset
142 * 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
143 * Fall back to some portable code.
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 1276
diff changeset
144 */
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 1276
diff changeset
145 rval = wordpointer[0] << 8 | wordpointer[1];
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 1276
diff changeset
146 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
147 rval <<= bitindex;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
148 rval &= 0xffff;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
149 bitindex += number_of_bits;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
150 rval >>= (16-number_of_bits);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
151 wordpointer += (bitindex>>3);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
152 bitindex &= 7;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
153 return rval;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
154 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
155
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
156 LOCAL unsigned int get1bit(void)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
157 {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
158 unsigned char rval;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
159 // if(MP3_frames>=7741) printf("get1bit: bitsleft=%d wordptr=%x\n",bitsleft,wordpointer);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
160 if((--bitsleft)<0) return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
161 rval = *wordpointer << bitindex;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
162 bitindex++;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
163 wordpointer += (bitindex>>3);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
164 bitindex &= 7;
29719
5784a4c18ebe Fix 100l typo introduced in last commit.
diego
parents: 29717
diff changeset
165 return (rval >> 7) & 1;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
166 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
167
23434
d986b47f1451 Use int and uint32_t instead of long and unsigned long, when appropriate.
zuxy
parents: 23365
diff changeset
168 LOCAL void set_pointer(int backstep)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
169 {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
170 // if(backstep!=512 && backstep>fsizeold)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
171 // printf("\rWarning! backstep (%d>%d) \n",backstep,fsizeold);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
172 wordpointer = bsbuf + ssize - backstep;
23457
a124f3abc1ec Replace implicit use of fast_memcpy via macro by explicit use to allow
reimar
parents: 23442
diff changeset
173 if (backstep) fast_memcpy(wordpointer,bsbufold+fsizeold-backstep,backstep);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
174 bitindex = 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
175 bitsleft+=8*backstep;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
176 // printf("Backstep %d (bitsleft=%d)\n",backstep,bitsleft);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
177 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
178
23434
d986b47f1451 Use int and uint32_t instead of long and unsigned long, when appropriate.
zuxy
parents: 23365
diff changeset
179 LOCAL int stream_head_read(unsigned char *hbuf,uint32_t *newhead){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
180 if(mp3_read(hbuf,4) != 4) return FALSE;
28290
25337a2147e7 Lots and lots of #ifdef ARCH_... -> #if ARCH_...
reimar
parents: 28232
diff changeset
181 #if ARCH_X86
23434
d986b47f1451 Use int and uint32_t instead of long and unsigned long, when appropriate.
zuxy
parents: 23365
diff changeset
182 *newhead = bswap_32(*((uint32_t*)hbuf));
1309
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 1276
diff changeset
183 #else
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 1276
diff changeset
184 /*
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 1276
diff changeset
185 * 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
186 * Fall back to some portable code.
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 1276
diff changeset
187 */
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28587
diff changeset
188 *newhead =
1309
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 1276
diff changeset
189 hbuf[0] << 24 |
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 1276
diff changeset
190 hbuf[1] << 16 |
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 1276
diff changeset
191 hbuf[2] << 8 |
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 1276
diff changeset
192 hbuf[3];
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 1276
diff changeset
193 #endif
1040
115ef47ef8c3 Minor optimization
nickols_k
parents: 735
diff changeset
194 return TRUE;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
195 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
196
23434
d986b47f1451 Use int and uint32_t instead of long and unsigned long, when appropriate.
zuxy
parents: 23365
diff changeset
197 LOCAL int stream_head_shift(unsigned char *hbuf,uint32_t *head){
d986b47f1451 Use int and uint32_t instead of long and unsigned long, when appropriate.
zuxy
parents: 23365
diff changeset
198 *((uint32_t*)hbuf) >>= 8;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
199 if(mp3_read(hbuf+3,1) != 1) return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
200 *head <<= 8;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
201 *head |= hbuf[3];
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
202 return 1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
203 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
204
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
205 /*
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
206 * decode a header and write the information
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
207 * into the frame structure
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
208 */
23434
d986b47f1451 Use int and uint32_t instead of long and unsigned long, when appropriate.
zuxy
parents: 23365
diff changeset
209 LOCAL int decode_header(struct frame *fr,uint32_t newhead){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
210
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
211 // head_check:
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28587
diff changeset
212 if( (newhead & 0xffe00000) != 0xffe00000 ||
1045
2ee9a18ed6f3 Minor improvements
nickols_k
parents: 1040
diff changeset
213 (newhead & 0x0000fc00) == 0x0000fc00) return FALSE;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
214
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
215 fr->lay = 4-((newhead>>17)&3);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
216 // if(fr->lay!=3) return FALSE;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
217
23434
d986b47f1451 Use int and uint32_t instead of long and unsigned long, when appropriate.
zuxy
parents: 23365
diff changeset
218 if( newhead & (1<<20) ) {
d986b47f1451 Use int and uint32_t instead of long and unsigned long, when appropriate.
zuxy
parents: 23365
diff changeset
219 fr->lsf = (newhead & (1<<19)) ? 0x0 : 0x1;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
220 fr->mpeg25 = 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
221 } else {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
222 fr->lsf = 1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
223 fr->mpeg25 = 1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
224 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
225
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
226 if(fr->mpeg25)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
227 fr->sampling_frequency = 6 + ((newhead>>10)&0x3);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
228 else
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
229 fr->sampling_frequency = ((newhead>>10)&0x3) + (fr->lsf*3);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
230
1166
95f6f14176c6 fr->sampling_frequency limitation (thanx to pl <p_l@tfz.net>)
arpi_esp
parents: 1045
diff changeset
231 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
232
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
233 fr->error_protection = ((newhead>>16)&0x1)^0x1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
234 fr->bitrate_index = ((newhead>>12)&0xf);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
235 fr->padding = ((newhead>>9)&0x1);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
236 fr->extension = ((newhead>>8)&0x1);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
237 fr->mode = ((newhead>>6)&0x3);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
238 fr->mode_ext = ((newhead>>4)&0x3);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
239 fr->copyright = ((newhead>>3)&0x1);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
240 fr->original = ((newhead>>2)&0x1);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
241 fr->emphasis = newhead & 0x3;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
242
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
243 MP3_channels = fr->stereo = (fr->mode == MPG_MD_MONO) ? 1 : 2;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
244
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
245 if(!fr->bitrate_index){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
246 // fprintf(stderr,"Free format not supported.\n");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
247 return FALSE;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
248 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
249
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
250 switch(fr->lay){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
251 case 2:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
252 MP3_bitrate=tabsel_123[fr->lsf][1][fr->bitrate_index];
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
253 MP3_samplerate=freqs[fr->sampling_frequency];
23434
d986b47f1451 Use int and uint32_t instead of long and unsigned long, when appropriate.
zuxy
parents: 23365
diff changeset
254 fr->framesize = MP3_bitrate * 144000;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
255 fr->framesize /= MP3_samplerate;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
256 MP3_framesize=fr->framesize;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
257 fr->framesize += fr->padding - 4;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
258 break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
259 case 3:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
260 if(fr->lsf)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
261 ssize = (fr->stereo == 1) ? 9 : 17;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
262 else
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
263 ssize = (fr->stereo == 1) ? 17 : 32;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
264 if(fr->error_protection) ssize += 2;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
265
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
266 MP3_bitrate=tabsel_123[fr->lsf][2][fr->bitrate_index];
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
267 MP3_samplerate=freqs[fr->sampling_frequency];
23434
d986b47f1451 Use int and uint32_t instead of long and unsigned long, when appropriate.
zuxy
parents: 23365
diff changeset
268 fr->framesize = MP3_bitrate * 144000;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
269 fr->framesize /= MP3_samplerate<<(fr->lsf);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
270 MP3_framesize=fr->framesize;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
271 fr->framesize += fr->padding - 4;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
272 break;
7520
8d21936b31d6 layer-1 stream parsing (NOT decoding) support
arpi
parents: 7461
diff changeset
273 case 1:
8d21936b31d6 layer-1 stream parsing (NOT decoding) support
arpi
parents: 7461
diff changeset
274 // 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
275 MP3_bitrate=tabsel_123[fr->lsf][0][fr->bitrate_index];
8d21936b31d6 layer-1 stream parsing (NOT decoding) support
arpi
parents: 7461
diff changeset
276 MP3_samplerate=freqs[fr->sampling_frequency];
23434
d986b47f1451 Use int and uint32_t instead of long and unsigned long, when appropriate.
zuxy
parents: 23365
diff changeset
277 fr->framesize = MP3_bitrate * 12000;
7520
8d21936b31d6 layer-1 stream parsing (NOT decoding) support
arpi
parents: 7461
diff changeset
278 fr->framesize /= MP3_samplerate;
10468
e2979f202bb2 layer-1 support
arpi
parents: 8545
diff changeset
279 MP3_framesize = ((fr->framesize+fr->padding)<<2);
e2979f202bb2 layer-1 support
arpi
parents: 8545
diff changeset
280 fr->framesize = MP3_framesize-4;
10552
a54dbea02a72 remove debug message
nexus
parents: 10468
diff changeset
281 // printf("framesize=%d\n",fr->framesize);
7520
8d21936b31d6 layer-1 stream parsing (NOT decoding) support
arpi
parents: 7461
diff changeset
282 break;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
283 default:
7520
8d21936b31d6 layer-1 stream parsing (NOT decoding) support
arpi
parents: 7461
diff changeset
284 MP3_framesize=fr->framesize=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
285 // fprintf(stderr,"Sorry, unsupported layer type.\n");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
286 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
287 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
288 if(fr->framesize<=0 || fr->framesize>MAXFRAMESIZE) return FALSE;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
289
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
290 return 1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
291 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
292
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
293
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
294 LOCAL int stream_read_frame_body(int size){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
295
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
296 /* flip/init buffer for Layer 3 */
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
297 bsbufold = bsbuf;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
298 bsbuf = bsspace[bsnum]+512;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
299 bsnum = (bsnum + 1) & 1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
300
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
301 if( mp3_read(bsbuf,size) != size) return 0; // broken frame
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
302
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
303 bitindex = 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
304 wordpointer = (unsigned char *) bsbuf;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
305 bitsleft=8*size;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
306
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
307 return 1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
308 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
309
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 * read next frame return number of frames read.
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
313 */
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
314 LOCAL int read_frame(struct frame *fr){
23434
d986b47f1451 Use int and uint32_t instead of long and unsigned long, when appropriate.
zuxy
parents: 23365
diff changeset
315 uint32_t newhead;
22140
0cd17afe1d4b Make sure buffer is aligned so no unaligned access happens.
reimar
parents: 21507
diff changeset
316 union {
0cd17afe1d4b Make sure buffer is aligned so no unaligned access happens.
reimar
parents: 21507
diff changeset
317 unsigned char buf[8];
0cd17afe1d4b Make sure buffer is aligned so no unaligned access happens.
reimar
parents: 21507
diff changeset
318 unsigned long dummy; // for alignment
0cd17afe1d4b Make sure buffer is aligned so no unaligned access happens.
reimar
parents: 21507
diff changeset
319 } hbuf;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
320 int skipped,resyncpos;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
321 int frames=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
322
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
323 resync:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
324 skipped=MP3_fpos;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
325 resyncpos=MP3_fpos;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
326
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
327 set_pointer(512);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
328 fsizeold=fr->framesize; /* for Layer3 */
22140
0cd17afe1d4b Make sure buffer is aligned so no unaligned access happens.
reimar
parents: 21507
diff changeset
329 if(!stream_head_read(hbuf.buf,&newhead)) return 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
330 if(!decode_header(fr,newhead)){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
331 // invalid header! try to resync stream!
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
332 #ifdef DEBUG_RESYNC
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
333 printf("ReSync: searching for a valid header... (pos=%X)\n",MP3_fpos);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
334 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
335 retry1:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
336 while(!decode_header(fr,newhead)){
22140
0cd17afe1d4b Make sure buffer is aligned so no unaligned access happens.
reimar
parents: 21507
diff changeset
337 if(!stream_head_shift(hbuf.buf,&newhead)) return 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
338 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
339 resyncpos=MP3_fpos-4;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
340 // found valid header
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
341 #ifdef DEBUG_RESYNC
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
342 printf("ReSync: found valid hdr at %X fsize=%ld ",resyncpos,fr->framesize);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
343 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
344 if(!stream_read_frame_body(fr->framesize)) return 0; // read body
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
345 set_pointer(512);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
346 fsizeold=fr->framesize; /* for Layer3 */
22140
0cd17afe1d4b Make sure buffer is aligned so no unaligned access happens.
reimar
parents: 21507
diff changeset
347 if(!stream_head_read(hbuf.buf,&newhead)) return 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
348 if(!decode_header(fr,newhead)){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
349 // invalid hdr! go back...
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
350 #ifdef DEBUG_RESYNC
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
351 printf("INVALID\n");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
352 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
353 // mp3_seek(resyncpos+1);
22140
0cd17afe1d4b Make sure buffer is aligned so no unaligned access happens.
reimar
parents: 21507
diff changeset
354 if(!stream_head_read(hbuf.buf,&newhead)) return 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
355 goto retry1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
356 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
357 #ifdef DEBUG_RESYNC
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
358 printf("OK!\n");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
359 ++frames;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
360 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
361 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
362
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
363 skipped=resyncpos-skipped;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
364 // 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
365
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
366 // 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
367
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
368 /* read main data into memory */
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
369 if(!stream_read_frame_body(fr->framesize)){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
370 printf("\nBroken frame at 0x%X \n",resyncpos);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
371 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
372 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
373 ++frames;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
374
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
375 if(MP3_resync){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
376 MP3_resync=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
377 if(frames==1) goto resync;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
378 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
379
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
380 return frames;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
381 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
382
12131
d155623271e3 fix symbol clashes when linking with libmp3lame including mp3 decoder, man, mp3lib is so much bloated
alex
parents: 11241
diff changeset
383 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
384
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
385 /******************************************************************************/
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
386 /* PUBLIC FUNCTIONS */
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
387 /******************************************************************************/
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
388
30682
5fdc3c62cf76 Fix compilation: the dct64_MMX_func variable should be declared only once,
reimar
parents: 30658
diff changeset
389 void (*dct64_MMX_func)(short *, short *, real *);
5fdc3c62cf76 Fix compilation: the dct64_MMX_func variable should be declared only once,
reimar
parents: 30658
diff changeset
390
25349
b257a1967539 cosmetics: Move public function declarations together.
diego
parents: 25348
diff changeset
391 #include "layer2.c"
b257a1967539 cosmetics: Move public function declarations together.
diego
parents: 25348
diff changeset
392 #include "layer3.c"
b257a1967539 cosmetics: Move public function declarations together.
diego
parents: 25348
diff changeset
393 #include "layer1.c"
b257a1967539 cosmetics: Move public function declarations together.
diego
parents: 25348
diff changeset
394
16989
e7a129082fda Unify include paths, -I.. is in CFLAGS.
diego
parents: 15167
diff changeset
395 #include "cpudetect.h"
3088
73c2e9304d08 changed to use cpudetect.c (to use change te #if 1 -> #if 0 :)
alex
parents: 1393
diff changeset
396
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
397 // Init decoder tables. Call first, once!
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 25848
diff changeset
398 #ifdef CONFIG_FAKE_MONO
732
e14114170e01 applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents: 73
diff changeset
399 void MP3_Init(int fakemono){
e14114170e01 applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents: 73
diff changeset
400 #else
28095
7448d949d6b4 Add missing 'void' to parameterless function declaration.
diego
parents: 28051
diff changeset
401 void MP3_Init(void){
732
e14114170e01 applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents: 73
diff changeset
402 #endif
8545
b22b29178258 cleanup & fix cpu detection & init stuff
arpi
parents: 7520
diff changeset
403
b22b29178258 cleanup & fix cpu detection & init stuff
arpi
parents: 7520
diff changeset
404 //gCpuCaps.hasMMX=gCpuCaps.hasMMX2=gCpuCaps.hasSSE=0; // for testing!
b22b29178258 cleanup & fix cpu detection & init stuff
arpi
parents: 7520
diff changeset
405
b22b29178258 cleanup & fix cpu detection & init stuff
arpi
parents: 7520
diff changeset
406 _has_mmx = 0;
b22b29178258 cleanup & fix cpu detection & init stuff
arpi
parents: 7520
diff changeset
407 dct36_func = dct36;
b22b29178258 cleanup & fix cpu detection & init stuff
arpi
parents: 7520
diff changeset
408
b22b29178258 cleanup & fix cpu detection & init stuff
arpi
parents: 7520
diff changeset
409 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
410
28290
25337a2147e7 Lots and lots of #ifdef ARCH_... -> #if ARCH_...
reimar
parents: 28232
diff changeset
411 #if HAVE_MMX
8545
b22b29178258 cleanup & fix cpu detection & init stuff
arpi
parents: 7520
diff changeset
412 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
413 {
30990
0ad2da052b2e the great MPlayer tab removal: part I
diego
parents: 30682
diff changeset
414 _has_mmx = 1;
0ad2da052b2e the great MPlayer tab removal: part I
diego
parents: 30682
diff changeset
415 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
416 }
19133
f569aadfa921 10l, i missed ifdefs around the calls
rfelker
parents: 18932
diff changeset
417 #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
418
28338
f375e517f6f6 some more HAVE_3DNOW --> HAVE_AMD3DNOW
diego
parents: 28327
diff changeset
419 #if HAVE_AMD3DNOWEXT
8545
b22b29178258 cleanup & fix cpu detection & init stuff
arpi
parents: 7520
diff changeset
420 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
421 {
30990
0ad2da052b2e the great MPlayer tab removal: part I
diego
parents: 30682
diff changeset
422 dct36_func=dct36_3dnowex;
0ad2da052b2e the great MPlayer tab removal: part I
diego
parents: 30682
diff changeset
423 dct64_MMX_func= dct64_MMX_3dnowex;
0ad2da052b2e the great MPlayer tab removal: part I
diego
parents: 30682
diff changeset
424 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
425 }
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 else
19133
f569aadfa921 10l, i missed ifdefs around the calls
rfelker
parents: 18932
diff changeset
427 #endif
28338
f375e517f6f6 some more HAVE_3DNOW --> HAVE_AMD3DNOW
diego
parents: 28327
diff changeset
428 #if HAVE_AMD3DNOW
8545
b22b29178258 cleanup & fix cpu detection & init stuff
arpi
parents: 7520
diff changeset
429 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
430 {
30990
0ad2da052b2e the great MPlayer tab removal: part I
diego
parents: 30682
diff changeset
431 dct36_func = dct36_3dnow;
0ad2da052b2e the great MPlayer tab removal: part I
diego
parents: 30682
diff changeset
432 dct64_MMX_func = dct64_MMX_3dnow;
0ad2da052b2e the great MPlayer tab removal: part I
diego
parents: 30682
diff changeset
433 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
434 }
ae847143d1d7 Using cpudetect code instead of d_cpu.s
nick
parents: 4150
diff changeset
435 else
19133
f569aadfa921 10l, i missed ifdefs around the calls
rfelker
parents: 18932
diff changeset
436 #endif
28290
25337a2147e7 Lots and lots of #ifdef ARCH_... -> #if ARCH_...
reimar
parents: 28232
diff changeset
437 #if 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
438 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
439 {
30990
0ad2da052b2e the great MPlayer tab removal: part I
diego
parents: 30682
diff changeset
440 dct64_MMX_func = dct64_sse;
0ad2da052b2e the great MPlayer tab removal: part I
diego
parents: 30682
diff changeset
441 mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: using SSE optimized decore!\n");
18932
69c665e91946 Add dct64_sse, a replacement for dct64_MMX. About 60% faster on its author's Pentium III
gpoirier
parents: 18783
diff changeset
442 }
69c665e91946 Add dct64_sse, a replacement for dct64_MMX. About 60% faster on its author's Pentium III
gpoirier
parents: 18783
diff changeset
443 else
19133
f569aadfa921 10l, i missed ifdefs around the calls
rfelker
parents: 18932
diff changeset
444 #endif
28290
25337a2147e7 Lots and lots of #ifdef ARCH_... -> #if ARCH_...
reimar
parents: 28232
diff changeset
445 #if ARCH_X86_32
25337a2147e7 Lots and lots of #ifdef ARCH_... -> #if ARCH_...
reimar
parents: 28232
diff changeset
446 #if HAVE_MMX
8545
b22b29178258 cleanup & fix cpu detection & init stuff
arpi
parents: 7520
diff changeset
447 if (gCpuCaps.hasMMX)
4262
ae847143d1d7 Using cpudetect code instead of d_cpu.s
nick
parents: 4150
diff changeset
448 {
30990
0ad2da052b2e the great MPlayer tab removal: part I
diego
parents: 30682
diff changeset
449 dct64_MMX_func = dct64_MMX;
0ad2da052b2e the great MPlayer tab removal: part I
diego
parents: 30682
diff changeset
450 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
451 }
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 else
19133
f569aadfa921 10l, i missed ifdefs around the calls
rfelker
parents: 18932
diff changeset
453 #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
454 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
455 {
30990
0ad2da052b2e the great MPlayer tab removal: part I
diego
parents: 30682
diff changeset
456 synth_func = synth_1to1_pent;
0ad2da052b2e the great MPlayer tab removal: part I
diego
parents: 30682
diff changeset
457 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
458 }
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 else
23495
059d7c379fb3 Enable SIMD optmizations for mp3lib on AMD64
zuxy
parents: 23457
diff changeset
460 #endif /* ARCH_X86_32 */
28290
25337a2147e7 Lots and lots of #ifdef ARCH_... -> #if ARCH_...
reimar
parents: 28232
diff changeset
461 #if HAVE_ALTIVEC
18101
a3d76e5ea6c2 Make mp3lib say that it's using Altivec to decode instead of generic C
diego
parents: 17566
diff changeset
462 if (gCpuCaps.hasAltiVec)
a3d76e5ea6c2 Make mp3lib say that it's using Altivec to decode instead of generic C
diego
parents: 17566
diff changeset
463 {
30990
0ad2da052b2e the great MPlayer tab removal: part I
diego
parents: 30682
diff changeset
464 mp_msg(MSGT_DECAUDIO,MSGL_V,"mp3lib: using AltiVec optimized decore!\n");
18101
a3d76e5ea6c2 Make mp3lib say that it's using Altivec to decode instead of generic C
diego
parents: 17566
diff changeset
465 }
a3d76e5ea6c2 Make mp3lib say that it's using Altivec to decode instead of generic C
diego
parents: 17566
diff changeset
466 else
a3d76e5ea6c2 Make mp3lib say that it's using Altivec to decode instead of generic C
diego
parents: 17566
diff changeset
467 #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
468 {
30990
0ad2da052b2e the great MPlayer tab removal: part I
diego
parents: 30682
diff changeset
469 synth_func = NULL; /* use default c version */
0ad2da052b2e the great MPlayer tab removal: part I
diego
parents: 30682
diff changeset
470 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
471 }
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
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 25848
diff changeset
473 #ifdef CONFIG_FAKE_MONO
732
e14114170e01 applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents: 73
diff changeset
474 if (fakemono == 1)
e14114170e01 applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents: 73
diff changeset
475 fr.synth=synth_1to1_l;
e14114170e01 applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents: 73
diff changeset
476 else if (fakemono == 2)
e14114170e01 applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents: 73
diff changeset
477 fr.synth=synth_1to1_r;
e14114170e01 applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents: 73
diff changeset
478 else
e14114170e01 applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents: 73
diff changeset
479 fr.synth=synth_1to1;
e14114170e01 applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents: 73
diff changeset
480 #else
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
481 fr.synth=synth_1to1;
732
e14114170e01 applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents: 73
diff changeset
482 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
483 fr.synth_mono=synth_1to1_mono2stereo;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
484 fr.down_sample=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
485 fr.down_sample_sblimit = SBLIMIT>>(fr.down_sample);
8545
b22b29178258 cleanup & fix cpu detection & init stuff
arpi
parents: 7520
diff changeset
486
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
487 init_layer2();
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
488 init_layer3(fr.down_sample_sblimit);
13946
e632b43f0598 Reduce excessive verbosity.
diego
parents: 12131
diff changeset
489 mp_msg(MSGT_DECAUDIO,MSGL_V,"MP3lib: init layer2&3 finished, tables done\n");
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
490 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
491
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
492 #if 0
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
493
28232
8df85ad26746 Add missing 'void' keyword to parameterless function declarations.
diego
parents: 28095
diff changeset
494 void MP3_Close(void){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
495 MP3_eof=1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
496 if(mp3_file) fclose(mp3_file);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
497 mp3_file=NULL;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
498 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
499
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
500 // Open a file, init buffers. Call once per file!
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
501 int MP3_Open(char *filename,int buffsize){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
502 MP3_eof=1; // lock decoding
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
503 MP3_pause=1; // lock playing
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
504 if(mp3_file) MP3_Close(); // close prev. file
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
505 MP3_frames=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
506
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
507 mp3_file=fopen(filename,"rb");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
508 // printf("MP3_Open: file='%s'",filename);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
509 // if(!mp3_file){ printf(" not found!\n"); return 0;} else printf("Ok!\n");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
510 if(!mp3_file) return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
511
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
512 MP3_filesize=MP3_PrintTAG();
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
513 fseek(mp3_file,0,SEEK_SET);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
514
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
515 MP3_InitBuffers(buffsize);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
516 if(!tables_done_flag) MP3_Init();
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
517 MP3_eof=0; // allow decoding
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
518 MP3_pause=0; // allow playing
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
519 return MP3_filesize;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
520 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
521
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
522 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
523
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
524 // Read & decode a single frame. Called by sound driver.
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
525 int MP3_DecodeFrame(unsigned char *hova,short single){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
526 pcm_sample = hova;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
527 pcm_point = 0;
29717
afc8b80eb027 cosmetics: Remove some pointless parentheses from return calls.
diego
parents: 29263
diff changeset
528 if(!read_frame(&fr)) return 0;
afc8b80eb027 cosmetics: Remove some pointless parentheses from return calls.
diego
parents: 29263
diff changeset
529 if(single==-2){ set_pointer(512); return 1; }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
530 if(fr.error_protection) getbits(16); /* skip crc */
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
531 fr.single=single;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
532 switch(fr.lay){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
533 case 2: do_layer2(&fr,single);break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
534 case 3: do_layer3(&fr,single);break;
10468
e2979f202bb2 layer-1 support
arpi
parents: 8545
diff changeset
535 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
536 default:
30990
0ad2da052b2e the great MPlayer tab removal: part I
diego
parents: 30682
diff changeset
537 return 0; // unsupported
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
538 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
539 // ++MP3_frames;
29717
afc8b80eb027 cosmetics: Remove some pointless parentheses from return calls.
diego
parents: 29263
diff changeset
540 return pcm_point ? pcm_point : 2;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
541 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
542
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
543 // Prints last frame header in ascii.
17566
f580a7755ac5 Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents: 17300
diff changeset
544 void MP3_PrintHeader(void){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
545 static char *modes[4] = { "Stereo", "Joint-Stereo", "Dual-Channel", "Single-Channel" };
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
546 static char *layers[4] = { "???" , "I", "II", "III" };
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
547
23442
b4cd44be30d4 Change '%ld' to '%d' to remove warnings introduced by r23452
zuxy
parents: 23441
diff changeset
548 mp_msg(MSGT_DECAUDIO,MSGL_V,"\rMPEG %s, Layer %s, %d Hz %d kbit %s, BPF: %d\n",
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
549 fr.mpeg25 ? "2.5" : (fr.lsf ? "2.0" : "1.0"),
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
550 layers[fr.lay],freqs[fr.sampling_frequency],
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
551 tabsel_123[fr.lsf][fr.lay-1][fr.bitrate_index],
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
552 modes[fr.mode],fr.framesize+4);
6138
523014df7d32 big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents: 5888
diff changeset
553 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
554 fr.stereo,fr.copyright?"Yes":"No",
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
555 fr.original?"Yes":"No",fr.error_protection?"Yes":"No",
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
556 fr.emphasis);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
557 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
558
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
559 #if 0
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
560 #include "genre.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
561
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
562 // Read & print ID3 TAG. Do not call when playing!!! returns filesize.
28232
8df85ad26746 Add missing 'void' keyword to parameterless function declarations.
diego
parents: 28095
diff changeset
563 int MP3_PrintTAG(void){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
564 struct id3tag {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
565 char tag[3];
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
566 char title[30];
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
567 char artist[30];
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
568 char album[30];
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
569 char year[4];
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
570 char comment[30];
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
571 unsigned char genre;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
572 };
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
573 struct id3tag tag;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
574 char title[31]={0,};
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
575 char artist[31]={0,};
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
576 char album[31]={0,};
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
577 char year[5]={0,};
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
578 char comment[31]={0,};
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
579 char genre[31]={0,};
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
580 int fsize;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
581 int ret;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
582
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
583 fseek(mp3_file,0,SEEK_END);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
584 fsize=ftell(mp3_file);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
585 if(fseek(mp3_file,-128,SEEK_END)) return fsize;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
586 ret=fread(&tag,128,1,mp3_file);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
587 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
588
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
589 strncpy(title,tag.title,30);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
590 strncpy(artist,tag.artist,30);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
591 strncpy(album,tag.album,30);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
592 strncpy(year,tag.year,4);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
593 strncpy(comment,tag.comment,30);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
594
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
595 if ( tag.genre <= sizeof(genre_table)/sizeof(*genre_table) ) {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
596 strncpy(genre, genre_table[tag.genre], 30);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
597 } else {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
598 strncpy(genre,"Unknown",30);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
599 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
600
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
601 // printf("\n");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
602 printf("Title : %30s Artist: %s\n",title,artist);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
603 printf("Album : %30s Year : %4s\n",album,year);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
604 printf("Comment: %30s Genre : %s\n",comment,genre);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
605 printf("\n");
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
606 return fsize-128;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
607 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
608
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
609 #endif