Mercurial > mplayer.hg
annotate dec_audio.c @ 3966:6185a66a63cf
*** empty log message ***
author | gabucino |
---|---|
date | Thu, 03 Jan 2002 21:12:35 +0000 |
parents | 2eb8c8aacca7 |
children | 3bbaeba57939 |
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 |
3947
2eb8c8aacca7
using dshow headers from dshow/ instead of c++ version
arpi
parents:
3933
diff
changeset
|
65 #include "loader/dshow/DS_AudioDecoder.h" |
2eb8c8aacca7
using dshow headers from dshow/ instead of c++ version
arpi
parents:
3933
diff
changeset
|
66 static DS_AudioDecoder* 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; |
3933
60db4273246d
added initial support for format 0x61 ADPCM (sounds good, but still pops)
melanson
parents:
3911
diff
changeset
|
415 case AFM_FOX61ADPCM: |
60db4273246d
added initial support for format 0x61 ADPCM (sounds good, but still pops)
melanson
parents:
3911
diff
changeset
|
416 sh_audio->audio_out_minsize=FOX61_ADPCM_SAMPLES_PER_BLOCK * 4; |
60db4273246d
added initial support for format 0x61 ADPCM (sounds good, but still pops)
melanson
parents:
3911
diff
changeset
|
417 sh_audio->ds->ss_div=FOX61_ADPCM_SAMPLES_PER_BLOCK; |
60db4273246d
added initial support for format 0x61 ADPCM (sounds good, but still pops)
melanson
parents:
3911
diff
changeset
|
418 sh_audio->ds->ss_mul=FOX61_ADPCM_BLOCK_SIZE; |
60db4273246d
added initial support for format 0x61 ADPCM (sounds good, but still pops)
melanson
parents:
3911
diff
changeset
|
419 break; |
3826
8a88ed2473aa
added initial, not-yet-functional, support for fox62 audio
melanson
parents:
3787
diff
changeset
|
420 case AFM_FOX62ADPCM: |
8a88ed2473aa
added initial, not-yet-functional, support for fox62 audio
melanson
parents:
3787
diff
changeset
|
421 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
|
422 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
|
423 sh_audio->ds->ss_mul=FOX62_ADPCM_BLOCK_SIZE; |
8a88ed2473aa
added initial, not-yet-functional, support for fox62 audio
melanson
parents:
3787
diff
changeset
|
424 break; |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
425 case AFM_MPEG: |
758 | 426 // MPEG Audio: |
427 sh_audio->audio_out_minsize=4608; | |
428 break; | |
3866 | 429 #ifdef USE_G72X |
3426 | 430 case AFM_G72X: |
431 // g72x_reader_init(&g72x_data,G723_16_BITS_PER_SAMPLE); | |
432 g72x_reader_init(&g72x_data,G723_24_BITS_PER_SAMPLE); | |
433 // g72x_reader_init(&g72x_data,G721_32_BITS_PER_SAMPLE); | |
434 // g72x_reader_init(&g72x_data,G721_40_BITS_PER_SAMPLE); | |
435 sh_audio->audio_out_minsize=g72x_data.samplesperblock*4; | |
436 break; | |
3866 | 437 #endif |
1927 | 438 case AFM_FFMPEG: |
439 #ifndef USE_LIBAVCODEC | |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1927
diff
changeset
|
440 mp_msg(MSGT_DECAUDIO,MSGL_ERR,MSGTR_NoLAVCsupport); |
1927 | 441 return 0; |
442 #else | |
443 // FFmpeg Audio: | |
444 sh_audio->audio_out_minsize=AVCODEC_MAX_AUDIO_FRAME_SIZE; | |
445 break; | |
446 #endif | |
2415 | 447 |
448 #ifdef USE_LIBMAD | |
449 case AFM_MAD: | |
450 printf(__FILE__ ":%d:mad: setting minimum outputsize\n", __LINE__); | |
451 sh_audio->audio_out_minsize=4608; | |
452 if(sh_audio->audio_in_minsize<8192) sh_audio->audio_in_minsize=8192; | |
453 sh_audio->a_in_buffer_size=sh_audio->audio_in_minsize; | |
454 sh_audio->a_in_buffer=malloc(sh_audio->a_in_buffer_size); | |
455 sh_audio->a_in_buffer_len=0; | |
456 break; | |
457 #endif | |
296 | 458 } |
459 | |
303 | 460 if(!driver) return 0; |
296 | 461 |
462 // allocate audio out buffer: | |
758 | 463 sh_audio->a_buffer_size=sh_audio->audio_out_minsize+MAX_OUTBURST; // worst case calc. |
464 | |
1567 | 465 mp_msg(MSGT_DECAUDIO,MSGL_V,"dec_audio: Allocating %d + %d = %d bytes for output buffer\n", |
758 | 466 sh_audio->audio_out_minsize,MAX_OUTBURST,sh_audio->a_buffer_size); |
467 | |
296 | 468 sh_audio->a_buffer=malloc(sh_audio->a_buffer_size); |
758 | 469 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
|
470 mp_msg(MSGT_DECAUDIO,MSGL_ERR,MSGTR_CantAllocAudioBuf); |
758 | 471 return 0; |
472 } | |
296 | 473 memset(sh_audio->a_buffer,0,sh_audio->a_buffer_size); |
474 sh_audio->a_buffer_len=0; | |
475 | |
303 | 476 switch(driver){ |
1517
0e9c29538a86
Use USE_WIN32DLL define instead of ARCH_X86 to decide whether or not to compile
jkeil
parents:
1485
diff
changeset
|
477 #ifdef USE_WIN32DLL |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
478 case AFM_ACM: { |
758 | 479 int ret=acm_decode_audio(sh_audio,sh_audio->a_buffer,4096,sh_audio->a_buffer_size); |
296 | 480 if(ret<0){ |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1927
diff
changeset
|
481 mp_msg(MSGT_DECAUDIO,MSGL_INFO,"ACM decoding error: %d\n",ret); |
303 | 482 driver=0; |
296 | 483 } |
640 | 484 sh_audio->a_buffer_len=ret; |
303 | 485 break; |
296 | 486 } |
1309
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1291
diff
changeset
|
487 #endif |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
488 case AFM_PCM: { |
296 | 489 // 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
|
490 WAVEFORMATEX *h=sh_audio->wf; |
746 | 491 sh_audio->i_bps=h->nAvgBytesPerSec; |
296 | 492 sh_audio->channels=h->nChannels; |
493 sh_audio->samplerate=h->nSamplesPerSec; | |
494 sh_audio->samplesize=(h->wBitsPerSample+7)/8; | |
758 | 495 switch(sh_audio->format){ // hardware formats: |
496 case 0x6: sh_audio->sample_format=AFMT_A_LAW;break; | |
497 case 0x7: sh_audio->sample_format=AFMT_MU_LAW;break; | |
498 case 0x11: sh_audio->sample_format=AFMT_IMA_ADPCM;break; | |
499 case 0x50: sh_audio->sample_format=AFMT_MPEG;break; | |
2547 | 500 case 0x736F7774: sh_audio->sample_format=AFMT_S16_LE;sh_audio->codec->driver=AFM_DVDPCM;break; |
758 | 501 // case 0x2000: sh_audio->sample_format=AFMT_AC3; |
502 default: sh_audio->sample_format=(sh_audio->samplesize==2)?AFMT_S16_LE:AFMT_U8; | |
503 } | |
401 | 504 break; |
505 } | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
506 case AFM_DVDPCM: { |
401 | 507 // DVD PCM Audio: |
508 sh_audio->channels=2; | |
509 sh_audio->samplerate=48000; | |
746 | 510 sh_audio->i_bps=2*2*48000; |
296 | 511 // sh_audio->pcm_bswap=1; |
303 | 512 break; |
513 } | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
514 case AFM_AC3: { |
3886 | 515 #ifndef USE_LIBAC3 |
516 mp_msg(MSGT_DECAUDIO,MSGL_WARN,"WARNING: libac3 support is disabled. (hint: upgrade codecs.conf)\n"); | |
517 driver=0; | |
518 #else | |
296 | 519 // Dolby AC3 audio: |
1289 | 520 dec_audio_sh=sh_audio; // save sh_audio for the callback: |
296 | 521 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
|
522 ac3_config.num_output_ch = audio_output_channels; |
296 | 523 ac3_config.flags = 0; |
3145 | 524 if(gCpuCaps.hasMMX){ |
296 | 525 ac3_config.flags |= AC3_MMX_ENABLE; |
3145 | 526 } |
527 if(gCpuCaps.has3DNow){ | |
296 | 528 ac3_config.flags |= AC3_3DNOW_ENABLE; |
3145 | 529 } |
296 | 530 ac3_init(); |
531 sh_audio->ac3_frame = ac3_decode_frame(); | |
532 if(sh_audio->ac3_frame){ | |
746 | 533 ac3_frame_t* fr=(ac3_frame_t*)sh_audio->ac3_frame; |
534 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
|
535 sh_audio->channels=ac3_config.num_output_ch; |
746 | 536 // 1 frame: 6*256 samples 1 sec: sh_audio->samplerate samples |
537 //sh_audio->i_bps=fr->frame_size*fr->sampling_rate/(6*256); | |
538 sh_audio->i_bps=fr->bit_rate*(1000/8); | |
303 | 539 } else { |
540 driver=0; // bad frame -> disable audio | |
541 } | |
3886 | 542 #endif |
303 | 543 break; |
544 } | |
3413 | 545 case AFM_A52: { |
3911 | 546 sample_t level=1, bias=384; |
547 int flags=0; | |
3413 | 548 // Dolby AC3 audio: |
3907 | 549 if(gCpuCaps.hasSSE) a52_accel|=MM_ACCEL_X86_SSE; |
550 if(gCpuCaps.hasMMX) a52_accel|=MM_ACCEL_X86_MMX; | |
551 if(gCpuCaps.hasMMX2) a52_accel|=MM_ACCEL_X86_MMXEXT; | |
552 if(gCpuCaps.has3DNow) a52_accel|=MM_ACCEL_X86_3DNOW; | |
553 a52_samples=a52_init (a52_accel); | |
3413 | 554 if (a52_samples == NULL) { |
555 mp_msg(MSGT_DECAUDIO,MSGL_ERR,"A52 init failed\n"); | |
556 driver=0;break; | |
557 } | |
558 sh_audio->a_in_buffer_size=3840; | |
559 sh_audio->a_in_buffer=malloc(sh_audio->a_in_buffer_size); | |
560 sh_audio->a_in_buffer_len=0; | |
561 if(a52_fillbuff(sh_audio)<0){ | |
562 mp_msg(MSGT_DECAUDIO,MSGL_ERR,"A52 sync failed\n"); | |
563 driver=0;break; | |
564 } | |
3887 | 565 // 'a52 cannot upmix' hotfix: |
566 sh_audio->channels=a52_printinfo(sh_audio); | |
567 if(audio_output_channels<sh_audio->channels) | |
568 sh_audio->channels=audio_output_channels; | |
3911 | 569 // channels setup: |
570 switch(sh_audio->channels){ | |
571 case 1: a52_flags=A52_MONO; break; | |
572 // case 2: a52_flags=A52_STEREO; break; | |
573 case 2: a52_flags=A52_DOLBY; break; | |
574 // case 3: a52_flags=A52_3F; break; | |
575 case 3: a52_flags=A52_2F1R; break; | |
576 case 4: a52_flags=A52_2F2R; break; // 2+2 | |
577 case 5: a52_flags=A52_3F2R; break; | |
578 case 6: a52_flags=A52_3F2R|A52_LFE; break; // 5.1 | |
579 } | |
580 // test: | |
581 flags=a52_flags|A52_ADJUST_LEVEL; | |
582 mp_msg(MSGT_DECAUDIO,MSGL_V,"A52 flags before a52_frame: 0x%X\n",flags); | |
583 if (a52_frame (&a52_state, sh_audio->a_in_buffer, &flags, &level, bias)){ | |
584 mp_msg(MSGT_DECAUDIO,MSGL_ERR,"a52: error decoding frame -> nosound\n"); | |
585 driver=0;break; | |
586 } | |
587 mp_msg(MSGT_DECAUDIO,MSGL_V,"A52 flags after a52_frame: 0x%X\n",flags); | |
588 // frame decoded, let's init resampler: | |
589 if(!a52_resample_init(a52_accel,flags,sh_audio->channels)){ | |
590 mp_msg(MSGT_DECAUDIO,MSGL_ERR,"a52: no resampler. try different channel setup!\n"); | |
591 driver=0;break; | |
592 } | |
3413 | 593 break; |
594 } | |
1528
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
595 case AFM_HWAC3: { |
3829 | 596 // Dolby AC3 passthrough: |
3907 | 597 a52_samples=a52_init (a52_accel); |
3829 | 598 if (a52_samples == NULL) { |
599 mp_msg(MSGT_DECAUDIO,MSGL_ERR,"A52 init failed\n"); | |
600 driver=0;break; | |
1528
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
601 } |
3829 | 602 sh_audio->a_in_buffer_size=3840; |
603 sh_audio->a_in_buffer=malloc(sh_audio->a_in_buffer_size); | |
604 sh_audio->a_in_buffer_len=0; | |
605 if(a52_fillbuff(sh_audio)<0) { | |
606 mp_msg(MSGT_DECAUDIO,MSGL_ERR,"A52 sync failed\n"); | |
607 driver=0;break; | |
1528
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
608 } |
3829 | 609 |
610 //sh_audio->samplerate=ai.samplerate; // SET by a52_fillbuff() | |
611 //sh_audio->samplesize=ai.framesize; | |
612 //sh_audio->i_bps=ai.bitrate*(1000/8); // SET by a52_fillbuff() | |
613 //sh_audio->ac3_frame=malloc(6144); | |
614 //sh_audio->o_bps=sh_audio->i_bps; // XXX FIXME!!! XXX | |
615 | |
616 // o_bps is calculated from samplesize*channels*samplerate | |
617 // 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
|
618 sh_audio->channels=1; |
3829 | 619 sh_audio->samplesize=4; // 1*4*(6*256) = 6144 (very TRICKY!) |
620 | |
1528
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
621 break; |
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
622 } |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
623 case AFM_ALAW: { |
296 | 624 // 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
|
625 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
|
626 sh_audio->samplerate=sh_audio->wf->nSamplesPerSec; |
746 | 627 sh_audio->i_bps=sh_audio->channels*sh_audio->samplerate; |
303 | 628 break; |
629 } | |
3866 | 630 #ifdef USE_G72X |
3426 | 631 case AFM_G72X: { |
632 // GSM 723 audio codec: | |
633 sh_audio->channels=sh_audio->wf->nChannels; | |
634 sh_audio->samplerate=sh_audio->wf->nSamplesPerSec; | |
635 sh_audio->i_bps=(sh_audio->samplerate/g72x_data.samplesperblock)*g72x_data.blocksize; | |
636 break; | |
637 } | |
3866 | 638 #endif |
1927 | 639 #ifdef USE_LIBAVCODEC |
640 case AFM_FFMPEG: { | |
641 int x; | |
642 mp_msg(MSGT_DECAUDIO,MSGL_V,"FFmpeg's libavcodec audio codec\n"); | |
643 if(!avcodec_inited){ | |
644 avcodec_init(); | |
645 avcodec_register_all(); | |
646 avcodec_inited=1; | |
647 } | |
648 lavc_codec = (AVCodec *)avcodec_find_decoder_by_name(sh_audio->codec->dll); | |
649 if(!lavc_codec){ | |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1927
diff
changeset
|
650 mp_msg(MSGT_DECAUDIO,MSGL_ERR,MSGTR_MissingLAVCcodec,sh_audio->codec->dll); |
1927 | 651 return 0; |
652 } | |
653 memset(&lavc_context, 0, sizeof(lavc_context)); | |
654 /* open it */ | |
655 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
|
656 mp_msg(MSGT_DECAUDIO,MSGL_ERR, MSGTR_CantOpenCodec); |
1927 | 657 return 0; |
658 } | |
659 mp_msg(MSGT_DECAUDIO,MSGL_V,"INFO: libavcodec init OK!\n"); | |
660 | |
661 // Decode at least 1 byte: (to get header filled) | |
662 x=decode_audio(sh_audio,sh_audio->a_buffer,1,sh_audio->a_buffer_size); | |
663 if(x>0) sh_audio->a_buffer_len=x; | |
664 | |
665 #if 1 | |
666 sh_audio->channels=lavc_context.channels; | |
667 sh_audio->samplerate=lavc_context.sample_rate; | |
668 sh_audio->i_bps=lavc_context.bit_rate/8; | |
669 #else | |
670 sh_audio->channels=sh_audio->wf->nChannels; | |
671 sh_audio->samplerate=sh_audio->wf->nSamplesPerSec; | |
672 sh_audio->i_bps=sh_audio->wf->nAvgBytesPerSec; | |
673 #endif | |
674 break; | |
675 } | |
676 #endif | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
677 case AFM_GSM: { |
296 | 678 // MS-GSM audio codec: |
679 GSM_Init(); | |
432
5251b0c57e39
sh_audio->wf and sh_video->bih changed to dynamic (thanx to Jens Hoffmann)
arpi_esp
parents:
401
diff
changeset
|
680 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
|
681 sh_audio->samplerate=sh_audio->wf->nSamplesPerSec; |
746 | 682 // decodes 65 byte -> 320 short |
683 // 1 sec: sh_audio->channels*sh_audio->samplerate samples | |
684 // 1 frame: 320 samples | |
685 sh_audio->i_bps=65*(sh_audio->channels*sh_audio->samplerate)/320; // 1:10 | |
303 | 686 break; |
296 | 687 } |
3787 | 688 case AFM_IMAADPCM: |
2420 | 689 // IMA-ADPCM 4:1 audio codec: |
690 sh_audio->channels=sh_audio->wf->nChannels; | |
691 sh_audio->samplerate=sh_audio->wf->nSamplesPerSec; | |
692 // decodes 34 byte -> 64 short | |
3756 | 693 sh_audio->i_bps=IMA_ADPCM_BLOCK_SIZE*(sh_audio->channels*sh_audio->samplerate)/IMA_ADPCM_SAMPLES_PER_BLOCK; // 1:4 |
2420 | 694 break; |
3787 | 695 case AFM_MSADPCM: |
696 sh_audio->channels=sh_audio->wf->nChannels; | |
697 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
|
698 sh_audio->i_bps = sh_audio->wf->nBlockAlign * |
3826
8a88ed2473aa
added initial, not-yet-functional, support for fox62 audio
melanson
parents:
3787
diff
changeset
|
699 (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
|
700 break; |
3933
60db4273246d
added initial support for format 0x61 ADPCM (sounds good, but still pops)
melanson
parents:
3911
diff
changeset
|
701 case AFM_FOX61ADPCM: |
60db4273246d
added initial support for format 0x61 ADPCM (sounds good, but still pops)
melanson
parents:
3911
diff
changeset
|
702 sh_audio->channels=sh_audio->wf->nChannels; |
60db4273246d
added initial support for format 0x61 ADPCM (sounds good, but still pops)
melanson
parents:
3911
diff
changeset
|
703 sh_audio->samplerate=sh_audio->wf->nSamplesPerSec; |
60db4273246d
added initial support for format 0x61 ADPCM (sounds good, but still pops)
melanson
parents:
3911
diff
changeset
|
704 sh_audio->i_bps=FOX61_ADPCM_BLOCK_SIZE* |
60db4273246d
added initial support for format 0x61 ADPCM (sounds good, but still pops)
melanson
parents:
3911
diff
changeset
|
705 (sh_audio->channels*sh_audio->samplerate) / FOX61_ADPCM_SAMPLES_PER_BLOCK; |
60db4273246d
added initial support for format 0x61 ADPCM (sounds good, but still pops)
melanson
parents:
3911
diff
changeset
|
706 break; |
3826
8a88ed2473aa
added initial, not-yet-functional, support for fox62 audio
melanson
parents:
3787
diff
changeset
|
707 case AFM_FOX62ADPCM: |
8a88ed2473aa
added initial, not-yet-functional, support for fox62 audio
melanson
parents:
3787
diff
changeset
|
708 sh_audio->channels=sh_audio->wf->nChannels; |
8a88ed2473aa
added initial, not-yet-functional, support for fox62 audio
melanson
parents:
3787
diff
changeset
|
709 sh_audio->samplerate=sh_audio->wf->nSamplesPerSec; |
8a88ed2473aa
added initial, not-yet-functional, support for fox62 audio
melanson
parents:
3787
diff
changeset
|
710 sh_audio->i_bps=FOX62_ADPCM_BLOCK_SIZE* |
8a88ed2473aa
added initial, not-yet-functional, support for fox62 audio
melanson
parents:
3787
diff
changeset
|
711 (sh_audio->channels*sh_audio->samplerate) / FOX62_ADPCM_SAMPLES_PER_BLOCK; |
3787 | 712 break; |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
713 case AFM_MPEG: { |
296 | 714 // MPEG Audio: |
1289 | 715 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
|
716 #ifdef USE_FAKE_MONO |
e14114170e01
applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents:
640
diff
changeset
|
717 MP3_Init(fakemono); |
e14114170e01
applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents:
640
diff
changeset
|
718 #else |
296 | 719 MP3_Init(); |
732
e14114170e01
applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents:
640
diff
changeset
|
720 #endif |
296 | 721 MP3_samplerate=MP3_channels=0; |
722 // printf("[\n"); | |
723 sh_audio->a_buffer_len=MP3_DecodeFrame(sh_audio->a_buffer,-1); | |
724 // printf("]\n"); | |
725 sh_audio->channels=2; // hack | |
726 sh_audio->samplerate=MP3_samplerate; | |
746 | 727 sh_audio->i_bps=MP3_bitrate*(1000/8); |
303 | 728 break; |
729 } | |
1828 | 730 #ifdef HAVE_OGGVORBIS |
731 case AFM_VORBIS: { | |
732 // OggVorbis Audio: | |
733 #if 0 /* just here for reference - atmos */ | |
734 ogg_sync_state oy; /* sync and verify incoming physical bitstream */ | |
735 ogg_stream_state os; /* take physical pages, weld into a logical | |
736 stream of packets */ | |
737 ogg_page og; /* one Ogg bitstream page. Vorbis packets are inside */ | |
738 ogg_packet op; /* one raw packet of data for decode */ | |
739 | |
740 vorbis_info vi; /* struct that stores all the static vorbis bitstream | |
741 settings */ | |
742 vorbis_comment vc; /* struct that stores all the bitstream user comments */ | |
743 vorbis_dsp_state vd; /* central working state for the packet->PCM decoder */ | |
744 vorbis_block vb; /* local working space for packet->PCM decode */ | |
745 #else | |
746 /* nix, nada, rien, nothing, nem, nüx */ | |
747 #endif | |
748 | |
749 uint32_t hdrsizes[3];/* stores vorbis header sizes from AVI audio header, | |
750 maybe use ogg_uint32_t */ | |
751 //int i; | |
752 int ret; | |
753 char *buffer; | |
754 ogg_packet hdr; | |
755 //ov_struct_t *s=&sh_audio->ov; | |
756 sh_audio->ov=malloc(sizeof(ov_struct_t)); | |
757 //s=&sh_audio->ov; | |
758 | |
759 vorbis_info_init(&sh_audio->ov->vi); | |
760 vorbis_comment_init(&sh_audio->ov->vc); | |
761 | |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
762 mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"OggVorbis: cbsize: %i\n", sh_audio->wf->cbSize); |
1828 | 763 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
|
764 mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"OggVorbis: Read header sizes: initial: %i comment: %i codebook: %i\n", hdrsizes[0], hdrsizes[1], hdrsizes[2]); |
1828 | 765 /*for(i=12; i <= 40; i+=2) { // header bruteforce :) |
766 memcpy(hdrsizes, ((unsigned char*)sh_audio->wf)+i, 3*sizeof(uint32_t)); | |
767 printf("OggVorbis: Read header sizes (%i): %ld %ld %ld\n", i, hdrsizes[0], hdrsizes[1], hdrsizes[2]); | |
768 }*/ | |
769 | |
770 /* read headers */ // FIXME disable sound on errors here, we absolutely need this headers! - atmos | |
771 hdr.packet=NULL; | |
772 hdr.b_o_s = 1; /* beginning of stream for first packet */ | |
773 hdr.bytes = hdrsizes[0]; | |
774 hdr.packet = realloc(hdr.packet,hdr.bytes); | |
775 memcpy(hdr.packet,((unsigned char*)sh_audio->wf)+2*sizeof(WAVEFORMATEX)+3*sizeof(uint32_t),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: initial (identification) header broken!\n"); |
1828 | 778 hdr.b_o_s = 0; |
779 hdr.bytes = hdrsizes[1]; | |
780 hdr.packet = realloc(hdr.packet,hdr.bytes); | |
781 memcpy(hdr.packet,((unsigned char*)sh_audio->wf)+2*sizeof(WAVEFORMATEX)+3*sizeof(uint32_t)+hdrsizes[0],hdr.bytes); | |
782 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
|
783 mp_msg(MSGT_DECAUDIO,MSGL_WARN,"OggVorbis: comment header broken!\n"); |
1828 | 784 hdr.bytes = hdrsizes[2]; |
785 hdr.packet = realloc(hdr.packet,hdr.bytes); | |
786 memcpy(hdr.packet,((unsigned char*)sh_audio->wf)+2*sizeof(WAVEFORMATEX)+3*sizeof(uint32_t)+hdrsizes[0]+hdrsizes[1],hdr.bytes); | |
787 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
|
788 mp_msg(MSGT_DECAUDIO,MSGL_WARN,"OggVorbis: codebook header broken!\n"); |
1828 | 789 hdr.bytes=0; |
790 hdr.packet = realloc(hdr.packet,hdr.bytes); /* free */ | |
791 /* done with the headers */ | |
792 | |
793 | |
794 /* Throw the comments plus a few lines about the bitstream we're | |
795 decoding */ | |
796 { | |
797 char **ptr=sh_audio->ov->vc.user_comments; | |
798 while(*ptr){ | |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
799 mp_msg(MSGT_DECAUDIO,MSGL_V,"OggVorbisComment: %s\n",*ptr); |
1828 | 800 ++ptr; |
801 } | |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
802 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
|
803 mp_msg(MSGT_DECAUDIO,MSGL_V,"OggVorbis: Encoded by: %s\n",sh_audio->ov->vc.vendor); |
1828 | 804 } |
805 sh_audio->channels=sh_audio->ov->vi.channels; | |
806 sh_audio->samplerate=sh_audio->ov->vi.rate; | |
807 sh_audio->i_bps=sh_audio->ov->vi.bitrate_nominal/8; | |
808 | |
809 // printf("[\n"); | |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
810 // sh_audio->a_buffer_len=sh_audio->audio_out_minsize;///ov->vi.channels; |
1828 | 811 // printf("]\n"); |
812 | |
813 /* OK, got and parsed all three headers. Initialize the Vorbis | |
814 packet->PCM decoder. */ | |
815 vorbis_synthesis_init(&sh_audio->ov->vd,&sh_audio->ov->vi); /* central decode state */ | |
816 vorbis_block_init(&sh_audio->ov->vd,&sh_audio->ov->vb); /* local state for most of the decode | |
817 so multiple block decodes can | |
818 proceed in parallel. We could init | |
819 multiple vorbis_block structures | |
820 for vd here */ | |
821 //printf("OggVorbis: synthesis and block init done.\n"); | |
822 ogg_sync_init(&sh_audio->ov->oy); /* Now we can read pages */ | |
823 | |
824 while((ret = ogg_sync_pageout(&sh_audio->ov->oy,&sh_audio->ov->og))!=1) { | |
825 if(ret == -1) | |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
826 mp_msg(MSGT_DECAUDIO,MSGL_WARN,"OggVorbis: Pageout: not properly synced, had to skip some bytes.\n"); |
1828 | 827 else |
828 if(ret == 0) { | |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
829 mp_msg(MSGT_DECAUDIO,MSGL_V,"OggVorbis: Pageout: need more data to verify page, reading more data.\n"); |
1828 | 830 /* 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
|
831 buffer=ogg_sync_buffer(&sh_audio->ov->oy,256); |
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
832 ogg_sync_wrote(&sh_audio->ov->oy,demux_read_data(sh_audio->ds,buffer,256)); |
1828 | 833 } |
834 } | |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
835 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
|
836 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
|
837 as they'll also become apparent |
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
838 at packetout */ |
1828 | 839 |
840 /* Get the serial number and set up the rest of decode. */ | |
841 /* serialno first; use it to set up a logical stream */ | |
842 ogg_stream_init(&sh_audio->ov->os,ogg_page_serialno(&sh_audio->ov->og)); | |
843 | |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
844 mp_msg(MSGT_DECAUDIO,MSGL_V,"OggVorbis: Init OK!\n"); |
1828 | 845 |
846 break; | |
847 } | |
848 #endif | |
2415 | 849 |
850 #ifdef USE_LIBMAD | |
851 case AFM_MAD: | |
852 { | |
3871 | 853 printf("%s %s %s (%s)\n", mad_version, mad_copyright, mad_author, mad_build); |
854 | |
2415 | 855 printf(__FILE__ ":%d:mad: initialising\n", __LINE__); |
856 mad_frame_init(&mad_frame); | |
857 mad_stream_init(&mad_stream); | |
858 | |
859 printf(__FILE__ ":%d:mad: preparing buffer\n", __LINE__); | |
860 mad_prepare_buffer(sh_audio, &mad_stream, sh_audio->a_in_buffer_size); | |
861 mad_stream_buffer(&mad_stream, (unsigned char*)(sh_audio->a_in_buffer), sh_audio->a_in_buffer_len); | |
3871 | 862 // mad_stream_sync(&mad_stream); |
863 mad_sync(sh_audio, &mad_stream); | |
2415 | 864 mad_synth_init(&mad_synth); |
865 | |
866 if(mad_frame_decode(&mad_frame, &mad_stream) == 0) | |
867 { | |
868 printf(__FILE__ ":%d:mad: post processing buffer\n", __LINE__); | |
869 mad_postprocess_buffer(sh_audio, &mad_stream); | |
870 } | |
871 else | |
872 { | |
873 printf(__FILE__ ":%d:mad: frame decoding failed\n", __LINE__); | |
3874 | 874 mad_print_error(&mad_stream); |
2415 | 875 } |
876 | |
2434
571538d73e08
audio channels nr is identified from libmad's channel mode
alex
parents:
2432
diff
changeset
|
877 switch (mad_frame.header.mode) |
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 case MAD_MODE_SINGLE_CHANNEL: |
571538d73e08
audio channels nr is identified from libmad's channel mode
alex
parents:
2432
diff
changeset
|
880 sh_audio->channels=1; |
571538d73e08
audio channels nr is identified from libmad's channel mode
alex
parents:
2432
diff
changeset
|
881 break; |
571538d73e08
audio channels nr is identified from libmad's channel mode
alex
parents:
2432
diff
changeset
|
882 case MAD_MODE_DUAL_CHANNEL: |
571538d73e08
audio channels nr is identified from libmad's channel mode
alex
parents:
2432
diff
changeset
|
883 case MAD_MODE_JOINT_STEREO: |
571538d73e08
audio channels nr is identified from libmad's channel mode
alex
parents:
2432
diff
changeset
|
884 case MAD_MODE_STEREO: |
571538d73e08
audio channels nr is identified from libmad's channel mode
alex
parents:
2432
diff
changeset
|
885 sh_audio->channels=2; |
571538d73e08
audio channels nr is identified from libmad's channel mode
alex
parents:
2432
diff
changeset
|
886 break; |
571538d73e08
audio channels nr is identified from libmad's channel mode
alex
parents:
2432
diff
changeset
|
887 default: |
571538d73e08
audio channels nr is identified from libmad's channel mode
alex
parents:
2432
diff
changeset
|
888 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
|
889 } |
571538d73e08
audio channels nr is identified from libmad's channel mode
alex
parents:
2432
diff
changeset
|
890 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
|
891 sh_audio->channels, mad_frame.header.mode); |
2432 | 892 /* var. name changed in 0.13.0 (beta) (libmad/CHANGES) -- alex */ |
893 #if (MAD_VERSION_MAJOR >= 0) && (MAD_VERSION_MINOR >= 13) | |
894 sh_audio->samplerate=mad_frame.header.samplerate; | |
895 #else | |
2415 | 896 sh_audio->samplerate=mad_frame.header.sfreq; |
2432 | 897 #endif |
2415 | 898 sh_audio->i_bps=mad_frame.header.bitrate; |
899 printf(__FILE__ ":%d:mad: continuing\n", __LINE__); | |
900 break; | |
901 } | |
902 #endif | |
296 | 903 } |
904 | |
905 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
|
906 mp_msg(MSGT_DECAUDIO,MSGL_WARN,MSGTR_UnknownAudio); |
303 | 907 driver=0; |
296 | 908 } |
909 | |
303 | 910 if(!driver){ |
911 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
|
912 sh_audio->a_buffer=NULL; |
303 | 913 return 0; |
914 } | |
296 | 915 |
1529 | 916 if(!sh_audio->o_bps) |
303 | 917 sh_audio->o_bps=sh_audio->channels*sh_audio->samplerate*sh_audio->samplesize; |
918 return driver; | |
296 | 919 } |
291 | 920 |
746 | 921 // Audio decoding: |
291 | 922 |
746 | 923 // Decode a single frame (mp3,acm etc) or 'minlen' bytes (pcm/alaw etc) |
924 // buffer length is 'maxlen' bytes, it shouldn't be exceeded... | |
925 | |
926 int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen){ | |
291 | 927 int len=-1; |
303 | 928 switch(sh_audio->codec->driver){ |
1927 | 929 #ifdef USE_LIBAVCODEC |
930 case AFM_FFMPEG: { | |
931 unsigned char *start=NULL; | |
932 int y; | |
933 while(len<minlen){ | |
934 int len2=0; | |
935 int x=ds_get_packet(sh_audio->ds,&start); | |
936 if(x<=0) break; // error | |
2049
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
1973
diff
changeset
|
937 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
|
938 if(y<0){ mp_msg(MSGT_DECAUDIO,MSGL_V,"lavc_audio: error\n");break; } |
1927 | 939 if(y<x) sh_audio->ds->buffer_pos+=y-x; // put back data (HACK!) |
940 if(len2>0){ | |
941 //len=len2;break; | |
942 if(len<0) len=len2; else len+=len2; | |
943 buf+=len2; | |
944 } | |
945 mp_dbg(MSGT_DECAUDIO,MSGL_DBG2,"Decoded %d -> %d \n",y,len2); | |
946 } | |
947 } | |
948 break; | |
949 #endif | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
950 case AFM_MPEG: // MPEG layer 2 or 3 |
291 | 951 len=MP3_DecodeFrame(buf,-1); |
1485
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
952 // len=MP3_DecodeFrame(buf,3); |
291 | 953 break; |
1830 | 954 #ifdef HAVE_OGGVORBIS |
1828 | 955 case AFM_VORBIS: { // OggVorbis |
956 /* note: good minlen would be 4k or 8k IMHO - atmos */ | |
957 int ret; | |
958 char *buffer; | |
959 int bytes; | |
960 int samples; | |
961 float **pcm; | |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
962 //ogg_int16_t convbuffer[4096]; |
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
963 // int convsize; |
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
964 int readlen=1024; |
1834
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
965 len=0; |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
966 // 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
|
967 |
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
968 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
|
969 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
|
970 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
|
971 if(ret==0) { |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
972 int xxx=0; |
1834
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
973 //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
|
974 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
|
975 if(ret == -1) |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
976 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
|
977 else |
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
978 if(ret == 0) { |
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
979 //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
|
980 /* 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
|
981 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
|
982 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
|
983 xxx+=bytes; |
1834
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
984 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
|
985 if(bytes==0) |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
986 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
|
987 } |
1828 | 988 } |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
989 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
|
990 //printf("OggVorbis: Pageout: successfull, pagin in.\n"); |
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
991 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
|
992 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
|
993 break; |
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
994 } else if(ret<0) { |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
995 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
|
996 break; |
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
997 } else { |
1828 | 998 |
999 /* we have a packet. Decode it */ | |
1000 | |
1001 if(vorbis_synthesis(&sh_audio->ov->vb,&sh_audio->ov->op)==0) /* test for success! */ | |
1002 vorbis_synthesis_blockin(&sh_audio->ov->vd,&sh_audio->ov->vb); | |
1003 | |
1004 /* **pcm is a multichannel float vector. In stereo, for | |
1005 example, pcm[0] is left, and pcm[1] is right. samples is | |
1006 the size of each channel. Convert the float values | |
1007 (-1.<=range<=1.) to whatever PCM format and write it out */ | |
1008 | |
1009 while((samples=vorbis_synthesis_pcmout(&sh_audio->ov->vd,&pcm))>0){ | |
1010 int i,j; | |
1011 int clipflag=0; | |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
1012 int convsize=(maxlen-len)/(2*sh_audio->ov->vi.channels); // max size! |
1828 | 1013 int bout=(samples<convsize?samples:convsize); |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
1014 |
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
1015 if(bout<=0) break; |
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
1016 |
1828 | 1017 /* convert floats to 16 bit signed ints (host order) and |
1018 interleave */ | |
1019 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
|
1020 ogg_int16_t *convbuffer=(ogg_int16_t *)(&buf[len]); |
1828 | 1021 ogg_int16_t *ptr=convbuffer+i; |
1022 float *mono=pcm[i]; | |
1023 for(j=0;j<bout;j++){ | |
1024 #if 1 | |
1025 int val=mono[j]*32767.f; | |
1026 #else /* optional dither */ | |
1027 int val=mono[j]*32767.f+drand48()-0.5f; | |
1028 #endif | |
1029 /* might as well guard against clipping */ | |
1030 if(val>32767){ | |
1031 val=32767; | |
1032 clipflag=1; | |
1033 } | |
1034 if(val<-32768){ | |
1035 val=-32768; | |
1036 clipflag=1; | |
1037 } | |
1038 *ptr=val; | |
1039 ptr+=sh_audio->ov->vi.channels; | |
1040 } | |
1041 } | |
1042 | |
1043 if(clipflag) | |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
1044 mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"Clipping in frame %ld\n",(long)(sh_audio->ov->vd.sequence)); |
1828 | 1045 |
1046 //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
|
1047 //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
|
1048 len+=2*sh_audio->ov->vi.channels*bout; |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
1049 |
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
1050 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
|
1051 |
1828 | 1052 vorbis_synthesis_read(&sh_audio->ov->vd,bout); /* tell libvorbis how |
1053 many samples we | |
1054 actually consumed */ | |
1055 } | |
1834
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
1056 } // from else, packetout ok |
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
1057 } // while len |
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
1058 } // outer while len |
1828 | 1059 if(ogg_page_eos(&sh_audio->ov->og)) |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
1060 mp_msg(MSGT_DECAUDIO,MSGL_V,"OggVorbis: End of Stream reached!\n"); // FIXME clearup decoder, notify mplayer - atmos |
1828 | 1061 |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
1062 mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"\n[len: %d ]\n",len); |
1828 | 1063 |
1064 break; | |
1831 | 1065 } |
1830 | 1066 #endif |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
1067 case AFM_PCM: // AVI PCM |
1058 | 1068 len=demux_read_data(sh_audio->ds,buf,minlen); |
401 | 1069 break; |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
1070 case AFM_DVDPCM: // DVD PCM |
401 | 1071 { int j; |
746 | 1072 len=demux_read_data(sh_audio->ds,buf,minlen); |
291 | 1073 //if(i&1){ printf("Warning! pcm_audio_size&1 !=0 (%d)\n",i);i&=~1; } |
746 | 1074 // swap endian: |
291 | 1075 for(j=0;j<len;j+=2){ |
1076 char x=buf[j]; | |
1077 buf[j]=buf[j+1]; | |
1078 buf[j+1]=x; | |
1079 } | |
1080 break; | |
1081 } | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
1082 case AFM_ALAW: // aLaw decoder |
746 | 1083 { int l=demux_read_data(sh_audio->ds,buf,minlen/2); |
291 | 1084 unsigned short *d=(unsigned short *) buf; |
1085 unsigned char *s=buf; | |
1086 len=2*l; | |
758 | 1087 if(sh_audio->format==6){ |
1088 // aLaw | |
883 | 1089 while(l>0){ --l; d[l]=alaw2short[s[l]]; } |
758 | 1090 } else { |
1091 // uLaw | |
883 | 1092 while(l>0){ --l; d[l]=ulaw2short[s[l]]; } |
291 | 1093 } |
1094 break; | |
1095 } | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
1096 case AFM_GSM: // MS-GSM decoder |
2420 | 1097 { unsigned char ibuf[65]; // 65 bytes / frame |
1098 if(demux_read_data(sh_audio->ds,ibuf,65)!=65) break; // EOF | |
1099 XA_MSGSM_Decoder(ibuf,(unsigned short *) buf); // decodes 65 byte -> 320 short | |
746 | 1100 // XA_GSM_Decoder(buf,(unsigned short *) &sh_audio->a_buffer[sh_audio->a_buffer_len]); // decodes 33 byte -> 160 short |
1101 len=2*320; | |
291 | 1102 break; |
1103 } | |
3866 | 1104 #ifdef USE_G72X |
3426 | 1105 case AFM_G72X: // GSM 723 decoder |
1106 { if(demux_read_data(sh_audio->ds,g72x_data.block, g72x_data.blocksize)!=g72x_data.blocksize) break; // EOF | |
1107 g72x_decode_block(&g72x_data); | |
1108 len=2*g72x_data.samplesperblock; | |
1109 memcpy(buf,g72x_data.samples,len); | |
1110 break; | |
1111 } | |
3866 | 1112 #endif |
3787 | 1113 case AFM_IMAADPCM: |
3756 | 1114 { unsigned char ibuf[IMA_ADPCM_BLOCK_SIZE * 2]; // bytes / stereo frame |
1115 if (demux_read_data(sh_audio->ds, ibuf, | |
3787 | 1116 IMA_ADPCM_BLOCK_SIZE * sh_audio->wf->nChannels) != |
3756 | 1117 IMA_ADPCM_BLOCK_SIZE * sh_audio->wf->nChannels) |
1118 break; // EOF | |
1119 len=2*ima_adpcm_decode_block((unsigned short*)buf,ibuf, sh_audio->wf->nChannels); | |
3787 | 1120 break; |
1121 } | |
1122 case AFM_MSADPCM: | |
3875
e3caff2daa98
fixed stereo MS ADPCM decoder and reinstated opensource decoder as the
melanson
parents:
3874
diff
changeset
|
1123 { static unsigned char *ibuf = NULL; |
e3caff2daa98
fixed stereo MS ADPCM decoder and reinstated opensource decoder as the
melanson
parents:
3874
diff
changeset
|
1124 if (!ibuf) |
e3caff2daa98
fixed stereo MS ADPCM decoder and reinstated opensource decoder as the
melanson
parents:
3874
diff
changeset
|
1125 ibuf = (unsigned char *)malloc |
e3caff2daa98
fixed stereo MS ADPCM decoder and reinstated opensource decoder as the
melanson
parents:
3874
diff
changeset
|
1126 (sh_audio->wf->nBlockAlign * sh_audio->wf->nChannels); |
3787 | 1127 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
|
1128 sh_audio->wf->nBlockAlign) != |
e3caff2daa98
fixed stereo MS ADPCM decoder and reinstated opensource decoder as the
melanson
parents:
3874
diff
changeset
|
1129 sh_audio->wf->nBlockAlign) |
3787 | 1130 break; // EOF |
3875
e3caff2daa98
fixed stereo MS ADPCM decoder and reinstated opensource decoder as the
melanson
parents:
3874
diff
changeset
|
1131 len= 2 * ms_adpcm_decode_block( |
e3caff2daa98
fixed stereo MS ADPCM decoder and reinstated opensource decoder as the
melanson
parents:
3874
diff
changeset
|
1132 (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
|
1133 sh_audio->wf->nBlockAlign); |
2420 | 1134 break; |
1135 } | |
3933
60db4273246d
added initial support for format 0x61 ADPCM (sounds good, but still pops)
melanson
parents:
3911
diff
changeset
|
1136 case AFM_FOX61ADPCM: |
60db4273246d
added initial support for format 0x61 ADPCM (sounds good, but still pops)
melanson
parents:
3911
diff
changeset
|
1137 { unsigned char ibuf[FOX61_ADPCM_BLOCK_SIZE]; // bytes / stereo frame |
60db4273246d
added initial support for format 0x61 ADPCM (sounds good, but still pops)
melanson
parents:
3911
diff
changeset
|
1138 if (demux_read_data(sh_audio->ds, ibuf, FOX61_ADPCM_BLOCK_SIZE) != |
60db4273246d
added initial support for format 0x61 ADPCM (sounds good, but still pops)
melanson
parents:
3911
diff
changeset
|
1139 FOX61_ADPCM_BLOCK_SIZE) |
60db4273246d
added initial support for format 0x61 ADPCM (sounds good, but still pops)
melanson
parents:
3911
diff
changeset
|
1140 break; // EOF |
60db4273246d
added initial support for format 0x61 ADPCM (sounds good, but still pops)
melanson
parents:
3911
diff
changeset
|
1141 len=2*fox61_adpcm_decode_block((unsigned short*)buf,ibuf); |
60db4273246d
added initial support for format 0x61 ADPCM (sounds good, but still pops)
melanson
parents:
3911
diff
changeset
|
1142 break; |
60db4273246d
added initial support for format 0x61 ADPCM (sounds good, but still pops)
melanson
parents:
3911
diff
changeset
|
1143 } |
3826
8a88ed2473aa
added initial, not-yet-functional, support for fox62 audio
melanson
parents:
3787
diff
changeset
|
1144 case AFM_FOX62ADPCM: |
8a88ed2473aa
added initial, not-yet-functional, support for fox62 audio
melanson
parents:
3787
diff
changeset
|
1145 { 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
|
1146 if (demux_read_data(sh_audio->ds, ibuf, |
8a88ed2473aa
added initial, not-yet-functional, support for fox62 audio
melanson
parents:
3787
diff
changeset
|
1147 FOX62_ADPCM_BLOCK_SIZE * sh_audio->wf->nChannels) != |
8a88ed2473aa
added initial, not-yet-functional, support for fox62 audio
melanson
parents:
3787
diff
changeset
|
1148 FOX62_ADPCM_BLOCK_SIZE * sh_audio->wf->nChannels) |
8a88ed2473aa
added initial, not-yet-functional, support for fox62 audio
melanson
parents:
3787
diff
changeset
|
1149 break; // EOF |
3933
60db4273246d
added initial support for format 0x61 ADPCM (sounds good, but still pops)
melanson
parents:
3911
diff
changeset
|
1150 len = 2 * fox62_adpcm_decode_block( |
60db4273246d
added initial support for format 0x61 ADPCM (sounds good, but still pops)
melanson
parents:
3911
diff
changeset
|
1151 (unsigned short*)buf,ibuf, sh_audio->wf->nChannels); |
3826
8a88ed2473aa
added initial, not-yet-functional, support for fox62 audio
melanson
parents:
3787
diff
changeset
|
1152 break; |
8a88ed2473aa
added initial, not-yet-functional, support for fox62 audio
melanson
parents:
3787
diff
changeset
|
1153 } |
3886 | 1154 #ifdef USE_LIBAC3 |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
1155 case AFM_AC3: // AC3 decoder |
291 | 1156 //printf("{1:%d}",avi_header.idx_pos);fflush(stdout); |
1157 if(!sh_audio->ac3_frame) sh_audio->ac3_frame=ac3_decode_frame(); | |
1158 //printf("{2:%d}",avi_header.idx_pos);fflush(stdout); | |
1159 if(sh_audio->ac3_frame){ | |
296 | 1160 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
|
1161 memcpy(buf,((ac3_frame_t*)sh_audio->ac3_frame)->audio_data,len); |
291 | 1162 sh_audio->ac3_frame=NULL; |
1163 } | |
1164 //printf("{3:%d}",avi_header.idx_pos);fflush(stdout); | |
1165 break; | |
3886 | 1166 #endif |
3413 | 1167 case AFM_A52: { // AC3 decoder |
3911 | 1168 sample_t level=1, bias=384; |
1169 int flags=a52_flags|A52_ADJUST_LEVEL; | |
3413 | 1170 int i; |
1171 if(!sh_audio->a_in_buffer_len) | |
1172 if(a52_fillbuff(sh_audio)<0) break; // EOF | |
1173 sh_audio->a_in_buffer_len=0; | |
1174 if (a52_frame (&a52_state, sh_audio->a_in_buffer, &flags, &level, bias)){ | |
1175 mp_msg(MSGT_DECAUDIO,MSGL_WARN,"a52: error decoding frame\n"); | |
1176 break; | |
1177 } | |
1178 // a52_dynrng (&state, NULL, NULL); // disable dynamic range compensation | |
1179 | |
1180 // frame decoded, let's resample: | |
3911 | 1181 //a52_resample_init(a52_accel,flags,sh_audio->channels); |
3413 | 1182 len=0; |
1183 for (i = 0; i < 6; i++) { | |
1184 if (a52_block (&a52_state, a52_samples)){ | |
1185 mp_msg(MSGT_DECAUDIO,MSGL_WARN,"a52: error at resampling\n"); | |
1186 break; | |
1187 } | |
1188 len+=2*a52_resample(a52_samples,&buf[len]); | |
1189 } | |
3417 | 1190 // printf("len = %d \n",len); // 6144 on all vobs I tried so far... (5.1 and 2.0) ::atmos |
3413 | 1191 break; |
1192 } | |
1528
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
1193 case AFM_HWAC3: // AC3 through SPDIF |
3829 | 1194 if(!sh_audio->a_in_buffer_len) |
1195 if((len=a52_fillbuff(sh_audio))<0) break; //EOF | |
1196 sh_audio->a_in_buffer_len=0; | |
1197 len = ac3_iec958_build_burst(len, 0x01, 1, sh_audio->a_in_buffer, buf); | |
1198 // len = 6144 = 4*(6*256) | |
1528
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
1199 break; |
1517
0e9c29538a86
Use USE_WIN32DLL define instead of ARCH_X86 to decide whether or not to compile
jkeil
parents:
1485
diff
changeset
|
1200 #ifdef USE_WIN32DLL |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
1201 case AFM_ACM: |
758 | 1202 // len=sh_audio->audio_out_minsize; // optimal decoded fragment size |
1203 // if(len<minlen) len=minlen; else | |
1204 // if(len>maxlen) len=maxlen; | |
1205 // len=acm_decode_audio(sh_audio,buf,len); | |
1206 len=acm_decode_audio(sh_audio,buf,minlen,maxlen); | |
291 | 1207 break; |
1309
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1291
diff
changeset
|
1208 #endif |
746 | 1209 |
291 | 1210 #ifdef USE_DIRECTSHOW |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
1211 case AFM_DSHOW: // DirectShow |
1327
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
1212 { int size_in=0; |
291 | 1213 int size_out=0; |
3442 | 1214 int srcsize=DS_AudioDecoder_GetSrcSize(ds_adec, maxlen); |
1567 | 1215 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 | 1216 if(srcsize>sh_audio->a_in_buffer_size) srcsize=sh_audio->a_in_buffer_size; // !!!!!! |
1217 if(sh_audio->a_in_buffer_len<srcsize){ | |
1218 sh_audio->a_in_buffer_len+= | |
1219 demux_read_data(sh_audio->ds,&sh_audio->a_in_buffer[sh_audio->a_in_buffer_len], | |
1220 srcsize-sh_audio->a_in_buffer_len); | |
1221 } | |
3442 | 1222 DS_AudioDecoder_Convert(ds_adec, sh_audio->a_in_buffer,sh_audio->a_in_buffer_len, |
291 | 1223 buf,maxlen, &size_in,&size_out); |
1567 | 1224 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 | 1225 if(size_in>=sh_audio->a_in_buffer_len){ |
1226 sh_audio->a_in_buffer_len=0; | |
1227 } else { | |
1228 sh_audio->a_in_buffer_len-=size_in; | |
1229 memcpy(sh_audio->a_in_buffer,&sh_audio->a_in_buffer[size_in],sh_audio->a_in_buffer_len); | |
1230 } | |
1231 len=size_out; | |
1232 break; | |
1233 } | |
1234 #endif | |
2415 | 1235 |
1236 #ifdef USE_LIBMAD | |
1237 case AFM_MAD: | |
1238 { | |
1239 mad_prepare_buffer(sh_audio, &mad_stream, sh_audio->a_in_buffer_size); | |
1240 mad_stream_buffer(&mad_stream, sh_audio->a_in_buffer, sh_audio->a_in_buffer_len); | |
3871 | 1241 // mad_stream_sync(&mad_stream); |
1242 mad_sync(sh_audio, &mad_stream); | |
2415 | 1243 if(mad_frame_decode(&mad_frame, &mad_stream) == 0) |
1244 { | |
1245 mad_synth_frame(&mad_synth, &mad_frame); | |
1246 mad_postprocess_buffer(sh_audio, &mad_stream); | |
1247 | |
1248 /* and fill buffer */ | |
1249 | |
1250 { | |
1251 int i; | |
1252 int end_size = mad_synth.pcm.length; | |
1253 signed short* samples = (signed short*)buf; | |
1254 if(end_size > maxlen/4) | |
1255 end_size=maxlen/4; | |
1256 | |
1257 for(i=0; i<mad_synth.pcm.length; ++i) { | |
1258 *samples++ = mad_scale(mad_synth.pcm.samples[0][i]); | |
1259 *samples++ = mad_scale(mad_synth.pcm.samples[0][i]); | |
1260 // *buf++ = mad_scale(mad_synth.pcm.sampAles[1][i]); | |
1261 } | |
1262 len = end_size*4; | |
1263 } | |
1264 } | |
1265 else | |
1266 { | |
3871 | 1267 printf(__FILE__ ":%d:mad: frame decoding failed (error: %d)\n", __LINE__, |
1268 mad_stream.error); | |
3874 | 1269 mad_print_error(&mad_stream); |
2415 | 1270 } |
1271 | |
1272 break; | |
1273 } | |
1274 #endif | |
291 | 1275 } |
1276 return len; | |
1277 } | |
1278 | |
1327
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
1279 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
|
1280 switch(sh_audio->codec->driver){ |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
1281 case AFM_MPEG: |
1327
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
1282 MP3_DecodeFrame(NULL,-2); // resync |
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
1283 MP3_DecodeFrame(NULL,-2); // resync |
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
1284 MP3_DecodeFrame(NULL,-2); // resync |
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
1285 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
|
1286 #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
|
1287 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
|
1288 //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
|
1289 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
|
1290 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
|
1291 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
|
1292 #endif |
3886 | 1293 #ifdef USE_LIBAC3 |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
1294 case AFM_AC3: |
1327
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
1295 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
|
1296 // 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
|
1297 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
|
1298 // if(verbose) printf(" OK!\n"); |
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
1299 break; |
3886 | 1300 #endif |
3413 | 1301 case AFM_A52: |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
1302 case AFM_ACM: |
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
1303 case AFM_DSHOW: |
1528
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
1304 case AFM_HWAC3: |
1327
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
1305 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
|
1306 break; |
2415 | 1307 |
1308 #ifdef USE_LIBMAD | |
1309 case AFM_MAD: | |
1310 mad_prepare_buffer(sh_audio, &mad_stream, sh_audio->a_in_buffer_size); | |
1311 mad_stream_buffer(&mad_stream, sh_audio->a_in_buffer, sh_audio->a_in_buffer_len); | |
3871 | 1312 // mad_stream_sync(&mad_stream); |
1313 mad_sync(sh_audio, &mad_stream); | |
2415 | 1314 mad_postprocess_buffer(sh_audio, &mad_stream); |
1315 break; | |
2418 | 1316 #endif |
1327
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
1317 } |
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
1318 } |
291 | 1319 |
1327
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
1320 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
|
1321 switch(sh_audio->codec->driver){ |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
1322 case AFM_MPEG: MP3_DecodeFrame(NULL,-2);break; // skip MPEG frame |
3886 | 1323 #ifdef USE_LIBAC3 |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
1324 case AFM_AC3: sh_audio->ac3_frame=ac3_decode_frame();break; // skip AC3 frame |
3886 | 1325 #endif |
3829 | 1326 case AFM_HWAC3: |
3413 | 1327 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
|
1328 case AFM_ACM: |
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
1329 case AFM_DSHOW: { |
1408 | 1330 int skip=sh_audio->wf->nBlockAlign; |
1331 if(skip<16){ | |
1332 skip=(sh_audio->wf->nAvgBytesPerSec/16)&(~7); | |
1333 if(skip<16) skip=16; | |
1334 } | |
1335 demux_read_data(sh_audio->ds,NULL,skip); | |
1336 break; | |
1337 } | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
1338 case AFM_PCM: |
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
1339 case AFM_DVDPCM: |
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
1340 case AFM_ALAW: { |
1408 | 1341 int skip=sh_audio->i_bps/16; |
1342 skip=skip&(~3); | |
1343 demux_read_data(sh_audio->ds,NULL,skip); | |
1344 break; | |
1345 } | |
2415 | 1346 #ifdef USE_LIBMAD |
1347 case AFM_MAD: | |
1348 { | |
1349 mad_prepare_buffer(sh_audio, &mad_stream, sh_audio->a_in_buffer_size); | |
1350 mad_stream_buffer(&mad_stream, sh_audio->a_in_buffer, sh_audio->a_in_buffer_len); | |
1351 mad_stream_skip(&mad_stream, 2); | |
3871 | 1352 // mad_stream_sync(&mad_stream); |
1353 mad_sync(sh_audio, &mad_stream); | |
2415 | 1354 mad_postprocess_buffer(sh_audio, &mad_stream); |
1355 break; | |
1356 } | |
1357 #endif | |
1358 | |
1327
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
1359 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
|
1360 } |
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
1361 } |