Mercurial > mplayer.hg
annotate dec_audio.c @ 3920:eea76f70665d
Sync with r1.20. Just for release
author | nick |
---|---|
date | Mon, 31 Dec 2001 16:07:04 +0000 |
parents | 0c1e7b47d35c |
children | 60db4273246d |
rev | line source |
---|---|
3866 | 1 |
2 #define USE_G72X | |
3886 | 3 //#define USE_LIBAC3 |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
4 |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
5 #include <stdio.h> |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
6 #include <stdlib.h> |
1430 | 7 #include <unistd.h> |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
8 |
1038
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents:
1020
diff
changeset
|
9 #include "config.h" |
1567 | 10 #include "mp_msg.h" |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1927
diff
changeset
|
11 #include "help_mp.h" |
1567 | 12 |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
13 extern int verbose; // defined in mplayer.c |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
14 |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
15 #include "stream.h" |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
16 #include "demuxer.h" |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
17 |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
18 #include "codec-cfg.h" |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
19 #include "stheader.h" |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
20 |
2563 | 21 #include "dec_audio.h" |
22 | |
23 //========================================================================== | |
24 | |
25 #include "libao2/afmt.h" | |
26 | |
2049
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
1973
diff
changeset
|
27 #include "dll_init.h" |
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
1973
diff
changeset
|
28 |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
29 #include "mp3lib/mp3.h" |
3886 | 30 |
31 #ifdef USE_LIBAC3 | |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
32 #include "libac3/ac3.h" |
3886 | 33 #endif |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
34 |
3413 | 35 #include "liba52/a52.h" |
3907 | 36 #include "liba52/mm_accel.h" |
3413 | 37 static sample_t * a52_samples; |
38 static a52_state_t a52_state; | |
3907 | 39 static uint32_t a52_accel=0; |
3911 | 40 static uint32_t a52_flags=0; |
3413 | 41 |
3866 | 42 #ifdef USE_G72X |
3426 | 43 #include "g72x/g72x.h" |
44 static G72x_DATA g72x_data; | |
3866 | 45 #endif |
3413 | 46 |
883 | 47 #include "alaw.h" |
48 | |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
49 #include "xa/xa_gsm.h" |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
50 |
1528
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
51 #include "ac3-iec958.h" |
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
52 |
3756 | 53 #include "adpcm.h" |
2420 | 54 |
3145 | 55 #include "cpudetect.h" |
56 | |
3182
95bbd21e8e1f
moved num_audio_channels out of LIBMAD ifdef, where it didn't belong!
steve
parents:
3181
diff
changeset
|
57 /* used for ac3surround decoder - set using -channels option */ |
95bbd21e8e1f
moved num_audio_channels out of LIBMAD ifdef, where it didn't belong!
steve
parents:
3181
diff
changeset
|
58 int audio_output_channels = 2; |
95bbd21e8e1f
moved num_audio_channels out of LIBMAD ifdef, where it didn't belong!
steve
parents:
3181
diff
changeset
|
59 |
2563 | 60 #ifdef USE_FAKE_MONO |
61 int fakemono=0; | |
62 #endif | |
63 | |
1291 | 64 #ifdef USE_DIRECTSHOW |
604 | 65 #include "loader/DirectShow/DS_AudioDec.h" |
3442 | 66 static void* ds_adec=NULL; |
1291 | 67 #endif |
1038
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents:
1020
diff
changeset
|
68 |
1828 | 69 #ifdef HAVE_OGGVORBIS |
70 /* XXX is math.h really needed? - atmos */ | |
71 #include <math.h> | |
72 #include <vorbis/codec.h> | |
2341 | 73 |
74 typedef struct ov_struct_st { | |
75 ogg_sync_state oy; /* sync and verify incoming physical bitstream */ | |
76 ogg_stream_state os; /* take physical pages, weld into a logical | |
77 stream of packets */ | |
78 ogg_page og; /* one Ogg bitstream page. Vorbis packets are inside */ | |
79 ogg_packet op; /* one raw packet of data for decode */ | |
3145 | 80 |
2341 | 81 vorbis_info vi; /* struct that stores all the static vorbis bitstream |
82 settings */ | |
83 vorbis_comment vc; /* struct that stores all the bitstream user comments */ | |
84 vorbis_dsp_state vd; /* central working state for the packet->PCM decoder */ | |
85 vorbis_block vb; /* local working space for packet->PCM decode */ | |
86 } ov_struct_t; | |
1828 | 87 #endif |
88 | |
1927 | 89 #ifdef USE_LIBAVCODEC |
2496 | 90 #ifdef USE_LIBAVCODEC_SO |
91 #include <libffmpeg/avcodec.h> | |
92 #else | |
1927 | 93 #include "libavcodec/avcodec.h" |
2496 | 94 #endif |
1927 | 95 static AVCodec *lavc_codec=NULL; |
96 static AVCodecContext lavc_context; | |
97 extern int avcodec_inited; | |
98 #endif | |
99 | |
2415 | 100 |
101 | |
102 #ifdef USE_LIBMAD | |
103 #include <mad.h> | |
104 static struct mad_stream mad_stream; | |
105 static struct mad_frame mad_frame; | |
106 static struct mad_synth mad_synth; | |
107 | |
108 // ensure buffer is filled with some data | |
109 static void mad_prepare_buffer(sh_audio_t* sh_audio, struct mad_stream* ms, int length) | |
110 { | |
111 if(sh_audio->a_in_buffer_len < length) { | |
112 int len = demux_read_data(sh_audio->ds, sh_audio->a_in_buffer+sh_audio->a_in_buffer_len, length-sh_audio->a_in_buffer_len); | |
113 sh_audio->a_in_buffer_len += len; | |
3874 | 114 // printf("mad_prepare_buffer: read %d bytes\n", len); |
2415 | 115 } |
116 } | |
117 | |
118 static void mad_postprocess_buffer(sh_audio_t* sh_audio, struct mad_stream* ms) | |
119 { | |
120 int delta = (unsigned char*)ms->next_frame - (unsigned char *)sh_audio->a_in_buffer; | |
121 if(delta != 0) { | |
122 sh_audio->a_in_buffer_len -= delta; | |
123 memcpy(sh_audio->a_in_buffer, ms->next_frame, sh_audio->a_in_buffer_len); | |
124 } | |
125 } | |
126 | |
127 | |
128 static inline | |
129 signed short mad_scale(mad_fixed_t sample) | |
130 { | |
131 /* round */ | |
132 sample += (1L << (MAD_F_FRACBITS - 16)); | |
133 | |
134 /* clip */ | |
135 if (sample >= MAD_F_ONE) | |
136 sample = MAD_F_ONE - 1; | |
137 else if (sample < -MAD_F_ONE) | |
138 sample = -MAD_F_ONE; | |
139 | |
140 /* quantize */ | |
141 return sample >> (MAD_F_FRACBITS + 1 - 16); | |
3871 | 142 |
143 } | |
144 | |
145 static void mad_sync(sh_audio_t* sh_audio, struct mad_stream* ms) | |
146 { | |
147 int len; | |
3874 | 148 #if 1 |
3871 | 149 int skipped = 0; |
150 | |
151 // printf("buffer len: %d\n", sh_audio->a_in_buffer_len); | |
152 while(sh_audio->a_in_buffer_len - skipped) | |
153 { | |
154 len = mp_decode_mp3_header(sh_audio->a_in_buffer+skipped); | |
155 if (len != -1) | |
156 { | |
157 // printf("Frame len=%d\n", len); | |
158 break; | |
159 } | |
160 else | |
161 skipped++; | |
162 } | |
163 if (skipped) | |
164 { | |
165 printf("Audio synced, skipped bytes: %d\n", skipped); | |
3874 | 166 // ms->skiplen += skipped; |
167 // printf("skiplen: %d (skipped: %d)\n", ms->skiplen, skipped); | |
168 | |
169 // if (sh_audio->a_in_buffer_len - skipped < MAD_BUFFER_GUARD) | |
170 // printf("Mad reports: too small buffer\n"); | |
171 | |
172 // mad_stream_buffer(ms, sh_audio->a_in_buffer+skipped, sh_audio->a_in_buffer_len-skipped); | |
173 // mad_prepare_buffer(sh_audio, ms, sh_audio->a_in_buffer_len-skipped); | |
174 | |
175 /* move frame to the beginning of the buffer and fill up to a_in_buffer_size */ | |
176 sh_audio->a_in_buffer_len -= skipped; | |
177 memcpy(sh_audio->a_in_buffer, sh_audio->a_in_buffer+skipped, sh_audio->a_in_buffer_len); | |
178 mad_prepare_buffer(sh_audio, ms, sh_audio->a_in_buffer_size); | |
179 mad_stream_buffer(ms, sh_audio->a_in_buffer, sh_audio->a_in_buffer_len); | |
180 // printf("bufflen: %d\n", sh_audio->a_in_buffer_len); | |
181 | |
182 // len = mp_decode_mp3_header(sh_audio->a_in_buffer); | |
183 // printf("len: %d\n", len); | |
184 ms->md_len = len; | |
3871 | 185 } |
3874 | 186 #else |
3871 | 187 len = mad_stream_sync(&ms); |
188 if (len == -1) | |
189 { | |
190 printf("Mad sync failed\n"); | |
191 } | |
192 #endif | |
2415 | 193 } |
3874 | 194 |
195 static void mad_print_error(struct mad_stream *mad_stream) | |
196 { | |
197 printf("error (0x%x): ", mad_stream->error); | |
198 switch(mad_stream->error) | |
199 { | |
200 case MAD_ERROR_BUFLEN: printf("buffer too small"); break; | |
201 case MAD_ERROR_BUFPTR: printf("invalid buffer pointer"); break; | |
202 case MAD_ERROR_NOMEM: printf("not enought memory"); break; | |
203 case MAD_ERROR_LOSTSYNC: printf("lost sync"); break; | |
204 case MAD_ERROR_BADLAYER: printf("bad layer"); break; | |
205 case MAD_ERROR_BADBITRATE: printf("bad bitrate"); break; | |
206 case MAD_ERROR_BADSAMPLERATE: printf("bad samplerate"); break; | |
207 case MAD_ERROR_BADEMPHASIS: printf("bad emphasis"); break; | |
208 case MAD_ERROR_BADCRC: printf("bad crc"); break; | |
209 case MAD_ERROR_BADBITALLOC: printf("forbidden bit alloc val"); break; | |
210 case MAD_ERROR_BADSCALEFACTOR: printf("bad scalefactor index"); break; | |
211 case MAD_ERROR_BADFRAMELEN: printf("bad frame length"); break; | |
212 case MAD_ERROR_BADBIGVALUES: printf("bad bigvalues count"); break; | |
213 case MAD_ERROR_BADBLOCKTYPE: printf("reserved blocktype"); break; | |
214 case MAD_ERROR_BADSCFSI: printf("bad scalefactor selinfo"); break; | |
215 case MAD_ERROR_BADDATAPTR: printf("bad maindatabegin ptr"); break; | |
216 case MAD_ERROR_BADPART3LEN: printf("bad audio data len"); break; | |
217 case MAD_ERROR_BADHUFFTABLE: printf("bad huffman table sel"); break; | |
218 case MAD_ERROR_BADHUFFDATA: printf("huffman data overrun"); break; | |
219 case MAD_ERROR_BADSTEREO: printf("incomp. blocktype for JS"); break; | |
220 default: | |
221 printf("unknown error"); | |
222 } | |
223 printf("\n"); | |
224 } | |
2415 | 225 #endif |
226 | |
227 | |
3413 | 228 static int a52_fillbuff(sh_audio_t *sh_audio){ |
229 int length=0; | |
230 int flags=0; | |
231 int sample_rate=0; | |
232 int bit_rate=0; | |
3834 | 233 |
234 sh_audio->a_in_buffer_len=0; | |
235 // sync frame: | |
3413 | 236 while(1){ |
237 while(sh_audio->a_in_buffer_len<7){ | |
238 int c=demux_getc(sh_audio->ds); | |
239 if(c<0) return -1; // EOF | |
240 sh_audio->a_in_buffer[sh_audio->a_in_buffer_len++]=c; | |
241 } | |
242 length = a52_syncinfo (sh_audio->a_in_buffer, &flags, &sample_rate, &bit_rate); | |
3834 | 243 if(length>=7 && length<=3840) break; // we're done. |
244 // bad file => resync | |
245 memcpy(sh_audio->a_in_buffer,sh_audio->a_in_buffer+1,6); | |
246 --sh_audio->a_in_buffer_len; | |
247 } | |
3413 | 248 mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"a52: len=%d flags=0x%X %d Hz %d bit/s\n",length,flags,sample_rate,bit_rate); |
249 sh_audio->samplerate=sample_rate; | |
250 sh_audio->i_bps=bit_rate/8; | |
251 demux_read_data(sh_audio->ds,sh_audio->a_in_buffer+7,length-7); | |
3891 | 252 |
253 if(crc16_block(sh_audio->a_in_buffer+2,length-2)!=0) | |
254 mp_msg(MSGT_DECAUDIO,MSGL_STATUS,"a52: CRC check failed! \n"); | |
255 | |
3413 | 256 return length; |
257 } | |
2415 | 258 |
3887 | 259 // returns: number of available channels |
260 static int a52_printinfo(sh_audio_t *sh_audio){ | |
261 int flags, sample_rate, bit_rate; | |
262 char* mode="unknown"; | |
263 int channels=0; | |
264 a52_syncinfo (sh_audio->a_in_buffer, &flags, &sample_rate, &bit_rate); | |
265 switch(flags&A52_CHANNEL_MASK){ | |
266 case A52_CHANNEL: mode="channel"; channels=2; break; | |
267 case A52_MONO: mode="mono"; channels=1; break; | |
268 case A52_STEREO: mode="stereo"; channels=2; break; | |
269 case A52_3F: mode="3f";channels=3;break; | |
270 case A52_2F1R: mode="2f+1r";channels=3;break; | |
271 case A52_3F1R: mode="3f+1r";channels=4;break; | |
272 case A52_2F2R: mode="2f+2r";channels=4;break; | |
273 case A52_3F2R: mode="3f+2r";channels=5;break; | |
274 case A52_CHANNEL1: mode="channel1"; channels=2; break; | |
275 case A52_CHANNEL2: mode="channel2"; channels=2; break; | |
276 case A52_DOLBY: mode="dolby"; channels=2; break; | |
277 } | |
278 mp_msg(MSGT_DECAUDIO,MSGL_INFO,"AC3: %d.%d (%s%s) %d Hz %3.1f kbit/s\n", | |
279 channels, (flags&A52_LFE)?1:0, | |
280 mode, (flags&A52_LFE)?"+lfe":"", | |
281 sample_rate, bit_rate*0.001f); | |
282 return (flags&A52_LFE) ? (channels+1) : channels; | |
283 } | |
284 | |
1927 | 285 int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen); |
1327
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
286 |
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
287 |
1289 | 288 static sh_audio_t* dec_audio_sh=NULL; |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
289 |
3886 | 290 #ifdef USE_LIBAC3 |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
291 // AC3 decoder buffer callback: |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
292 static void ac3_fill_buffer(uint8_t **start,uint8_t **end){ |
1289 | 293 int len=ds_get_packet(dec_audio_sh->ds,start); |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
294 //printf("<ac3:%d>\n",len); |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
295 if(len<0) |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
296 *start = *end = NULL; |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
297 else |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
298 *end = *start + len; |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
299 } |
3886 | 300 #endif |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
301 |
1289 | 302 // MP3 decoder buffer callback: |
303 int mplayer_audio_read(char *buf,int size){ | |
304 int len; | |
305 len=demux_read_data(dec_audio_sh->ds,buf,size); | |
306 return len; | |
307 } | |
308 | |
296 | 309 int init_audio(sh_audio_t *sh_audio){ |
303 | 310 int driver=sh_audio->codec->driver; |
296 | 311 |
312 sh_audio->samplesize=2; | |
1320
18374d49befa
On big-endian architectures, all audio decoders default to big-endian 16-bit
jkeil
parents:
1313
diff
changeset
|
313 #if WORDS_BIGENDIAN |
18374d49befa
On big-endian architectures, all audio decoders default to big-endian 16-bit
jkeil
parents:
1313
diff
changeset
|
314 sh_audio->sample_format=AFMT_S16_BE; |
18374d49befa
On big-endian architectures, all audio decoders default to big-endian 16-bit
jkeil
parents:
1313
diff
changeset
|
315 #else |
758 | 316 sh_audio->sample_format=AFMT_S16_LE; |
1320
18374d49befa
On big-endian architectures, all audio decoders default to big-endian 16-bit
jkeil
parents:
1313
diff
changeset
|
317 #endif |
303 | 318 sh_audio->samplerate=0; |
401 | 319 //sh_audio->pcm_bswap=0; |
1529 | 320 sh_audio->o_bps=0; |
303 | 321 |
758 | 322 sh_audio->a_buffer_size=0; |
303 | 323 sh_audio->a_buffer=NULL; |
296 | 324 |
746 | 325 sh_audio->a_in_buffer_len=0; |
326 | |
758 | 327 // setup required min. in/out buffer size: |
328 sh_audio->audio_out_minsize=8192;// default size, maybe not enough for Win32/ACM | |
329 | |
330 switch(driver){ | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
331 case AFM_ACM: |
1517
0e9c29538a86
Use USE_WIN32DLL define instead of ARCH_X86 to decide whether or not to compile
jkeil
parents:
1485
diff
changeset
|
332 #ifndef USE_WIN32DLL |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1927
diff
changeset
|
333 mp_msg(MSGT_DECAUDIO,MSGL_ERR,MSGTR_NoACMSupport); |
1309
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1291
diff
changeset
|
334 driver=0; |
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1291
diff
changeset
|
335 #else |
296 | 336 // Win32 ACM audio codec: |
337 if(init_acm_audio_codec(sh_audio)){ | |
746 | 338 sh_audio->i_bps=sh_audio->wf->nAvgBytesPerSec; |
296 | 339 sh_audio->channels=sh_audio->o_wf.nChannels; |
340 sh_audio->samplerate=sh_audio->o_wf.nSamplesPerSec; | |
758 | 341 // if(sh_audio->audio_out_minsize>16384) sh_audio->audio_out_minsize=16384; |
342 // sh_audio->a_buffer_size=sh_audio->audio_out_minsize; | |
343 // if(sh_audio->a_buffer_size<sh_audio->audio_out_minsize+MAX_OUTBURST) | |
344 // sh_audio->a_buffer_size=sh_audio->audio_out_minsize+MAX_OUTBURST; | |
296 | 345 } else { |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1927
diff
changeset
|
346 mp_msg(MSGT_DECAUDIO,MSGL_ERR,MSGTR_ACMiniterror); |
303 | 347 driver=0; |
296 | 348 } |
1309
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1291
diff
changeset
|
349 #endif |
758 | 350 break; |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
351 case AFM_DSHOW: |
296 | 352 #ifndef USE_DIRECTSHOW |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1927
diff
changeset
|
353 mp_msg(MSGT_DECAUDIO,MSGL_ERR,MSGTR_NoDShowAudio); |
303 | 354 driver=0; |
296 | 355 #else |
356 // Win32 DShow audio codec: | |
340 | 357 // printf("DShow_audio: channs=%d rate=%d\n",sh_audio->channels,sh_audio->samplerate); |
3442 | 358 if(!(ds_adec=DS_AudioDecoder_Open(sh_audio->codec->dll,&sh_audio->codec->guid,sh_audio->wf))){ |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1927
diff
changeset
|
359 mp_msg(MSGT_DECAUDIO,MSGL_ERR,MSGTR_MissingDLLcodec,sh_audio->codec->dll); |
303 | 360 driver=0; |
361 } else { | |
746 | 362 sh_audio->i_bps=sh_audio->wf->nAvgBytesPerSec; |
432
5251b0c57e39
sh_audio->wf and sh_video->bih changed to dynamic (thanx to Jens Hoffmann)
arpi_esp
parents:
401
diff
changeset
|
363 sh_audio->channels=sh_audio->wf->nChannels; |
5251b0c57e39
sh_audio->wf and sh_video->bih changed to dynamic (thanx to Jens Hoffmann)
arpi_esp
parents:
401
diff
changeset
|
364 sh_audio->samplerate=sh_audio->wf->nSamplesPerSec; |
5251b0c57e39
sh_audio->wf and sh_video->bih changed to dynamic (thanx to Jens Hoffmann)
arpi_esp
parents:
401
diff
changeset
|
365 sh_audio->audio_in_minsize=2*sh_audio->wf->nBlockAlign; |
296 | 366 if(sh_audio->audio_in_minsize<8192) sh_audio->audio_in_minsize=8192; |
367 sh_audio->a_in_buffer_size=sh_audio->audio_in_minsize; | |
368 sh_audio->a_in_buffer=malloc(sh_audio->a_in_buffer_size); | |
369 sh_audio->a_in_buffer_len=0; | |
758 | 370 sh_audio->audio_out_minsize=16384; |
296 | 371 } |
372 #endif | |
758 | 373 break; |
1828 | 374 case AFM_VORBIS: |
375 #ifndef HAVE_OGGVORBIS | |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1927
diff
changeset
|
376 mp_msg(MSGT_DECAUDIO,MSGL_ERR,MSGTR_NoOggVorbis); |
1828 | 377 driver=0; |
378 #else | |
379 /* OggVorbis audio via libvorbis, compatible with files created by nandub and zorannt codec */ | |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
380 sh_audio->audio_out_minsize=1024*4; // 1024 samples/frame |
1828 | 381 #endif |
382 break; | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
383 case AFM_PCM: |
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
384 case AFM_DVDPCM: |
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
385 case AFM_ALAW: |
758 | 386 // PCM, aLaw |
387 sh_audio->audio_out_minsize=2048; | |
388 break; | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
389 case AFM_AC3: |
3413 | 390 case AFM_A52: |
758 | 391 // Dolby AC3 audio: |
3181
c8edb0691f09
Extended oss output driver and libac3 to support 4 and 6 channel output mixes. added -channels command line option
steve
parents:
3145
diff
changeset
|
392 // however many channels, 2 bytes in a word, 256 samples in a block, 6 blocks in a frame |
c8edb0691f09
Extended oss output driver and libac3 to support 4 and 6 channel output mixes. added -channels command line option
steve
parents:
3145
diff
changeset
|
393 sh_audio->audio_out_minsize=audio_output_channels*2*256*6; |
758 | 394 break; |
1528
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
395 case AFM_HWAC3: |
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
396 // Dolby AC3 audio: |
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
397 sh_audio->audio_out_minsize=4*256*6; |
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
398 sh_audio->sample_format = AFMT_AC3; |
3829 | 399 sh_audio->channels=1; |
1528
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
400 break; |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
401 case AFM_GSM: |
758 | 402 // MS-GSM audio codec: |
403 sh_audio->audio_out_minsize=4*320; | |
404 break; | |
3787 | 405 case AFM_IMAADPCM: |
3756 | 406 sh_audio->audio_out_minsize=4096; |
407 sh_audio->ds->ss_div=IMA_ADPCM_SAMPLES_PER_BLOCK; | |
408 sh_audio->ds->ss_mul=IMA_ADPCM_BLOCK_SIZE; | |
2420 | 409 break; |
3787 | 410 case AFM_MSADPCM: |
3875
e3caff2daa98
fixed stereo MS ADPCM decoder and reinstated opensource decoder as the
melanson
parents:
3874
diff
changeset
|
411 sh_audio->audio_out_minsize=sh_audio->wf->nBlockAlign * 8; |
e3caff2daa98
fixed stereo MS ADPCM decoder and reinstated opensource decoder as the
melanson
parents:
3874
diff
changeset
|
412 sh_audio->ds->ss_div = MS_ADPCM_SAMPLES_PER_BLOCK; |
e3caff2daa98
fixed stereo MS ADPCM decoder and reinstated opensource decoder as the
melanson
parents:
3874
diff
changeset
|
413 sh_audio->ds->ss_mul = sh_audio->wf->nBlockAlign; |
3787 | 414 break; |
3826
8a88ed2473aa
added initial, not-yet-functional, support for fox62 audio
melanson
parents:
3787
diff
changeset
|
415 case AFM_FOX62ADPCM: |
8a88ed2473aa
added initial, not-yet-functional, support for fox62 audio
melanson
parents:
3787
diff
changeset
|
416 sh_audio->audio_out_minsize=FOX62_ADPCM_SAMPLES_PER_BLOCK * 4; |
8a88ed2473aa
added initial, not-yet-functional, support for fox62 audio
melanson
parents:
3787
diff
changeset
|
417 sh_audio->ds->ss_div=FOX62_ADPCM_SAMPLES_PER_BLOCK; |
8a88ed2473aa
added initial, not-yet-functional, support for fox62 audio
melanson
parents:
3787
diff
changeset
|
418 sh_audio->ds->ss_mul=FOX62_ADPCM_BLOCK_SIZE; |
8a88ed2473aa
added initial, not-yet-functional, support for fox62 audio
melanson
parents:
3787
diff
changeset
|
419 break; |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
420 case AFM_MPEG: |
758 | 421 // MPEG Audio: |
422 sh_audio->audio_out_minsize=4608; | |
423 break; | |
3866 | 424 #ifdef USE_G72X |
3426 | 425 case AFM_G72X: |
426 // g72x_reader_init(&g72x_data,G723_16_BITS_PER_SAMPLE); | |
427 g72x_reader_init(&g72x_data,G723_24_BITS_PER_SAMPLE); | |
428 // g72x_reader_init(&g72x_data,G721_32_BITS_PER_SAMPLE); | |
429 // g72x_reader_init(&g72x_data,G721_40_BITS_PER_SAMPLE); | |
430 sh_audio->audio_out_minsize=g72x_data.samplesperblock*4; | |
431 break; | |
3866 | 432 #endif |
1927 | 433 case AFM_FFMPEG: |
434 #ifndef USE_LIBAVCODEC | |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1927
diff
changeset
|
435 mp_msg(MSGT_DECAUDIO,MSGL_ERR,MSGTR_NoLAVCsupport); |
1927 | 436 return 0; |
437 #else | |
438 // FFmpeg Audio: | |
439 sh_audio->audio_out_minsize=AVCODEC_MAX_AUDIO_FRAME_SIZE; | |
440 break; | |
441 #endif | |
2415 | 442 |
443 #ifdef USE_LIBMAD | |
444 case AFM_MAD: | |
445 printf(__FILE__ ":%d:mad: setting minimum outputsize\n", __LINE__); | |
446 sh_audio->audio_out_minsize=4608; | |
447 if(sh_audio->audio_in_minsize<8192) sh_audio->audio_in_minsize=8192; | |
448 sh_audio->a_in_buffer_size=sh_audio->audio_in_minsize; | |
449 sh_audio->a_in_buffer=malloc(sh_audio->a_in_buffer_size); | |
450 sh_audio->a_in_buffer_len=0; | |
451 break; | |
452 #endif | |
296 | 453 } |
454 | |
303 | 455 if(!driver) return 0; |
296 | 456 |
457 // allocate audio out buffer: | |
758 | 458 sh_audio->a_buffer_size=sh_audio->audio_out_minsize+MAX_OUTBURST; // worst case calc. |
459 | |
1567 | 460 mp_msg(MSGT_DECAUDIO,MSGL_V,"dec_audio: Allocating %d + %d = %d bytes for output buffer\n", |
758 | 461 sh_audio->audio_out_minsize,MAX_OUTBURST,sh_audio->a_buffer_size); |
462 | |
296 | 463 sh_audio->a_buffer=malloc(sh_audio->a_buffer_size); |
758 | 464 if(!sh_audio->a_buffer){ |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1927
diff
changeset
|
465 mp_msg(MSGT_DECAUDIO,MSGL_ERR,MSGTR_CantAllocAudioBuf); |
758 | 466 return 0; |
467 } | |
296 | 468 memset(sh_audio->a_buffer,0,sh_audio->a_buffer_size); |
469 sh_audio->a_buffer_len=0; | |
470 | |
303 | 471 switch(driver){ |
1517
0e9c29538a86
Use USE_WIN32DLL define instead of ARCH_X86 to decide whether or not to compile
jkeil
parents:
1485
diff
changeset
|
472 #ifdef USE_WIN32DLL |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
473 case AFM_ACM: { |
758 | 474 int ret=acm_decode_audio(sh_audio,sh_audio->a_buffer,4096,sh_audio->a_buffer_size); |
296 | 475 if(ret<0){ |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1927
diff
changeset
|
476 mp_msg(MSGT_DECAUDIO,MSGL_INFO,"ACM decoding error: %d\n",ret); |
303 | 477 driver=0; |
296 | 478 } |
640 | 479 sh_audio->a_buffer_len=ret; |
303 | 480 break; |
296 | 481 } |
1309
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1291
diff
changeset
|
482 #endif |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
483 case AFM_PCM: { |
296 | 484 // AVI PCM Audio: |
432
5251b0c57e39
sh_audio->wf and sh_video->bih changed to dynamic (thanx to Jens Hoffmann)
arpi_esp
parents:
401
diff
changeset
|
485 WAVEFORMATEX *h=sh_audio->wf; |
746 | 486 sh_audio->i_bps=h->nAvgBytesPerSec; |
296 | 487 sh_audio->channels=h->nChannels; |
488 sh_audio->samplerate=h->nSamplesPerSec; | |
489 sh_audio->samplesize=(h->wBitsPerSample+7)/8; | |
758 | 490 switch(sh_audio->format){ // hardware formats: |
491 case 0x6: sh_audio->sample_format=AFMT_A_LAW;break; | |
492 case 0x7: sh_audio->sample_format=AFMT_MU_LAW;break; | |
493 case 0x11: sh_audio->sample_format=AFMT_IMA_ADPCM;break; | |
494 case 0x50: sh_audio->sample_format=AFMT_MPEG;break; | |
2547 | 495 case 0x736F7774: sh_audio->sample_format=AFMT_S16_LE;sh_audio->codec->driver=AFM_DVDPCM;break; |
758 | 496 // case 0x2000: sh_audio->sample_format=AFMT_AC3; |
497 default: sh_audio->sample_format=(sh_audio->samplesize==2)?AFMT_S16_LE:AFMT_U8; | |
498 } | |
401 | 499 break; |
500 } | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
501 case AFM_DVDPCM: { |
401 | 502 // DVD PCM Audio: |
503 sh_audio->channels=2; | |
504 sh_audio->samplerate=48000; | |
746 | 505 sh_audio->i_bps=2*2*48000; |
296 | 506 // sh_audio->pcm_bswap=1; |
303 | 507 break; |
508 } | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
509 case AFM_AC3: { |
3886 | 510 #ifndef USE_LIBAC3 |
511 mp_msg(MSGT_DECAUDIO,MSGL_WARN,"WARNING: libac3 support is disabled. (hint: upgrade codecs.conf)\n"); | |
512 driver=0; | |
513 #else | |
296 | 514 // Dolby AC3 audio: |
1289 | 515 dec_audio_sh=sh_audio; // save sh_audio for the callback: |
296 | 516 ac3_config.fill_buffer_callback = ac3_fill_buffer; |
3181
c8edb0691f09
Extended oss output driver and libac3 to support 4 and 6 channel output mixes. added -channels command line option
steve
parents:
3145
diff
changeset
|
517 ac3_config.num_output_ch = audio_output_channels; |
296 | 518 ac3_config.flags = 0; |
3145 | 519 if(gCpuCaps.hasMMX){ |
296 | 520 ac3_config.flags |= AC3_MMX_ENABLE; |
3145 | 521 } |
522 if(gCpuCaps.has3DNow){ | |
296 | 523 ac3_config.flags |= AC3_3DNOW_ENABLE; |
3145 | 524 } |
296 | 525 ac3_init(); |
526 sh_audio->ac3_frame = ac3_decode_frame(); | |
527 if(sh_audio->ac3_frame){ | |
746 | 528 ac3_frame_t* fr=(ac3_frame_t*)sh_audio->ac3_frame; |
529 sh_audio->samplerate=fr->sampling_rate; | |
3181
c8edb0691f09
Extended oss output driver and libac3 to support 4 and 6 channel output mixes. added -channels command line option
steve
parents:
3145
diff
changeset
|
530 sh_audio->channels=ac3_config.num_output_ch; |
746 | 531 // 1 frame: 6*256 samples 1 sec: sh_audio->samplerate samples |
532 //sh_audio->i_bps=fr->frame_size*fr->sampling_rate/(6*256); | |
533 sh_audio->i_bps=fr->bit_rate*(1000/8); | |
303 | 534 } else { |
535 driver=0; // bad frame -> disable audio | |
536 } | |
3886 | 537 #endif |
303 | 538 break; |
539 } | |
3413 | 540 case AFM_A52: { |
3911 | 541 sample_t level=1, bias=384; |
542 int flags=0; | |
3413 | 543 // Dolby AC3 audio: |
3907 | 544 if(gCpuCaps.hasSSE) a52_accel|=MM_ACCEL_X86_SSE; |
545 if(gCpuCaps.hasMMX) a52_accel|=MM_ACCEL_X86_MMX; | |
546 if(gCpuCaps.hasMMX2) a52_accel|=MM_ACCEL_X86_MMXEXT; | |
547 if(gCpuCaps.has3DNow) a52_accel|=MM_ACCEL_X86_3DNOW; | |
548 a52_samples=a52_init (a52_accel); | |
3413 | 549 if (a52_samples == NULL) { |
550 mp_msg(MSGT_DECAUDIO,MSGL_ERR,"A52 init failed\n"); | |
551 driver=0;break; | |
552 } | |
553 sh_audio->a_in_buffer_size=3840; | |
554 sh_audio->a_in_buffer=malloc(sh_audio->a_in_buffer_size); | |
555 sh_audio->a_in_buffer_len=0; | |
556 if(a52_fillbuff(sh_audio)<0){ | |
557 mp_msg(MSGT_DECAUDIO,MSGL_ERR,"A52 sync failed\n"); | |
558 driver=0;break; | |
559 } | |
3887 | 560 // 'a52 cannot upmix' hotfix: |
561 sh_audio->channels=a52_printinfo(sh_audio); | |
562 if(audio_output_channels<sh_audio->channels) | |
563 sh_audio->channels=audio_output_channels; | |
3911 | 564 // channels setup: |
565 switch(sh_audio->channels){ | |
566 case 1: a52_flags=A52_MONO; break; | |
567 // case 2: a52_flags=A52_STEREO; break; | |
568 case 2: a52_flags=A52_DOLBY; break; | |
569 // case 3: a52_flags=A52_3F; break; | |
570 case 3: a52_flags=A52_2F1R; break; | |
571 case 4: a52_flags=A52_2F2R; break; // 2+2 | |
572 case 5: a52_flags=A52_3F2R; break; | |
573 case 6: a52_flags=A52_3F2R|A52_LFE; break; // 5.1 | |
574 } | |
575 // test: | |
576 flags=a52_flags|A52_ADJUST_LEVEL; | |
577 mp_msg(MSGT_DECAUDIO,MSGL_V,"A52 flags before a52_frame: 0x%X\n",flags); | |
578 if (a52_frame (&a52_state, sh_audio->a_in_buffer, &flags, &level, bias)){ | |
579 mp_msg(MSGT_DECAUDIO,MSGL_ERR,"a52: error decoding frame -> nosound\n"); | |
580 driver=0;break; | |
581 } | |
582 mp_msg(MSGT_DECAUDIO,MSGL_V,"A52 flags after a52_frame: 0x%X\n",flags); | |
583 // frame decoded, let's init resampler: | |
584 if(!a52_resample_init(a52_accel,flags,sh_audio->channels)){ | |
585 mp_msg(MSGT_DECAUDIO,MSGL_ERR,"a52: no resampler. try different channel setup!\n"); | |
586 driver=0;break; | |
587 } | |
3413 | 588 break; |
589 } | |
1528
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
590 case AFM_HWAC3: { |
3829 | 591 // Dolby AC3 passthrough: |
3907 | 592 a52_samples=a52_init (a52_accel); |
3829 | 593 if (a52_samples == NULL) { |
594 mp_msg(MSGT_DECAUDIO,MSGL_ERR,"A52 init failed\n"); | |
595 driver=0;break; | |
1528
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
596 } |
3829 | 597 sh_audio->a_in_buffer_size=3840; |
598 sh_audio->a_in_buffer=malloc(sh_audio->a_in_buffer_size); | |
599 sh_audio->a_in_buffer_len=0; | |
600 if(a52_fillbuff(sh_audio)<0) { | |
601 mp_msg(MSGT_DECAUDIO,MSGL_ERR,"A52 sync failed\n"); | |
602 driver=0;break; | |
1528
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
603 } |
3829 | 604 |
605 //sh_audio->samplerate=ai.samplerate; // SET by a52_fillbuff() | |
606 //sh_audio->samplesize=ai.framesize; | |
607 //sh_audio->i_bps=ai.bitrate*(1000/8); // SET by a52_fillbuff() | |
608 //sh_audio->ac3_frame=malloc(6144); | |
609 //sh_audio->o_bps=sh_audio->i_bps; // XXX FIXME!!! XXX | |
610 | |
611 // o_bps is calculated from samplesize*channels*samplerate | |
612 // a single ac3 frame is always translated to 6144 byte packet. (zero padding) | |
1528
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
613 sh_audio->channels=1; |
3829 | 614 sh_audio->samplesize=4; // 1*4*(6*256) = 6144 (very TRICKY!) |
615 | |
1528
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
616 break; |
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
617 } |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
618 case AFM_ALAW: { |
296 | 619 // aLaw audio codec: |
432
5251b0c57e39
sh_audio->wf and sh_video->bih changed to dynamic (thanx to Jens Hoffmann)
arpi_esp
parents:
401
diff
changeset
|
620 sh_audio->channels=sh_audio->wf->nChannels; |
5251b0c57e39
sh_audio->wf and sh_video->bih changed to dynamic (thanx to Jens Hoffmann)
arpi_esp
parents:
401
diff
changeset
|
621 sh_audio->samplerate=sh_audio->wf->nSamplesPerSec; |
746 | 622 sh_audio->i_bps=sh_audio->channels*sh_audio->samplerate; |
303 | 623 break; |
624 } | |
3866 | 625 #ifdef USE_G72X |
3426 | 626 case AFM_G72X: { |
627 // GSM 723 audio codec: | |
628 sh_audio->channels=sh_audio->wf->nChannels; | |
629 sh_audio->samplerate=sh_audio->wf->nSamplesPerSec; | |
630 sh_audio->i_bps=(sh_audio->samplerate/g72x_data.samplesperblock)*g72x_data.blocksize; | |
631 break; | |
632 } | |
3866 | 633 #endif |
1927 | 634 #ifdef USE_LIBAVCODEC |
635 case AFM_FFMPEG: { | |
636 int x; | |
637 mp_msg(MSGT_DECAUDIO,MSGL_V,"FFmpeg's libavcodec audio codec\n"); | |
638 if(!avcodec_inited){ | |
639 avcodec_init(); | |
640 avcodec_register_all(); | |
641 avcodec_inited=1; | |
642 } | |
643 lavc_codec = (AVCodec *)avcodec_find_decoder_by_name(sh_audio->codec->dll); | |
644 if(!lavc_codec){ | |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1927
diff
changeset
|
645 mp_msg(MSGT_DECAUDIO,MSGL_ERR,MSGTR_MissingLAVCcodec,sh_audio->codec->dll); |
1927 | 646 return 0; |
647 } | |
648 memset(&lavc_context, 0, sizeof(lavc_context)); | |
649 /* open it */ | |
650 if (avcodec_open(&lavc_context, lavc_codec) < 0) { | |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1927
diff
changeset
|
651 mp_msg(MSGT_DECAUDIO,MSGL_ERR, MSGTR_CantOpenCodec); |
1927 | 652 return 0; |
653 } | |
654 mp_msg(MSGT_DECAUDIO,MSGL_V,"INFO: libavcodec init OK!\n"); | |
655 | |
656 // Decode at least 1 byte: (to get header filled) | |
657 x=decode_audio(sh_audio,sh_audio->a_buffer,1,sh_audio->a_buffer_size); | |
658 if(x>0) sh_audio->a_buffer_len=x; | |
659 | |
660 #if 1 | |
661 sh_audio->channels=lavc_context.channels; | |
662 sh_audio->samplerate=lavc_context.sample_rate; | |
663 sh_audio->i_bps=lavc_context.bit_rate/8; | |
664 #else | |
665 sh_audio->channels=sh_audio->wf->nChannels; | |
666 sh_audio->samplerate=sh_audio->wf->nSamplesPerSec; | |
667 sh_audio->i_bps=sh_audio->wf->nAvgBytesPerSec; | |
668 #endif | |
669 break; | |
670 } | |
671 #endif | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
672 case AFM_GSM: { |
296 | 673 // MS-GSM audio codec: |
674 GSM_Init(); | |
432
5251b0c57e39
sh_audio->wf and sh_video->bih changed to dynamic (thanx to Jens Hoffmann)
arpi_esp
parents:
401
diff
changeset
|
675 sh_audio->channels=sh_audio->wf->nChannels; |
5251b0c57e39
sh_audio->wf and sh_video->bih changed to dynamic (thanx to Jens Hoffmann)
arpi_esp
parents:
401
diff
changeset
|
676 sh_audio->samplerate=sh_audio->wf->nSamplesPerSec; |
746 | 677 // decodes 65 byte -> 320 short |
678 // 1 sec: sh_audio->channels*sh_audio->samplerate samples | |
679 // 1 frame: 320 samples | |
680 sh_audio->i_bps=65*(sh_audio->channels*sh_audio->samplerate)/320; // 1:10 | |
303 | 681 break; |
296 | 682 } |
3787 | 683 case AFM_IMAADPCM: |
2420 | 684 // IMA-ADPCM 4:1 audio codec: |
685 sh_audio->channels=sh_audio->wf->nChannels; | |
686 sh_audio->samplerate=sh_audio->wf->nSamplesPerSec; | |
687 // decodes 34 byte -> 64 short | |
3756 | 688 sh_audio->i_bps=IMA_ADPCM_BLOCK_SIZE*(sh_audio->channels*sh_audio->samplerate)/IMA_ADPCM_SAMPLES_PER_BLOCK; // 1:4 |
2420 | 689 break; |
3787 | 690 case AFM_MSADPCM: |
691 sh_audio->channels=sh_audio->wf->nChannels; | |
692 sh_audio->samplerate=sh_audio->wf->nSamplesPerSec; | |
3875
e3caff2daa98
fixed stereo MS ADPCM decoder and reinstated opensource decoder as the
melanson
parents:
3874
diff
changeset
|
693 sh_audio->i_bps = sh_audio->wf->nBlockAlign * |
3826
8a88ed2473aa
added initial, not-yet-functional, support for fox62 audio
melanson
parents:
3787
diff
changeset
|
694 (sh_audio->channels*sh_audio->samplerate) / MS_ADPCM_SAMPLES_PER_BLOCK; |
8a88ed2473aa
added initial, not-yet-functional, support for fox62 audio
melanson
parents:
3787
diff
changeset
|
695 break; |
8a88ed2473aa
added initial, not-yet-functional, support for fox62 audio
melanson
parents:
3787
diff
changeset
|
696 case AFM_FOX62ADPCM: |
8a88ed2473aa
added initial, not-yet-functional, support for fox62 audio
melanson
parents:
3787
diff
changeset
|
697 sh_audio->channels=sh_audio->wf->nChannels; |
8a88ed2473aa
added initial, not-yet-functional, support for fox62 audio
melanson
parents:
3787
diff
changeset
|
698 sh_audio->samplerate=sh_audio->wf->nSamplesPerSec; |
8a88ed2473aa
added initial, not-yet-functional, support for fox62 audio
melanson
parents:
3787
diff
changeset
|
699 sh_audio->i_bps=FOX62_ADPCM_BLOCK_SIZE* |
8a88ed2473aa
added initial, not-yet-functional, support for fox62 audio
melanson
parents:
3787
diff
changeset
|
700 (sh_audio->channels*sh_audio->samplerate) / FOX62_ADPCM_SAMPLES_PER_BLOCK; |
3787 | 701 break; |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
702 case AFM_MPEG: { |
296 | 703 // MPEG Audio: |
1289 | 704 dec_audio_sh=sh_audio; // save sh_audio for the callback: |
732
e14114170e01
applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents:
640
diff
changeset
|
705 #ifdef USE_FAKE_MONO |
e14114170e01
applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents:
640
diff
changeset
|
706 MP3_Init(fakemono); |
e14114170e01
applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents:
640
diff
changeset
|
707 #else |
296 | 708 MP3_Init(); |
732
e14114170e01
applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents:
640
diff
changeset
|
709 #endif |
296 | 710 MP3_samplerate=MP3_channels=0; |
711 // printf("[\n"); | |
712 sh_audio->a_buffer_len=MP3_DecodeFrame(sh_audio->a_buffer,-1); | |
713 // printf("]\n"); | |
714 sh_audio->channels=2; // hack | |
715 sh_audio->samplerate=MP3_samplerate; | |
746 | 716 sh_audio->i_bps=MP3_bitrate*(1000/8); |
303 | 717 break; |
718 } | |
1828 | 719 #ifdef HAVE_OGGVORBIS |
720 case AFM_VORBIS: { | |
721 // OggVorbis Audio: | |
722 #if 0 /* just here for reference - atmos */ | |
723 ogg_sync_state oy; /* sync and verify incoming physical bitstream */ | |
724 ogg_stream_state os; /* take physical pages, weld into a logical | |
725 stream of packets */ | |
726 ogg_page og; /* one Ogg bitstream page. Vorbis packets are inside */ | |
727 ogg_packet op; /* one raw packet of data for decode */ | |
728 | |
729 vorbis_info vi; /* struct that stores all the static vorbis bitstream | |
730 settings */ | |
731 vorbis_comment vc; /* struct that stores all the bitstream user comments */ | |
732 vorbis_dsp_state vd; /* central working state for the packet->PCM decoder */ | |
733 vorbis_block vb; /* local working space for packet->PCM decode */ | |
734 #else | |
735 /* nix, nada, rien, nothing, nem, nüx */ | |
736 #endif | |
737 | |
738 uint32_t hdrsizes[3];/* stores vorbis header sizes from AVI audio header, | |
739 maybe use ogg_uint32_t */ | |
740 //int i; | |
741 int ret; | |
742 char *buffer; | |
743 ogg_packet hdr; | |
744 //ov_struct_t *s=&sh_audio->ov; | |
745 sh_audio->ov=malloc(sizeof(ov_struct_t)); | |
746 //s=&sh_audio->ov; | |
747 | |
748 vorbis_info_init(&sh_audio->ov->vi); | |
749 vorbis_comment_init(&sh_audio->ov->vc); | |
750 | |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
751 mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"OggVorbis: cbsize: %i\n", sh_audio->wf->cbSize); |
1828 | 752 memcpy(hdrsizes, ((unsigned char*)sh_audio->wf)+2*sizeof(WAVEFORMATEX), 3*sizeof(uint32_t)); |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
753 mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"OggVorbis: Read header sizes: initial: %i comment: %i codebook: %i\n", hdrsizes[0], hdrsizes[1], hdrsizes[2]); |
1828 | 754 /*for(i=12; i <= 40; i+=2) { // header bruteforce :) |
755 memcpy(hdrsizes, ((unsigned char*)sh_audio->wf)+i, 3*sizeof(uint32_t)); | |
756 printf("OggVorbis: Read header sizes (%i): %ld %ld %ld\n", i, hdrsizes[0], hdrsizes[1], hdrsizes[2]); | |
757 }*/ | |
758 | |
759 /* read headers */ // FIXME disable sound on errors here, we absolutely need this headers! - atmos | |
760 hdr.packet=NULL; | |
761 hdr.b_o_s = 1; /* beginning of stream for first packet */ | |
762 hdr.bytes = hdrsizes[0]; | |
763 hdr.packet = realloc(hdr.packet,hdr.bytes); | |
764 memcpy(hdr.packet,((unsigned char*)sh_audio->wf)+2*sizeof(WAVEFORMATEX)+3*sizeof(uint32_t),hdr.bytes); | |
765 if(vorbis_synthesis_headerin(&sh_audio->ov->vi,&sh_audio->ov->vc,&hdr)<0) | |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
766 mp_msg(MSGT_DECAUDIO,MSGL_WARN,"OggVorbis: initial (identification) header broken!\n"); |
1828 | 767 hdr.b_o_s = 0; |
768 hdr.bytes = hdrsizes[1]; | |
769 hdr.packet = realloc(hdr.packet,hdr.bytes); | |
770 memcpy(hdr.packet,((unsigned char*)sh_audio->wf)+2*sizeof(WAVEFORMATEX)+3*sizeof(uint32_t)+hdrsizes[0],hdr.bytes); | |
771 if(vorbis_synthesis_headerin(&sh_audio->ov->vi,&sh_audio->ov->vc,&hdr)<0) | |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
772 mp_msg(MSGT_DECAUDIO,MSGL_WARN,"OggVorbis: comment header broken!\n"); |
1828 | 773 hdr.bytes = hdrsizes[2]; |
774 hdr.packet = realloc(hdr.packet,hdr.bytes); | |
775 memcpy(hdr.packet,((unsigned char*)sh_audio->wf)+2*sizeof(WAVEFORMATEX)+3*sizeof(uint32_t)+hdrsizes[0]+hdrsizes[1],hdr.bytes); | |
776 if(vorbis_synthesis_headerin(&sh_audio->ov->vi,&sh_audio->ov->vc,&hdr)<0) | |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
777 mp_msg(MSGT_DECAUDIO,MSGL_WARN,"OggVorbis: codebook header broken!\n"); |
1828 | 778 hdr.bytes=0; |
779 hdr.packet = realloc(hdr.packet,hdr.bytes); /* free */ | |
780 /* done with the headers */ | |
781 | |
782 | |
783 /* Throw the comments plus a few lines about the bitstream we're | |
784 decoding */ | |
785 { | |
786 char **ptr=sh_audio->ov->vc.user_comments; | |
787 while(*ptr){ | |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
788 mp_msg(MSGT_DECAUDIO,MSGL_V,"OggVorbisComment: %s\n",*ptr); |
1828 | 789 ++ptr; |
790 } | |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
791 mp_msg(MSGT_DECAUDIO,MSGL_V,"OggVorbis: Bitstream is %d channel, %ldHz, %ldkbit/s %cBR\n",sh_audio->ov->vi.channels,sh_audio->ov->vi.rate,sh_audio->ov->vi.bitrate_nominal/1000, (sh_audio->ov->vi.bitrate_lower!=sh_audio->ov->vi.bitrate_nominal)||(sh_audio->ov->vi.bitrate_upper!=sh_audio->ov->vi.bitrate_nominal)?'V':'C'); |
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
792 mp_msg(MSGT_DECAUDIO,MSGL_V,"OggVorbis: Encoded by: %s\n",sh_audio->ov->vc.vendor); |
1828 | 793 } |
794 sh_audio->channels=sh_audio->ov->vi.channels; | |
795 sh_audio->samplerate=sh_audio->ov->vi.rate; | |
796 sh_audio->i_bps=sh_audio->ov->vi.bitrate_nominal/8; | |
797 | |
798 // printf("[\n"); | |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
799 // sh_audio->a_buffer_len=sh_audio->audio_out_minsize;///ov->vi.channels; |
1828 | 800 // printf("]\n"); |
801 | |
802 /* OK, got and parsed all three headers. Initialize the Vorbis | |
803 packet->PCM decoder. */ | |
804 vorbis_synthesis_init(&sh_audio->ov->vd,&sh_audio->ov->vi); /* central decode state */ | |
805 vorbis_block_init(&sh_audio->ov->vd,&sh_audio->ov->vb); /* local state for most of the decode | |
806 so multiple block decodes can | |
807 proceed in parallel. We could init | |
808 multiple vorbis_block structures | |
809 for vd here */ | |
810 //printf("OggVorbis: synthesis and block init done.\n"); | |
811 ogg_sync_init(&sh_audio->ov->oy); /* Now we can read pages */ | |
812 | |
813 while((ret = ogg_sync_pageout(&sh_audio->ov->oy,&sh_audio->ov->og))!=1) { | |
814 if(ret == -1) | |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
815 mp_msg(MSGT_DECAUDIO,MSGL_WARN,"OggVorbis: Pageout: not properly synced, had to skip some bytes.\n"); |
1828 | 816 else |
817 if(ret == 0) { | |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
818 mp_msg(MSGT_DECAUDIO,MSGL_V,"OggVorbis: Pageout: need more data to verify page, reading more data.\n"); |
1828 | 819 /* submit a a_buffer_len block to libvorbis' Ogg layer */ |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
820 buffer=ogg_sync_buffer(&sh_audio->ov->oy,256); |
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
821 ogg_sync_wrote(&sh_audio->ov->oy,demux_read_data(sh_audio->ds,buffer,256)); |
1828 | 822 } |
823 } | |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
824 mp_msg(MSGT_DECAUDIO,MSGL_V,"OggVorbis: Pageout: successfull.\n"); |
1834
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
825 ogg_stream_pagein(&sh_audio->ov->os,&sh_audio->ov->og); /* we can ignore any errors here |
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
826 as they'll also become apparent |
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
827 at packetout */ |
1828 | 828 |
829 /* Get the serial number and set up the rest of decode. */ | |
830 /* serialno first; use it to set up a logical stream */ | |
831 ogg_stream_init(&sh_audio->ov->os,ogg_page_serialno(&sh_audio->ov->og)); | |
832 | |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
833 mp_msg(MSGT_DECAUDIO,MSGL_V,"OggVorbis: Init OK!\n"); |
1828 | 834 |
835 break; | |
836 } | |
837 #endif | |
2415 | 838 |
839 #ifdef USE_LIBMAD | |
840 case AFM_MAD: | |
841 { | |
3871 | 842 printf("%s %s %s (%s)\n", mad_version, mad_copyright, mad_author, mad_build); |
843 | |
2415 | 844 printf(__FILE__ ":%d:mad: initialising\n", __LINE__); |
845 mad_frame_init(&mad_frame); | |
846 mad_stream_init(&mad_stream); | |
847 | |
848 printf(__FILE__ ":%d:mad: preparing buffer\n", __LINE__); | |
849 mad_prepare_buffer(sh_audio, &mad_stream, sh_audio->a_in_buffer_size); | |
850 mad_stream_buffer(&mad_stream, (unsigned char*)(sh_audio->a_in_buffer), sh_audio->a_in_buffer_len); | |
3871 | 851 // mad_stream_sync(&mad_stream); |
852 mad_sync(sh_audio, &mad_stream); | |
2415 | 853 mad_synth_init(&mad_synth); |
854 | |
855 if(mad_frame_decode(&mad_frame, &mad_stream) == 0) | |
856 { | |
857 printf(__FILE__ ":%d:mad: post processing buffer\n", __LINE__); | |
858 mad_postprocess_buffer(sh_audio, &mad_stream); | |
859 } | |
860 else | |
861 { | |
862 printf(__FILE__ ":%d:mad: frame decoding failed\n", __LINE__); | |
3874 | 863 mad_print_error(&mad_stream); |
2415 | 864 } |
865 | |
2434
571538d73e08
audio channels nr is identified from libmad's channel mode
alex
parents:
2432
diff
changeset
|
866 switch (mad_frame.header.mode) |
571538d73e08
audio channels nr is identified from libmad's channel mode
alex
parents:
2432
diff
changeset
|
867 { |
571538d73e08
audio channels nr is identified from libmad's channel mode
alex
parents:
2432
diff
changeset
|
868 case MAD_MODE_SINGLE_CHANNEL: |
571538d73e08
audio channels nr is identified from libmad's channel mode
alex
parents:
2432
diff
changeset
|
869 sh_audio->channels=1; |
571538d73e08
audio channels nr is identified from libmad's channel mode
alex
parents:
2432
diff
changeset
|
870 break; |
571538d73e08
audio channels nr is identified from libmad's channel mode
alex
parents:
2432
diff
changeset
|
871 case MAD_MODE_DUAL_CHANNEL: |
571538d73e08
audio channels nr is identified from libmad's channel mode
alex
parents:
2432
diff
changeset
|
872 case MAD_MODE_JOINT_STEREO: |
571538d73e08
audio channels nr is identified from libmad's channel mode
alex
parents:
2432
diff
changeset
|
873 case MAD_MODE_STEREO: |
571538d73e08
audio channels nr is identified from libmad's channel mode
alex
parents:
2432
diff
changeset
|
874 sh_audio->channels=2; |
571538d73e08
audio channels nr is identified from libmad's channel mode
alex
parents:
2432
diff
changeset
|
875 break; |
571538d73e08
audio channels nr is identified from libmad's channel mode
alex
parents:
2432
diff
changeset
|
876 default: |
571538d73e08
audio channels nr is identified from libmad's channel mode
alex
parents:
2432
diff
changeset
|
877 mp_msg(MSGT_DECAUDIO, MSGL_FATAL, "mad: unknown number of channels\n"); |
571538d73e08
audio channels nr is identified from libmad's channel mode
alex
parents:
2432
diff
changeset
|
878 } |
571538d73e08
audio channels nr is identified from libmad's channel mode
alex
parents:
2432
diff
changeset
|
879 mp_msg(MSGT_DECAUDIO, MSGL_HINT, "mad: channels: %d (mad channel mode: %d)\n", |
571538d73e08
audio channels nr is identified from libmad's channel mode
alex
parents:
2432
diff
changeset
|
880 sh_audio->channels, mad_frame.header.mode); |
2432 | 881 /* var. name changed in 0.13.0 (beta) (libmad/CHANGES) -- alex */ |
882 #if (MAD_VERSION_MAJOR >= 0) && (MAD_VERSION_MINOR >= 13) | |
883 sh_audio->samplerate=mad_frame.header.samplerate; | |
884 #else | |
2415 | 885 sh_audio->samplerate=mad_frame.header.sfreq; |
2432 | 886 #endif |
2415 | 887 sh_audio->i_bps=mad_frame.header.bitrate; |
888 printf(__FILE__ ":%d:mad: continuing\n", __LINE__); | |
889 break; | |
890 } | |
891 #endif | |
296 | 892 } |
893 | |
894 if(!sh_audio->channels || !sh_audio->samplerate){ | |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1927
diff
changeset
|
895 mp_msg(MSGT_DECAUDIO,MSGL_WARN,MSGTR_UnknownAudio); |
303 | 896 driver=0; |
296 | 897 } |
898 | |
303 | 899 if(!driver){ |
900 if(sh_audio->a_buffer) free(sh_audio->a_buffer); | |
1313
d797ecb9778f
sh_audio->a_buffer is freed twice (here and in mplayer.c), can result to
jkeil
parents:
1309
diff
changeset
|
901 sh_audio->a_buffer=NULL; |
303 | 902 return 0; |
903 } | |
296 | 904 |
1529 | 905 if(!sh_audio->o_bps) |
303 | 906 sh_audio->o_bps=sh_audio->channels*sh_audio->samplerate*sh_audio->samplesize; |
907 return driver; | |
296 | 908 } |
291 | 909 |
746 | 910 // Audio decoding: |
291 | 911 |
746 | 912 // Decode a single frame (mp3,acm etc) or 'minlen' bytes (pcm/alaw etc) |
913 // buffer length is 'maxlen' bytes, it shouldn't be exceeded... | |
914 | |
915 int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen){ | |
291 | 916 int len=-1; |
303 | 917 switch(sh_audio->codec->driver){ |
1927 | 918 #ifdef USE_LIBAVCODEC |
919 case AFM_FFMPEG: { | |
920 unsigned char *start=NULL; | |
921 int y; | |
922 while(len<minlen){ | |
923 int len2=0; | |
924 int x=ds_get_packet(sh_audio->ds,&start); | |
925 if(x<=0) break; // error | |
2049
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
1973
diff
changeset
|
926 y=avcodec_decode_audio(&lavc_context,(INT16*)buf,&len2,start,x); |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1927
diff
changeset
|
927 if(y<0){ mp_msg(MSGT_DECAUDIO,MSGL_V,"lavc_audio: error\n");break; } |
1927 | 928 if(y<x) sh_audio->ds->buffer_pos+=y-x; // put back data (HACK!) |
929 if(len2>0){ | |
930 //len=len2;break; | |
931 if(len<0) len=len2; else len+=len2; | |
932 buf+=len2; | |
933 } | |
934 mp_dbg(MSGT_DECAUDIO,MSGL_DBG2,"Decoded %d -> %d \n",y,len2); | |
935 } | |
936 } | |
937 break; | |
938 #endif | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
939 case AFM_MPEG: // MPEG layer 2 or 3 |
291 | 940 len=MP3_DecodeFrame(buf,-1); |
1485
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
941 // len=MP3_DecodeFrame(buf,3); |
291 | 942 break; |
1830 | 943 #ifdef HAVE_OGGVORBIS |
1828 | 944 case AFM_VORBIS: { // OggVorbis |
945 /* note: good minlen would be 4k or 8k IMHO - atmos */ | |
946 int ret; | |
947 char *buffer; | |
948 int bytes; | |
949 int samples; | |
950 float **pcm; | |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
951 //ogg_int16_t convbuffer[4096]; |
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
952 // int convsize; |
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
953 int readlen=1024; |
1834
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
954 len=0; |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
955 // convsize=minlen/sh_audio->ov->vi.channels; |
1834
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
956 |
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
957 while(len < minlen) { /* double loop allows for break in inner loop */ |
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
958 while(len < minlen) { /* without aborting the outer loop - atmos */ |
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
959 ret=ogg_stream_packetout(&sh_audio->ov->os,&sh_audio->ov->op); |
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
960 if(ret==0) { |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
961 int xxx=0; |
1834
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
962 //printf("OggVorbis: Packetout: need more data, paging!\n"); |
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
963 while((ret = ogg_sync_pageout(&sh_audio->ov->oy,&sh_audio->ov->og))!=1) { |
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
964 if(ret == -1) |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
965 mp_msg(MSGT_DECAUDIO,MSGL_V,"OggVorbis: Pageout: not properly synced, had to skip some bytes.\n"); |
1834
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
966 else |
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
967 if(ret == 0) { |
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
968 //printf("OggVorbis: Pageout: need more data to verify page, reading more data.\n"); |
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
969 /* submit a readlen k block to libvorbis' Ogg layer */ |
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
970 buffer=ogg_sync_buffer(&sh_audio->ov->oy,readlen); |
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
971 bytes=demux_read_data(sh_audio->ds,buffer,readlen); |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
972 xxx+=bytes; |
1834
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
973 ogg_sync_wrote(&sh_audio->ov->oy,bytes); |
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
974 if(bytes==0) |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
975 mp_msg(MSGT_DECAUDIO,MSGL_V,"OggVorbis: 0Bytes written, possible End of Stream\n"); |
1834
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
976 } |
1828 | 977 } |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
978 mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"\n[sync: %d ]\n",xxx); |
1834
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
979 //printf("OggVorbis: Pageout: successfull, pagin in.\n"); |
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
980 if(ogg_stream_pagein(&sh_audio->ov->os,&sh_audio->ov->og)<0) |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
981 mp_msg(MSGT_DECAUDIO,MSGL_V,"OggVorbis: Pagein failed!\n"); |
1834
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
982 break; |
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
983 } else if(ret<0) { |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
984 mp_msg(MSGT_DECAUDIO,MSGL_V,"OggVorbis: Packetout: missing or corrupt data, skipping packet!\n"); |
1834
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
985 break; |
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
986 } else { |
1828 | 987 |
988 /* we have a packet. Decode it */ | |
989 | |
990 if(vorbis_synthesis(&sh_audio->ov->vb,&sh_audio->ov->op)==0) /* test for success! */ | |
991 vorbis_synthesis_blockin(&sh_audio->ov->vd,&sh_audio->ov->vb); | |
992 | |
993 /* **pcm is a multichannel float vector. In stereo, for | |
994 example, pcm[0] is left, and pcm[1] is right. samples is | |
995 the size of each channel. Convert the float values | |
996 (-1.<=range<=1.) to whatever PCM format and write it out */ | |
997 | |
998 while((samples=vorbis_synthesis_pcmout(&sh_audio->ov->vd,&pcm))>0){ | |
999 int i,j; | |
1000 int clipflag=0; | |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
1001 int convsize=(maxlen-len)/(2*sh_audio->ov->vi.channels); // max size! |
1828 | 1002 int bout=(samples<convsize?samples:convsize); |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
1003 |
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
1004 if(bout<=0) break; |
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
1005 |
1828 | 1006 /* convert floats to 16 bit signed ints (host order) and |
1007 interleave */ | |
1008 for(i=0;i<sh_audio->ov->vi.channels;i++){ | |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
1009 ogg_int16_t *convbuffer=(ogg_int16_t *)(&buf[len]); |
1828 | 1010 ogg_int16_t *ptr=convbuffer+i; |
1011 float *mono=pcm[i]; | |
1012 for(j=0;j<bout;j++){ | |
1013 #if 1 | |
1014 int val=mono[j]*32767.f; | |
1015 #else /* optional dither */ | |
1016 int val=mono[j]*32767.f+drand48()-0.5f; | |
1017 #endif | |
1018 /* might as well guard against clipping */ | |
1019 if(val>32767){ | |
1020 val=32767; | |
1021 clipflag=1; | |
1022 } | |
1023 if(val<-32768){ | |
1024 val=-32768; | |
1025 clipflag=1; | |
1026 } | |
1027 *ptr=val; | |
1028 ptr+=sh_audio->ov->vi.channels; | |
1029 } | |
1030 } | |
1031 | |
1032 if(clipflag) | |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
1033 mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"Clipping in frame %ld\n",(long)(sh_audio->ov->vd.sequence)); |
1828 | 1034 |
1035 //fwrite(convbuffer,2*sh_audio->ov->vi.channels,bout,stderr); //dump pcm to file for debugging | |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
1036 //memcpy(buf+len,convbuffer,2*sh_audio->ov->vi.channels*bout); |
1834
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
1037 len+=2*sh_audio->ov->vi.channels*bout; |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
1038 |
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
1039 mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"\n[decoded: %d / %d ]\n",bout,samples); |
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
1040 |
1828 | 1041 vorbis_synthesis_read(&sh_audio->ov->vd,bout); /* tell libvorbis how |
1042 many samples we | |
1043 actually consumed */ | |
1044 } | |
1834
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
1045 } // from else, packetout ok |
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
1046 } // while len |
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
1047 } // outer while len |
1828 | 1048 if(ogg_page_eos(&sh_audio->ov->og)) |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
1049 mp_msg(MSGT_DECAUDIO,MSGL_V,"OggVorbis: End of Stream reached!\n"); // FIXME clearup decoder, notify mplayer - atmos |
1828 | 1050 |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
1051 mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"\n[len: %d ]\n",len); |
1828 | 1052 |
1053 break; | |
1831 | 1054 } |
1830 | 1055 #endif |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
1056 case AFM_PCM: // AVI PCM |
1058 | 1057 len=demux_read_data(sh_audio->ds,buf,minlen); |
401 | 1058 break; |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
1059 case AFM_DVDPCM: // DVD PCM |
401 | 1060 { int j; |
746 | 1061 len=demux_read_data(sh_audio->ds,buf,minlen); |
291 | 1062 //if(i&1){ printf("Warning! pcm_audio_size&1 !=0 (%d)\n",i);i&=~1; } |
746 | 1063 // swap endian: |
291 | 1064 for(j=0;j<len;j+=2){ |
1065 char x=buf[j]; | |
1066 buf[j]=buf[j+1]; | |
1067 buf[j+1]=x; | |
1068 } | |
1069 break; | |
1070 } | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
1071 case AFM_ALAW: // aLaw decoder |
746 | 1072 { int l=demux_read_data(sh_audio->ds,buf,minlen/2); |
291 | 1073 unsigned short *d=(unsigned short *) buf; |
1074 unsigned char *s=buf; | |
1075 len=2*l; | |
758 | 1076 if(sh_audio->format==6){ |
1077 // aLaw | |
883 | 1078 while(l>0){ --l; d[l]=alaw2short[s[l]]; } |
758 | 1079 } else { |
1080 // uLaw | |
883 | 1081 while(l>0){ --l; d[l]=ulaw2short[s[l]]; } |
291 | 1082 } |
1083 break; | |
1084 } | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
1085 case AFM_GSM: // MS-GSM decoder |
2420 | 1086 { unsigned char ibuf[65]; // 65 bytes / frame |
1087 if(demux_read_data(sh_audio->ds,ibuf,65)!=65) break; // EOF | |
1088 XA_MSGSM_Decoder(ibuf,(unsigned short *) buf); // decodes 65 byte -> 320 short | |
746 | 1089 // XA_GSM_Decoder(buf,(unsigned short *) &sh_audio->a_buffer[sh_audio->a_buffer_len]); // decodes 33 byte -> 160 short |
1090 len=2*320; | |
291 | 1091 break; |
1092 } | |
3866 | 1093 #ifdef USE_G72X |
3426 | 1094 case AFM_G72X: // GSM 723 decoder |
1095 { if(demux_read_data(sh_audio->ds,g72x_data.block, g72x_data.blocksize)!=g72x_data.blocksize) break; // EOF | |
1096 g72x_decode_block(&g72x_data); | |
1097 len=2*g72x_data.samplesperblock; | |
1098 memcpy(buf,g72x_data.samples,len); | |
1099 break; | |
1100 } | |
3866 | 1101 #endif |
3787 | 1102 case AFM_IMAADPCM: |
3756 | 1103 { unsigned char ibuf[IMA_ADPCM_BLOCK_SIZE * 2]; // bytes / stereo frame |
1104 if (demux_read_data(sh_audio->ds, ibuf, | |
3787 | 1105 IMA_ADPCM_BLOCK_SIZE * sh_audio->wf->nChannels) != |
3756 | 1106 IMA_ADPCM_BLOCK_SIZE * sh_audio->wf->nChannels) |
1107 break; // EOF | |
1108 len=2*ima_adpcm_decode_block((unsigned short*)buf,ibuf, sh_audio->wf->nChannels); | |
3787 | 1109 break; |
1110 } | |
1111 case AFM_MSADPCM: | |
3875
e3caff2daa98
fixed stereo MS ADPCM decoder and reinstated opensource decoder as the
melanson
parents:
3874
diff
changeset
|
1112 { static unsigned char *ibuf = NULL; |
e3caff2daa98
fixed stereo MS ADPCM decoder and reinstated opensource decoder as the
melanson
parents:
3874
diff
changeset
|
1113 if (!ibuf) |
e3caff2daa98
fixed stereo MS ADPCM decoder and reinstated opensource decoder as the
melanson
parents:
3874
diff
changeset
|
1114 ibuf = (unsigned char *)malloc |
e3caff2daa98
fixed stereo MS ADPCM decoder and reinstated opensource decoder as the
melanson
parents:
3874
diff
changeset
|
1115 (sh_audio->wf->nBlockAlign * sh_audio->wf->nChannels); |
3787 | 1116 if (demux_read_data(sh_audio->ds, ibuf, |
3875
e3caff2daa98
fixed stereo MS ADPCM decoder and reinstated opensource decoder as the
melanson
parents:
3874
diff
changeset
|
1117 sh_audio->wf->nBlockAlign) != |
e3caff2daa98
fixed stereo MS ADPCM decoder and reinstated opensource decoder as the
melanson
parents:
3874
diff
changeset
|
1118 sh_audio->wf->nBlockAlign) |
3787 | 1119 break; // EOF |
3875
e3caff2daa98
fixed stereo MS ADPCM decoder and reinstated opensource decoder as the
melanson
parents:
3874
diff
changeset
|
1120 len= 2 * ms_adpcm_decode_block( |
e3caff2daa98
fixed stereo MS ADPCM decoder and reinstated opensource decoder as the
melanson
parents:
3874
diff
changeset
|
1121 (unsigned short*)buf,ibuf, sh_audio->wf->nChannels, |
e3caff2daa98
fixed stereo MS ADPCM decoder and reinstated opensource decoder as the
melanson
parents:
3874
diff
changeset
|
1122 sh_audio->wf->nBlockAlign); |
2420 | 1123 break; |
1124 } | |
3826
8a88ed2473aa
added initial, not-yet-functional, support for fox62 audio
melanson
parents:
3787
diff
changeset
|
1125 case AFM_FOX62ADPCM: |
8a88ed2473aa
added initial, not-yet-functional, support for fox62 audio
melanson
parents:
3787
diff
changeset
|
1126 { unsigned char ibuf[FOX62_ADPCM_BLOCK_SIZE * 2]; // bytes / stereo frame |
8a88ed2473aa
added initial, not-yet-functional, support for fox62 audio
melanson
parents:
3787
diff
changeset
|
1127 if (demux_read_data(sh_audio->ds, ibuf, |
8a88ed2473aa
added initial, not-yet-functional, support for fox62 audio
melanson
parents:
3787
diff
changeset
|
1128 FOX62_ADPCM_BLOCK_SIZE * sh_audio->wf->nChannels) != |
8a88ed2473aa
added initial, not-yet-functional, support for fox62 audio
melanson
parents:
3787
diff
changeset
|
1129 FOX62_ADPCM_BLOCK_SIZE * sh_audio->wf->nChannels) |
8a88ed2473aa
added initial, not-yet-functional, support for fox62 audio
melanson
parents:
3787
diff
changeset
|
1130 break; // EOF |
8a88ed2473aa
added initial, not-yet-functional, support for fox62 audio
melanson
parents:
3787
diff
changeset
|
1131 len=2*fox62_adpcm_decode_block((unsigned short*)buf,ibuf, sh_audio->wf->nChannels); |
8a88ed2473aa
added initial, not-yet-functional, support for fox62 audio
melanson
parents:
3787
diff
changeset
|
1132 break; |
8a88ed2473aa
added initial, not-yet-functional, support for fox62 audio
melanson
parents:
3787
diff
changeset
|
1133 } |
3886 | 1134 #ifdef USE_LIBAC3 |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
1135 case AFM_AC3: // AC3 decoder |
291 | 1136 //printf("{1:%d}",avi_header.idx_pos);fflush(stdout); |
1137 if(!sh_audio->ac3_frame) sh_audio->ac3_frame=ac3_decode_frame(); | |
1138 //printf("{2:%d}",avi_header.idx_pos);fflush(stdout); | |
1139 if(sh_audio->ac3_frame){ | |
296 | 1140 len = 256 * 6 *sh_audio->channels*sh_audio->samplesize; |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
1141 memcpy(buf,((ac3_frame_t*)sh_audio->ac3_frame)->audio_data,len); |
291 | 1142 sh_audio->ac3_frame=NULL; |
1143 } | |
1144 //printf("{3:%d}",avi_header.idx_pos);fflush(stdout); | |
1145 break; | |
3886 | 1146 #endif |
3413 | 1147 case AFM_A52: { // AC3 decoder |
3911 | 1148 sample_t level=1, bias=384; |
1149 int flags=a52_flags|A52_ADJUST_LEVEL; | |
3413 | 1150 int i; |
1151 if(!sh_audio->a_in_buffer_len) | |
1152 if(a52_fillbuff(sh_audio)<0) break; // EOF | |
1153 sh_audio->a_in_buffer_len=0; | |
1154 if (a52_frame (&a52_state, sh_audio->a_in_buffer, &flags, &level, bias)){ | |
1155 mp_msg(MSGT_DECAUDIO,MSGL_WARN,"a52: error decoding frame\n"); | |
1156 break; | |
1157 } | |
1158 // a52_dynrng (&state, NULL, NULL); // disable dynamic range compensation | |
1159 | |
1160 // frame decoded, let's resample: | |
3911 | 1161 //a52_resample_init(a52_accel,flags,sh_audio->channels); |
3413 | 1162 len=0; |
1163 for (i = 0; i < 6; i++) { | |
1164 if (a52_block (&a52_state, a52_samples)){ | |
1165 mp_msg(MSGT_DECAUDIO,MSGL_WARN,"a52: error at resampling\n"); | |
1166 break; | |
1167 } | |
1168 len+=2*a52_resample(a52_samples,&buf[len]); | |
1169 } | |
3417 | 1170 // printf("len = %d \n",len); // 6144 on all vobs I tried so far... (5.1 and 2.0) ::atmos |
3413 | 1171 break; |
1172 } | |
1528
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
1173 case AFM_HWAC3: // AC3 through SPDIF |
3829 | 1174 if(!sh_audio->a_in_buffer_len) |
1175 if((len=a52_fillbuff(sh_audio))<0) break; //EOF | |
1176 sh_audio->a_in_buffer_len=0; | |
1177 len = ac3_iec958_build_burst(len, 0x01, 1, sh_audio->a_in_buffer, buf); | |
1178 // len = 6144 = 4*(6*256) | |
1528
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
1179 break; |
1517
0e9c29538a86
Use USE_WIN32DLL define instead of ARCH_X86 to decide whether or not to compile
jkeil
parents:
1485
diff
changeset
|
1180 #ifdef USE_WIN32DLL |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
1181 case AFM_ACM: |
758 | 1182 // len=sh_audio->audio_out_minsize; // optimal decoded fragment size |
1183 // if(len<minlen) len=minlen; else | |
1184 // if(len>maxlen) len=maxlen; | |
1185 // len=acm_decode_audio(sh_audio,buf,len); | |
1186 len=acm_decode_audio(sh_audio,buf,minlen,maxlen); | |
291 | 1187 break; |
1309
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1291
diff
changeset
|
1188 #endif |
746 | 1189 |
291 | 1190 #ifdef USE_DIRECTSHOW |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
1191 case AFM_DSHOW: // DirectShow |
1327
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
1192 { int size_in=0; |
291 | 1193 int size_out=0; |
3442 | 1194 int srcsize=DS_AudioDecoder_GetSrcSize(ds_adec, maxlen); |
1567 | 1195 mp_msg(MSGT_DECAUDIO,MSGL_DBG3,"DShow says: srcsize=%d (buffsize=%d) out_size=%d\n",srcsize,sh_audio->a_in_buffer_size,maxlen); |
291 | 1196 if(srcsize>sh_audio->a_in_buffer_size) srcsize=sh_audio->a_in_buffer_size; // !!!!!! |
1197 if(sh_audio->a_in_buffer_len<srcsize){ | |
1198 sh_audio->a_in_buffer_len+= | |
1199 demux_read_data(sh_audio->ds,&sh_audio->a_in_buffer[sh_audio->a_in_buffer_len], | |
1200 srcsize-sh_audio->a_in_buffer_len); | |
1201 } | |
3442 | 1202 DS_AudioDecoder_Convert(ds_adec, sh_audio->a_in_buffer,sh_audio->a_in_buffer_len, |
291 | 1203 buf,maxlen, &size_in,&size_out); |
1567 | 1204 mp_dbg(MSGT_DECAUDIO,MSGL_DBG2,"DShow: audio %d -> %d converted (in_buf_len=%d of %d) %d\n",size_in,size_out,sh_audio->a_in_buffer_len,sh_audio->a_in_buffer_size,ds_tell_pts(sh_audio->ds)); |
291 | 1205 if(size_in>=sh_audio->a_in_buffer_len){ |
1206 sh_audio->a_in_buffer_len=0; | |
1207 } else { | |
1208 sh_audio->a_in_buffer_len-=size_in; | |
1209 memcpy(sh_audio->a_in_buffer,&sh_audio->a_in_buffer[size_in],sh_audio->a_in_buffer_len); | |
1210 } | |
1211 len=size_out; | |
1212 break; | |
1213 } | |
1214 #endif | |
2415 | 1215 |
1216 #ifdef USE_LIBMAD | |
1217 case AFM_MAD: | |
1218 { | |
1219 mad_prepare_buffer(sh_audio, &mad_stream, sh_audio->a_in_buffer_size); | |
1220 mad_stream_buffer(&mad_stream, sh_audio->a_in_buffer, sh_audio->a_in_buffer_len); | |
3871 | 1221 // mad_stream_sync(&mad_stream); |
1222 mad_sync(sh_audio, &mad_stream); | |
2415 | 1223 if(mad_frame_decode(&mad_frame, &mad_stream) == 0) |
1224 { | |
1225 mad_synth_frame(&mad_synth, &mad_frame); | |
1226 mad_postprocess_buffer(sh_audio, &mad_stream); | |
1227 | |
1228 /* and fill buffer */ | |
1229 | |
1230 { | |
1231 int i; | |
1232 int end_size = mad_synth.pcm.length; | |
1233 signed short* samples = (signed short*)buf; | |
1234 if(end_size > maxlen/4) | |
1235 end_size=maxlen/4; | |
1236 | |
1237 for(i=0; i<mad_synth.pcm.length; ++i) { | |
1238 *samples++ = mad_scale(mad_synth.pcm.samples[0][i]); | |
1239 *samples++ = mad_scale(mad_synth.pcm.samples[0][i]); | |
1240 // *buf++ = mad_scale(mad_synth.pcm.sampAles[1][i]); | |
1241 } | |
1242 len = end_size*4; | |
1243 } | |
1244 } | |
1245 else | |
1246 { | |
3871 | 1247 printf(__FILE__ ":%d:mad: frame decoding failed (error: %d)\n", __LINE__, |
1248 mad_stream.error); | |
3874 | 1249 mad_print_error(&mad_stream); |
2415 | 1250 } |
1251 | |
1252 break; | |
1253 } | |
1254 #endif | |
291 | 1255 } |
1256 return len; | |
1257 } | |
1258 | |
1327
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
1259 void resync_audio_stream(sh_audio_t *sh_audio){ |
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
1260 switch(sh_audio->codec->driver){ |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
1261 case AFM_MPEG: |
1327
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
1262 MP3_DecodeFrame(NULL,-2); // resync |
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
1263 MP3_DecodeFrame(NULL,-2); // resync |
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
1264 MP3_DecodeFrame(NULL,-2); // resync |
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
1265 break; |
1849
5f246fcc2971
Resetting stream and sync for seek, no correct test files yet for proper testing but should be ok.
atmos4
parents:
1837
diff
changeset
|
1266 #ifdef HAVE_OGGVORBIS |
5f246fcc2971
Resetting stream and sync for seek, no correct test files yet for proper testing but should be ok.
atmos4
parents:
1837
diff
changeset
|
1267 case AFM_VORBIS: |
5f246fcc2971
Resetting stream and sync for seek, no correct test files yet for proper testing but should be ok.
atmos4
parents:
1837
diff
changeset
|
1268 //printf("OggVorbis: resetting stream.\n"); |
5f246fcc2971
Resetting stream and sync for seek, no correct test files yet for proper testing but should be ok.
atmos4
parents:
1837
diff
changeset
|
1269 ogg_sync_reset(&sh_audio->ov->oy); |
5f246fcc2971
Resetting stream and sync for seek, no correct test files yet for proper testing but should be ok.
atmos4
parents:
1837
diff
changeset
|
1270 ogg_stream_reset(&sh_audio->ov->os); |
5f246fcc2971
Resetting stream and sync for seek, no correct test files yet for proper testing but should be ok.
atmos4
parents:
1837
diff
changeset
|
1271 break; |
5f246fcc2971
Resetting stream and sync for seek, no correct test files yet for proper testing but should be ok.
atmos4
parents:
1837
diff
changeset
|
1272 #endif |
3886 | 1273 #ifdef USE_LIBAC3 |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
1274 case AFM_AC3: |
1327
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
1275 ac3_bitstream_reset(); // reset AC3 bitstream buffer |
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
1276 // if(verbose){ printf("Resyncing AC3 audio...");fflush(stdout);} |
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
1277 sh_audio->ac3_frame=ac3_decode_frame(); // resync |
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
1278 // if(verbose) printf(" OK!\n"); |
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
1279 break; |
3886 | 1280 #endif |
3413 | 1281 case AFM_A52: |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
1282 case AFM_ACM: |
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
1283 case AFM_DSHOW: |
1528
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
1284 case AFM_HWAC3: |
1327
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
1285 sh_audio->a_in_buffer_len=0; // reset ACM/DShow audio buffer |
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
1286 break; |
2415 | 1287 |
1288 #ifdef USE_LIBMAD | |
1289 case AFM_MAD: | |
1290 mad_prepare_buffer(sh_audio, &mad_stream, sh_audio->a_in_buffer_size); | |
1291 mad_stream_buffer(&mad_stream, sh_audio->a_in_buffer, sh_audio->a_in_buffer_len); | |
3871 | 1292 // mad_stream_sync(&mad_stream); |
1293 mad_sync(sh_audio, &mad_stream); | |
2415 | 1294 mad_postprocess_buffer(sh_audio, &mad_stream); |
1295 break; | |
2418 | 1296 #endif |
1327
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
1297 } |
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
1298 } |
291 | 1299 |
1327
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
1300 void skip_audio_frame(sh_audio_t *sh_audio){ |
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
1301 switch(sh_audio->codec->driver){ |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
1302 case AFM_MPEG: MP3_DecodeFrame(NULL,-2);break; // skip MPEG frame |
3886 | 1303 #ifdef USE_LIBAC3 |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
1304 case AFM_AC3: sh_audio->ac3_frame=ac3_decode_frame();break; // skip AC3 frame |
3886 | 1305 #endif |
3829 | 1306 case AFM_HWAC3: |
3413 | 1307 case AFM_A52: a52_fillbuff(sh_audio);break; // skip AC3 frame |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
1308 case AFM_ACM: |
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
1309 case AFM_DSHOW: { |
1408 | 1310 int skip=sh_audio->wf->nBlockAlign; |
1311 if(skip<16){ | |
1312 skip=(sh_audio->wf->nAvgBytesPerSec/16)&(~7); | |
1313 if(skip<16) skip=16; | |
1314 } | |
1315 demux_read_data(sh_audio->ds,NULL,skip); | |
1316 break; | |
1317 } | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
1318 case AFM_PCM: |
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
1319 case AFM_DVDPCM: |
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
1320 case AFM_ALAW: { |
1408 | 1321 int skip=sh_audio->i_bps/16; |
1322 skip=skip&(~3); | |
1323 demux_read_data(sh_audio->ds,NULL,skip); | |
1324 break; | |
1325 } | |
2415 | 1326 #ifdef USE_LIBMAD |
1327 case AFM_MAD: | |
1328 { | |
1329 mad_prepare_buffer(sh_audio, &mad_stream, sh_audio->a_in_buffer_size); | |
1330 mad_stream_buffer(&mad_stream, sh_audio->a_in_buffer, sh_audio->a_in_buffer_len); | |
1331 mad_stream_skip(&mad_stream, 2); | |
3871 | 1332 // mad_stream_sync(&mad_stream); |
1333 mad_sync(sh_audio, &mad_stream); | |
2415 | 1334 mad_postprocess_buffer(sh_audio, &mad_stream); |
1335 break; | |
1336 } | |
1337 #endif | |
1338 | |
1327
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
1339 default: ds_fill_buffer(sh_audio->ds); // skip PCM frame |
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
1340 } |
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
1341 } |