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