Mercurial > mplayer.hg
annotate libmpdemux/demux_audio.c @ 4717:b7054dadd2c0
We should skip exactly the first frame on mp3 files.
Should correct many badly detected file, decoder crash, etc
author | albeu |
---|---|
date | Fri, 15 Feb 2002 16:48:25 +0000 |
parents | 9262f4dc332f |
children | 10ad330c1733 |
rev | line source |
---|---|
4694 | 1 |
2 #include "config.h" | |
4712 | 3 #include "../mp_msg.h" |
4694 | 4 |
5 #include <stdlib.h> | |
6 #include <stdio.h> | |
7 #include "stream.h" | |
8 #include "demuxer.h" | |
9 #include "stheader.h" | |
10 #include "genres.h" | |
11 | |
12 #include <string.h> | |
13 #ifdef MP_DEBUG | |
14 #include <assert.h> | |
15 #endif | |
16 | |
17 #define MP3 1 | |
18 #define WAV 2 | |
19 | |
20 | |
21 #define HDR_SIZE 4 | |
22 | |
23 typedef struct da_priv { | |
24 int frmt; | |
25 } da_priv_t; | |
26 | |
27 extern int mp_decode_mp3_header(unsigned char* hbuf); | |
28 extern void free_sh_audio(sh_audio_t* sh); | |
4700
30131db5dfbb
Improved mp3 detection (don't detect mpeg1/2 as mp3 anymore)
albeu
parents:
4694
diff
changeset
|
29 extern void resync_audio_stream(sh_audio_t *sh_audio); |
4694 | 30 |
31 | |
32 int demux_audio_open(demuxer_t* demuxer) { | |
33 stream_t *s; | |
34 sh_audio_t* sh_audio; | |
35 uint8_t hdr[HDR_SIZE]; | |
36 int st_pos = 0,frmt = 0, n = 0, pos = 0, step; | |
37 da_priv_t* priv; | |
38 #ifdef MP_DEBUG | |
39 assert(demuxer != NULL); | |
40 assert(demuxer->stream != NULL); | |
41 #endif | |
42 | |
43 s = demuxer->stream; | |
44 | |
45 while(n < 5 && ! s->eof) { | |
46 st_pos = stream_tell(s); | |
47 step = 1; | |
48 if(pos < HDR_SIZE) { | |
49 stream_read(s,&hdr[pos],HDR_SIZE-pos); | |
50 pos = HDR_SIZE; | |
51 } | |
52 | |
53 if( hdr[0] == 'R' && hdr[1] == 'I' && hdr[2] == 'F' && hdr[3] == 'F' ) { | |
54 stream_skip(s,4); | |
55 if(s->eof) | |
56 break; | |
57 stream_read(s,hdr,4); | |
58 if(s->eof) | |
59 break; | |
60 if(hdr[0] != 'W' || hdr[1] != 'A' || hdr[2] != 'V' || hdr[3] != 'E' ) | |
61 stream_skip(s,-8); | |
62 else | |
63 // We found wav header. Now we can have 'fmt ' or a mp3 header | |
64 // empty the buffer | |
65 step = 4; | |
66 } else if( hdr[0] == 'f' && hdr[1] == 'm' && hdr[2] == 't' && hdr[3] == ' ' ) { | |
67 frmt = WAV; | |
68 break; | |
4717
b7054dadd2c0
We should skip exactly the first frame on mp3 files.
albeu
parents:
4712
diff
changeset
|
69 } else if((n = mp_decode_mp3_header(hdr)) > 0) { |
4694 | 70 frmt = MP3; |
71 break; | |
72 } | |
73 // Add here some other audio format detection | |
74 if(step < HDR_SIZE) | |
75 memmove(hdr,&hdr[step],HDR_SIZE-step); | |
76 pos -= step; | |
77 } | |
78 | |
79 if(!frmt) | |
80 return 0; | |
81 | |
82 sh_audio = new_sh_audio(demuxer,0); | |
83 | |
84 switch(frmt) { | |
85 case MP3: | |
86 sh_audio->format = 0x55; | |
4717
b7054dadd2c0
We should skip exactly the first frame on mp3 files.
albeu
parents:
4712
diff
changeset
|
87 demuxer->movi_start = st_pos-HDR_SIZE+n; |
4700
30131db5dfbb
Improved mp3 detection (don't detect mpeg1/2 as mp3 anymore)
albeu
parents:
4694
diff
changeset
|
88 for(n = 0; n < 5 ; n++) { |
30131db5dfbb
Improved mp3 detection (don't detect mpeg1/2 as mp3 anymore)
albeu
parents:
4694
diff
changeset
|
89 pos = mp_decode_mp3_header(hdr); |
30131db5dfbb
Improved mp3 detection (don't detect mpeg1/2 as mp3 anymore)
albeu
parents:
4694
diff
changeset
|
90 if(pos < 0) |
30131db5dfbb
Improved mp3 detection (don't detect mpeg1/2 as mp3 anymore)
albeu
parents:
4694
diff
changeset
|
91 return 0; |
30131db5dfbb
Improved mp3 detection (don't detect mpeg1/2 as mp3 anymore)
albeu
parents:
4694
diff
changeset
|
92 stream_skip(s,pos-4); |
30131db5dfbb
Improved mp3 detection (don't detect mpeg1/2 as mp3 anymore)
albeu
parents:
4694
diff
changeset
|
93 if(s->eof) |
30131db5dfbb
Improved mp3 detection (don't detect mpeg1/2 as mp3 anymore)
albeu
parents:
4694
diff
changeset
|
94 return 0; |
30131db5dfbb
Improved mp3 detection (don't detect mpeg1/2 as mp3 anymore)
albeu
parents:
4694
diff
changeset
|
95 stream_read(s,hdr,4); |
30131db5dfbb
Improved mp3 detection (don't detect mpeg1/2 as mp3 anymore)
albeu
parents:
4694
diff
changeset
|
96 if(s->eof) |
30131db5dfbb
Improved mp3 detection (don't detect mpeg1/2 as mp3 anymore)
albeu
parents:
4694
diff
changeset
|
97 return 0; |
30131db5dfbb
Improved mp3 detection (don't detect mpeg1/2 as mp3 anymore)
albeu
parents:
4694
diff
changeset
|
98 } |
4694 | 99 if(s->end_pos) { |
100 char tag[4]; | |
101 stream_seek(s,s->end_pos-128); | |
102 stream_read(s,tag,3); | |
103 tag[3] = '\0'; | |
104 if(strcmp(tag,"TAG")) | |
105 demuxer->movi_end = s->end_pos; | |
106 else { | |
107 char buf[31]; | |
108 uint8_t g; | |
109 demuxer->movi_end = stream_tell(s)-3; | |
110 stream_read(s,buf,30); | |
111 buf[30] = '\0'; | |
112 demux_info_add(demuxer,"Title",buf); | |
113 stream_read(s,buf,30); | |
114 buf[30] = '\0'; | |
115 demux_info_add(demuxer,"Artist",buf); | |
116 stream_read(s,buf,30); | |
117 buf[30] = '\0'; | |
118 demux_info_add(demuxer,"Album",buf); | |
119 stream_read(s,buf,4); | |
120 buf[5] = '\0'; | |
121 demux_info_add(demuxer,"Year",buf); | |
122 stream_read(s,buf,30); | |
123 buf[30] = '\0'; | |
124 demux_info_add(demuxer,"Comment",buf); | |
125 if(buf[28] == 0 && buf[29] != 0) { | |
126 uint8_t trk = (uint8_t)buf[29]; | |
127 sprintf(buf,"%d",trk); | |
128 demux_info_add(demuxer,"Track",buf); | |
129 } | |
130 g = stream_read_char(s); | |
131 demux_info_add(demuxer,"Genre",genres[g]); | |
132 } | |
133 } | |
134 break; | |
135 case WAV: { | |
136 WAVEFORMATEX* w; | |
137 int l; | |
138 sh_audio->wf = w = (WAVEFORMATEX*)malloc(sizeof(WAVEFORMATEX)); | |
139 l = stream_read_dword_le(s); | |
140 if(l < 16) { | |
141 printf("Bad wav header length : too short !!!\n"); | |
142 free_sh_audio(sh_audio); | |
143 return 0; | |
144 } | |
145 w->wFormatTag = sh_audio->format = stream_read_word_le(s); | |
146 w->nChannels = sh_audio->channels = stream_read_word_le(s); | |
147 w->nSamplesPerSec = sh_audio->samplerate = stream_read_dword_le(s); | |
148 w->nAvgBytesPerSec = stream_read_dword_le(s); | |
149 w->nBlockAlign = stream_read_word_le(s); | |
150 w->wBitsPerSample = sh_audio->samplesize = stream_read_word_le(s); | |
151 w->cbSize = 0; | |
152 l -= 16; | |
153 if(l) | |
154 stream_skip(s,l); | |
155 demuxer->movi_start = stream_tell(s); | |
156 demuxer->movi_end = s->end_pos; | |
157 } break; | |
158 } | |
159 | |
160 priv = (da_priv_t*)malloc(sizeof(da_priv_t)); | |
161 priv->frmt = frmt; | |
162 demuxer->priv = priv; | |
163 demuxer->audio->id = 0; | |
164 demuxer->audio->sh = sh_audio; | |
165 sh_audio->ds = demuxer->audio; | |
166 | |
167 if(stream_tell(s) != demuxer->movi_start) | |
168 stream_seek(s,demuxer->movi_start); | |
169 | |
4712 | 170 mp_msg(MSGT_DEMUX,MSGL_V,"demux_audio: audio data 0x%X - 0x%X \n",demuxer->movi_start,demuxer->movi_end); |
171 | |
4694 | 172 return 1; |
173 } | |
174 | |
175 | |
176 int demux_audio_fill_buffer(demux_stream_t *ds) { | |
177 sh_audio_t* sh_audio; | |
178 demuxer_t* demux; | |
179 da_priv_t* priv; | |
180 stream_t* s; | |
181 #ifdef MP_DEBUG | |
182 assert(ds != NULL); | |
183 assert(ds->sh != NULL); | |
184 assert(ds->demuxer != NULL); | |
185 #endif | |
186 sh_audio = ds->sh; | |
187 demux = ds->demuxer; | |
188 priv = demux->priv; | |
189 s = demux->stream; | |
190 | |
191 if(s->eof || (demux->movi_end && stream_tell(s) >= demux->movi_end) ) | |
192 return 0; | |
193 | |
194 switch(priv->frmt) { | |
195 case MP3 : | |
196 while(! s->eof || (demux->movi_end && stream_tell(s) >= demux->movi_end) ) { | |
197 uint8_t hdr[4]; | |
198 int len; | |
199 stream_read(s,hdr,4); | |
200 len = mp_decode_mp3_header(hdr); | |
201 if(len < 0) { | |
202 stream_skip(s,-3); | |
203 } else { | |
204 demux_packet_t* dp; | |
205 if(s->eof || (demux->movi_end && stream_tell(s) >= demux->movi_end) ) | |
206 return 0; | |
207 dp = new_demux_packet(len); | |
208 memcpy(dp->buffer,hdr,4); | |
209 stream_read(s,dp->buffer + 4,len-4); | |
210 ds_add_packet(ds,dp); | |
211 return 1; | |
212 } | |
4700
30131db5dfbb
Improved mp3 detection (don't detect mpeg1/2 as mp3 anymore)
albeu
parents:
4694
diff
changeset
|
213 } break; |
4694 | 214 case WAV : { |
215 int l = sh_audio->wf->nAvgBytesPerSec; | |
216 demux_packet_t* dp = new_demux_packet(l); | |
217 stream_read(s,dp->buffer,l); | |
218 ds_add_packet(ds,dp); | |
219 return 1; | |
220 } | |
221 default: | |
222 printf("Audio demuxer : unknow format %d\n",priv->frmt); | |
223 } | |
224 | |
225 | |
226 return 0; | |
227 } | |
228 | |
229 void demux_audio_seek(demuxer_t *demuxer,float rel_seek_secs,int flags){ | |
230 sh_audio_t* sh_audio; | |
231 stream_t* s; | |
232 int base,pos; | |
233 float len; | |
234 da_priv_t* priv; | |
235 | |
236 sh_audio = demuxer->audio->sh; | |
237 s = demuxer->stream; | |
238 priv = demuxer->priv; | |
239 | |
240 base = flags&1 ? demuxer->movi_start : stream_tell(s) ; | |
241 len = (demuxer->movi_end && flags&2) ? (demuxer->movi_end - demuxer->movi_start)*rel_seek_secs : rel_seek_secs; | |
242 | |
243 pos = base+(len*sh_audio->i_bps); | |
244 | |
245 if(demuxer->movi_end && pos >= demuxer->movi_end) { | |
246 sh_audio->timer = (stream_tell(s) - demuxer->movi_start)/sh_audio->i_bps; | |
247 return; | |
248 } else if(pos < demuxer->movi_start) | |
249 pos = demuxer->movi_start; | |
250 | |
251 | |
252 sh_audio->timer = flags&1 ? rel_seek_secs : (pos-demuxer->movi_start)/sh_audio->i_bps; | |
253 | |
254 switch(priv->frmt) { | |
255 case WAV: | |
256 pos += (pos % (sh_audio->channels * sh_audio->samplesize) ); | |
257 break; | |
258 } | |
259 | |
260 stream_seek(s,pos); | |
261 | |
4700
30131db5dfbb
Improved mp3 detection (don't detect mpeg1/2 as mp3 anymore)
albeu
parents:
4694
diff
changeset
|
262 resync_audio_stream(sh_audio); |
30131db5dfbb
Improved mp3 detection (don't detect mpeg1/2 as mp3 anymore)
albeu
parents:
4694
diff
changeset
|
263 |
4694 | 264 } |