Mercurial > mplayer.hg
annotate dec_audio.c @ 2496:b2ce5d6d7d4f
libffmpeg.so support
author | nick |
---|---|
date | Sat, 27 Oct 2001 13:39:12 +0000 |
parents | 571538d73e08 |
children | 77a3f73c04d5 |
rev | line source |
---|---|
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
1 |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
2 #include <stdio.h> |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
3 #include <stdlib.h> |
1430 | 4 #include <unistd.h> |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
5 |
1038
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents:
1020
diff
changeset
|
6 #include "config.h" |
1567 | 7 #include "mp_msg.h" |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1927
diff
changeset
|
8 #include "help_mp.h" |
1567 | 9 |
1058 | 10 #include "libao2/afmt.h" |
758 | 11 |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
12 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
|
13 |
732
e14114170e01
applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents:
640
diff
changeset
|
14 #ifdef USE_FAKE_MONO |
e14114170e01
applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents:
640
diff
changeset
|
15 int fakemono=0; |
e14114170e01
applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents:
640
diff
changeset
|
16 #endif |
e14114170e01
applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents:
640
diff
changeset
|
17 |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
18 #include "stream.h" |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
19 #include "demuxer.h" |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
20 |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
21 #include "codec-cfg.h" |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
22 #include "stheader.h" |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
23 |
2049
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
1973
diff
changeset
|
24 #include "dll_init.h" |
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
1973
diff
changeset
|
25 |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
26 #include "mp3lib/mp3.h" |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
27 #include "libac3/ac3.h" |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
28 |
883 | 29 #include "alaw.h" |
30 | |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
31 #include "xa/xa_gsm.h" |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
32 |
1528
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
33 #include "ac3-iec958.h" |
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
34 |
2420 | 35 #include "ima4.h" |
36 | |
1291 | 37 #ifdef USE_DIRECTSHOW |
604 | 38 #include "loader/DirectShow/DS_AudioDec.h" |
1291 | 39 #endif |
1038
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents:
1020
diff
changeset
|
40 |
1828 | 41 #ifdef HAVE_OGGVORBIS |
42 /* XXX is math.h really needed? - atmos */ | |
43 #include <math.h> | |
44 #include <vorbis/codec.h> | |
2341 | 45 |
46 typedef struct ov_struct_st { | |
47 ogg_sync_state oy; /* sync and verify incoming physical bitstream */ | |
48 ogg_stream_state os; /* take physical pages, weld into a logical | |
49 stream of packets */ | |
50 ogg_page og; /* one Ogg bitstream page. Vorbis packets are inside */ | |
51 ogg_packet op; /* one raw packet of data for decode */ | |
52 | |
53 vorbis_info vi; /* struct that stores all the static vorbis bitstream | |
54 settings */ | |
55 vorbis_comment vc; /* struct that stores all the bitstream user comments */ | |
56 vorbis_dsp_state vd; /* central working state for the packet->PCM decoder */ | |
57 vorbis_block vb; /* local working space for packet->PCM decode */ | |
58 } ov_struct_t; | |
1828 | 59 #endif |
60 | |
1927 | 61 #ifdef USE_LIBAVCODEC |
2496 | 62 #ifdef USE_LIBAVCODEC_SO |
63 #include <libffmpeg/avcodec.h> | |
64 #else | |
1927 | 65 #include "libavcodec/avcodec.h" |
2496 | 66 #endif |
1927 | 67 static AVCodec *lavc_codec=NULL; |
68 static AVCodecContext lavc_context; | |
69 extern int avcodec_inited; | |
70 #endif | |
71 | |
2415 | 72 |
73 | |
74 #ifdef USE_LIBMAD | |
75 #include <mad.h> | |
76 static struct mad_stream mad_stream; | |
77 static struct mad_frame mad_frame; | |
78 static struct mad_synth mad_synth; | |
79 | |
80 | |
81 // ensure buffer is filled with some data | |
82 static void mad_prepare_buffer(sh_audio_t* sh_audio, struct mad_stream* ms, int length) | |
83 { | |
84 if(sh_audio->a_in_buffer_len < length) { | |
85 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); | |
86 sh_audio->a_in_buffer_len += len; | |
87 } | |
88 } | |
89 | |
90 static void mad_postprocess_buffer(sh_audio_t* sh_audio, struct mad_stream* ms) | |
91 { | |
92 int delta = (unsigned char*)ms->next_frame - (unsigned char *)sh_audio->a_in_buffer; | |
93 if(delta != 0) { | |
94 sh_audio->a_in_buffer_len -= delta; | |
95 memcpy(sh_audio->a_in_buffer, ms->next_frame, sh_audio->a_in_buffer_len); | |
96 } | |
97 } | |
98 | |
99 | |
100 static inline | |
101 signed short mad_scale(mad_fixed_t sample) | |
102 { | |
103 /* round */ | |
104 sample += (1L << (MAD_F_FRACBITS - 16)); | |
105 | |
106 /* clip */ | |
107 if (sample >= MAD_F_ONE) | |
108 sample = MAD_F_ONE - 1; | |
109 else if (sample < -MAD_F_ONE) | |
110 sample = -MAD_F_ONE; | |
111 | |
112 /* quantize */ | |
113 return sample >> (MAD_F_FRACBITS + 1 - 16); | |
114 } | |
115 #endif | |
116 | |
117 | |
118 | |
119 | |
120 | |
1927 | 121 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
|
122 |
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
123 |
1289 | 124 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
|
125 |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
126 // AC3 decoder buffer callback: |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
127 static void ac3_fill_buffer(uint8_t **start,uint8_t **end){ |
1289 | 128 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
|
129 //printf("<ac3:%d>\n",len); |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
130 if(len<0) |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
131 *start = *end = NULL; |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
132 else |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
133 *end = *start + len; |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
134 } |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
135 |
1289 | 136 // MP3 decoder buffer callback: |
137 int mplayer_audio_read(char *buf,int size){ | |
138 int len; | |
139 len=demux_read_data(dec_audio_sh->ds,buf,size); | |
140 return len; | |
141 } | |
142 | |
296 | 143 int init_audio(sh_audio_t *sh_audio){ |
303 | 144 int driver=sh_audio->codec->driver; |
296 | 145 |
146 sh_audio->samplesize=2; | |
1320
18374d49befa
On big-endian architectures, all audio decoders default to big-endian 16-bit
jkeil
parents:
1313
diff
changeset
|
147 #if WORDS_BIGENDIAN |
18374d49befa
On big-endian architectures, all audio decoders default to big-endian 16-bit
jkeil
parents:
1313
diff
changeset
|
148 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
|
149 #else |
758 | 150 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
|
151 #endif |
303 | 152 sh_audio->samplerate=0; |
401 | 153 //sh_audio->pcm_bswap=0; |
1529 | 154 sh_audio->o_bps=0; |
303 | 155 |
758 | 156 sh_audio->a_buffer_size=0; |
303 | 157 sh_audio->a_buffer=NULL; |
296 | 158 |
746 | 159 sh_audio->a_in_buffer_len=0; |
160 | |
758 | 161 // setup required min. in/out buffer size: |
162 sh_audio->audio_out_minsize=8192;// default size, maybe not enough for Win32/ACM | |
163 | |
164 switch(driver){ | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
165 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
|
166 #ifndef USE_WIN32DLL |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1927
diff
changeset
|
167 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
|
168 driver=0; |
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1291
diff
changeset
|
169 #else |
296 | 170 // Win32 ACM audio codec: |
171 if(init_acm_audio_codec(sh_audio)){ | |
746 | 172 sh_audio->i_bps=sh_audio->wf->nAvgBytesPerSec; |
296 | 173 sh_audio->channels=sh_audio->o_wf.nChannels; |
174 sh_audio->samplerate=sh_audio->o_wf.nSamplesPerSec; | |
758 | 175 // if(sh_audio->audio_out_minsize>16384) sh_audio->audio_out_minsize=16384; |
176 // sh_audio->a_buffer_size=sh_audio->audio_out_minsize; | |
177 // if(sh_audio->a_buffer_size<sh_audio->audio_out_minsize+MAX_OUTBURST) | |
178 // sh_audio->a_buffer_size=sh_audio->audio_out_minsize+MAX_OUTBURST; | |
296 | 179 } else { |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1927
diff
changeset
|
180 mp_msg(MSGT_DECAUDIO,MSGL_ERR,MSGTR_ACMiniterror); |
303 | 181 driver=0; |
296 | 182 } |
1309
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1291
diff
changeset
|
183 #endif |
758 | 184 break; |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
185 case AFM_DSHOW: |
296 | 186 #ifndef USE_DIRECTSHOW |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1927
diff
changeset
|
187 mp_msg(MSGT_DECAUDIO,MSGL_ERR,MSGTR_NoDShowAudio); |
303 | 188 driver=0; |
296 | 189 #else |
190 // Win32 DShow audio codec: | |
340 | 191 // printf("DShow_audio: channs=%d rate=%d\n",sh_audio->channels,sh_audio->samplerate); |
432
5251b0c57e39
sh_audio->wf and sh_video->bih changed to dynamic (thanx to Jens Hoffmann)
arpi_esp
parents:
401
diff
changeset
|
192 if(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
|
193 mp_msg(MSGT_DECAUDIO,MSGL_ERR,MSGTR_MissingDLLcodec,sh_audio->codec->dll); |
303 | 194 driver=0; |
195 } else { | |
746 | 196 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
|
197 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
|
198 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
|
199 sh_audio->audio_in_minsize=2*sh_audio->wf->nBlockAlign; |
296 | 200 if(sh_audio->audio_in_minsize<8192) sh_audio->audio_in_minsize=8192; |
201 sh_audio->a_in_buffer_size=sh_audio->audio_in_minsize; | |
202 sh_audio->a_in_buffer=malloc(sh_audio->a_in_buffer_size); | |
203 sh_audio->a_in_buffer_len=0; | |
758 | 204 sh_audio->audio_out_minsize=16384; |
296 | 205 } |
206 #endif | |
758 | 207 break; |
1828 | 208 case AFM_VORBIS: |
209 #ifndef HAVE_OGGVORBIS | |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1927
diff
changeset
|
210 mp_msg(MSGT_DECAUDIO,MSGL_ERR,MSGTR_NoOggVorbis); |
1828 | 211 driver=0; |
212 #else | |
213 /* 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
|
214 sh_audio->audio_out_minsize=1024*4; // 1024 samples/frame |
1828 | 215 #endif |
216 break; | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
217 case AFM_PCM: |
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
218 case AFM_DVDPCM: |
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
219 case AFM_ALAW: |
758 | 220 // PCM, aLaw |
221 sh_audio->audio_out_minsize=2048; | |
222 break; | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
223 case AFM_AC3: |
758 | 224 // Dolby AC3 audio: |
225 sh_audio->audio_out_minsize=4*256*6; | |
226 break; | |
1528
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
227 case AFM_HWAC3: |
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
228 // Dolby AC3 audio: |
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
229 sh_audio->audio_out_minsize=4*256*6; |
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
230 sh_audio->sample_format = AFMT_AC3; |
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
231 break; |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
232 case AFM_GSM: |
758 | 233 // MS-GSM audio codec: |
234 sh_audio->audio_out_minsize=4*320; | |
235 break; | |
2420 | 236 case AFM_IMA4: |
237 // IMA-ADPCM 4:1 audio codec: | |
238 sh_audio->audio_out_minsize=4096; //4*IMA4_SAMPLES_PER_BLOCK; | |
239 sh_audio->ds->ss_div=IMA4_SAMPLES_PER_BLOCK; | |
240 sh_audio->ds->ss_mul=IMA4_BLOCK_SIZE; | |
241 break; | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
242 case AFM_MPEG: |
758 | 243 // MPEG Audio: |
244 sh_audio->audio_out_minsize=4608; | |
245 break; | |
1927 | 246 case AFM_FFMPEG: |
247 #ifndef USE_LIBAVCODEC | |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1927
diff
changeset
|
248 mp_msg(MSGT_DECAUDIO,MSGL_ERR,MSGTR_NoLAVCsupport); |
1927 | 249 return 0; |
250 #else | |
251 // FFmpeg Audio: | |
252 sh_audio->audio_out_minsize=AVCODEC_MAX_AUDIO_FRAME_SIZE; | |
253 break; | |
254 #endif | |
2415 | 255 |
256 #ifdef USE_LIBMAD | |
257 case AFM_MAD: | |
258 printf(__FILE__ ":%d:mad: setting minimum outputsize\n", __LINE__); | |
259 sh_audio->audio_out_minsize=4608; | |
260 if(sh_audio->audio_in_minsize<8192) sh_audio->audio_in_minsize=8192; | |
261 sh_audio->a_in_buffer_size=sh_audio->audio_in_minsize; | |
262 sh_audio->a_in_buffer=malloc(sh_audio->a_in_buffer_size); | |
263 sh_audio->a_in_buffer_len=0; | |
264 break; | |
265 #endif | |
296 | 266 } |
267 | |
303 | 268 if(!driver) return 0; |
296 | 269 |
270 // allocate audio out buffer: | |
758 | 271 sh_audio->a_buffer_size=sh_audio->audio_out_minsize+MAX_OUTBURST; // worst case calc. |
272 | |
1567 | 273 mp_msg(MSGT_DECAUDIO,MSGL_V,"dec_audio: Allocating %d + %d = %d bytes for output buffer\n", |
758 | 274 sh_audio->audio_out_minsize,MAX_OUTBURST,sh_audio->a_buffer_size); |
275 | |
296 | 276 sh_audio->a_buffer=malloc(sh_audio->a_buffer_size); |
758 | 277 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
|
278 mp_msg(MSGT_DECAUDIO,MSGL_ERR,MSGTR_CantAllocAudioBuf); |
758 | 279 return 0; |
280 } | |
296 | 281 memset(sh_audio->a_buffer,0,sh_audio->a_buffer_size); |
282 sh_audio->a_buffer_len=0; | |
283 | |
303 | 284 switch(driver){ |
1517
0e9c29538a86
Use USE_WIN32DLL define instead of ARCH_X86 to decide whether or not to compile
jkeil
parents:
1485
diff
changeset
|
285 #ifdef USE_WIN32DLL |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
286 case AFM_ACM: { |
758 | 287 int ret=acm_decode_audio(sh_audio,sh_audio->a_buffer,4096,sh_audio->a_buffer_size); |
296 | 288 if(ret<0){ |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1927
diff
changeset
|
289 mp_msg(MSGT_DECAUDIO,MSGL_INFO,"ACM decoding error: %d\n",ret); |
303 | 290 driver=0; |
296 | 291 } |
640 | 292 sh_audio->a_buffer_len=ret; |
303 | 293 break; |
296 | 294 } |
1309
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1291
diff
changeset
|
295 #endif |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
296 case AFM_PCM: { |
296 | 297 // 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
|
298 WAVEFORMATEX *h=sh_audio->wf; |
746 | 299 sh_audio->i_bps=h->nAvgBytesPerSec; |
296 | 300 sh_audio->channels=h->nChannels; |
301 sh_audio->samplerate=h->nSamplesPerSec; | |
302 sh_audio->samplesize=(h->wBitsPerSample+7)/8; | |
758 | 303 switch(sh_audio->format){ // hardware formats: |
304 case 0x6: sh_audio->sample_format=AFMT_A_LAW;break; | |
305 case 0x7: sh_audio->sample_format=AFMT_MU_LAW;break; | |
306 case 0x11: sh_audio->sample_format=AFMT_IMA_ADPCM;break; | |
307 case 0x50: sh_audio->sample_format=AFMT_MPEG;break; | |
308 // case 0x2000: sh_audio->sample_format=AFMT_AC3; | |
309 default: sh_audio->sample_format=(sh_audio->samplesize==2)?AFMT_S16_LE:AFMT_U8; | |
310 } | |
401 | 311 break; |
312 } | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
313 case AFM_DVDPCM: { |
401 | 314 // DVD PCM Audio: |
315 sh_audio->channels=2; | |
316 sh_audio->samplerate=48000; | |
746 | 317 sh_audio->i_bps=2*2*48000; |
296 | 318 // sh_audio->pcm_bswap=1; |
303 | 319 break; |
320 } | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
321 case AFM_AC3: { |
296 | 322 // Dolby AC3 audio: |
1289 | 323 dec_audio_sh=sh_audio; // save sh_audio for the callback: |
296 | 324 ac3_config.fill_buffer_callback = ac3_fill_buffer; |
325 ac3_config.num_output_ch = 2; | |
326 ac3_config.flags = 0; | |
327 #ifdef HAVE_MMX | |
328 ac3_config.flags |= AC3_MMX_ENABLE; | |
329 #endif | |
330 #ifdef HAVE_3DNOW | |
331 ac3_config.flags |= AC3_3DNOW_ENABLE; | |
332 #endif | |
333 ac3_init(); | |
334 sh_audio->ac3_frame = ac3_decode_frame(); | |
335 if(sh_audio->ac3_frame){ | |
746 | 336 ac3_frame_t* fr=(ac3_frame_t*)sh_audio->ac3_frame; |
337 sh_audio->samplerate=fr->sampling_rate; | |
296 | 338 sh_audio->channels=2; |
746 | 339 // 1 frame: 6*256 samples 1 sec: sh_audio->samplerate samples |
340 //sh_audio->i_bps=fr->frame_size*fr->sampling_rate/(6*256); | |
341 sh_audio->i_bps=fr->bit_rate*(1000/8); | |
303 | 342 } else { |
343 driver=0; // bad frame -> disable audio | |
344 } | |
345 break; | |
346 } | |
1528
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
347 case AFM_HWAC3: { |
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
348 unsigned char *buffer; |
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
349 struct hwac3info ai; |
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
350 int len, skipped; |
1529 | 351 len = ds_get_packet(sh_audio->ds, &buffer); // maybe 1 packet is not enough, |
352 // at least for mpeg, PS packets contain about max. 2000 bytes of data. | |
1528
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
353 if(ac3_iec958_parse_syncinfo(buffer, len, &ai, &skipped) < 0) { |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1927
diff
changeset
|
354 mp_msg(MSGT_DECAUDIO,MSGL_ERR, MSGTR_AC3notvalid); |
1528
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
355 driver = 0; |
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
356 break; |
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
357 } |
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
358 if(ai.samplerate != 48000) { |
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_AC3only48k); |
1528
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
360 driver = 0; |
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
361 break; |
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
362 } |
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
363 sh_audio->samplerate=ai.samplerate; |
1529 | 364 sh_audio->samplesize=ai.framesize; |
1528
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
365 sh_audio->channels=1; |
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
366 sh_audio->i_bps=ai.bitrate*(1000/8); |
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
367 sh_audio->ac3_frame=malloc(6144); |
1529 | 368 sh_audio->o_bps=sh_audio->i_bps; // XXX FIXME!!! XXX |
1528
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
369 break; |
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
370 } |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
371 case AFM_ALAW: { |
296 | 372 // 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
|
373 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
|
374 sh_audio->samplerate=sh_audio->wf->nSamplesPerSec; |
746 | 375 sh_audio->i_bps=sh_audio->channels*sh_audio->samplerate; |
303 | 376 break; |
377 } | |
1927 | 378 #ifdef USE_LIBAVCODEC |
379 case AFM_FFMPEG: { | |
380 int x; | |
381 mp_msg(MSGT_DECAUDIO,MSGL_V,"FFmpeg's libavcodec audio codec\n"); | |
382 if(!avcodec_inited){ | |
383 avcodec_init(); | |
384 avcodec_register_all(); | |
385 avcodec_inited=1; | |
386 } | |
387 lavc_codec = (AVCodec *)avcodec_find_decoder_by_name(sh_audio->codec->dll); | |
388 if(!lavc_codec){ | |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1927
diff
changeset
|
389 mp_msg(MSGT_DECAUDIO,MSGL_ERR,MSGTR_MissingLAVCcodec,sh_audio->codec->dll); |
1927 | 390 return 0; |
391 } | |
392 memset(&lavc_context, 0, sizeof(lavc_context)); | |
393 /* open it */ | |
394 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
|
395 mp_msg(MSGT_DECAUDIO,MSGL_ERR, MSGTR_CantOpenCodec); |
1927 | 396 return 0; |
397 } | |
398 mp_msg(MSGT_DECAUDIO,MSGL_V,"INFO: libavcodec init OK!\n"); | |
399 | |
400 // Decode at least 1 byte: (to get header filled) | |
401 x=decode_audio(sh_audio,sh_audio->a_buffer,1,sh_audio->a_buffer_size); | |
402 if(x>0) sh_audio->a_buffer_len=x; | |
403 | |
404 #if 1 | |
405 sh_audio->channels=lavc_context.channels; | |
406 sh_audio->samplerate=lavc_context.sample_rate; | |
407 sh_audio->i_bps=lavc_context.bit_rate/8; | |
408 #else | |
409 sh_audio->channels=sh_audio->wf->nChannels; | |
410 sh_audio->samplerate=sh_audio->wf->nSamplesPerSec; | |
411 sh_audio->i_bps=sh_audio->wf->nAvgBytesPerSec; | |
412 #endif | |
413 break; | |
414 } | |
415 #endif | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
416 case AFM_GSM: { |
296 | 417 // MS-GSM audio codec: |
418 GSM_Init(); | |
432
5251b0c57e39
sh_audio->wf and sh_video->bih changed to dynamic (thanx to Jens Hoffmann)
arpi_esp
parents:
401
diff
changeset
|
419 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
|
420 sh_audio->samplerate=sh_audio->wf->nSamplesPerSec; |
746 | 421 // decodes 65 byte -> 320 short |
422 // 1 sec: sh_audio->channels*sh_audio->samplerate samples | |
423 // 1 frame: 320 samples | |
424 sh_audio->i_bps=65*(sh_audio->channels*sh_audio->samplerate)/320; // 1:10 | |
303 | 425 break; |
296 | 426 } |
2420 | 427 case AFM_IMA4: { |
428 // IMA-ADPCM 4:1 audio codec: | |
429 sh_audio->channels=sh_audio->wf->nChannels; | |
430 sh_audio->samplerate=sh_audio->wf->nSamplesPerSec; | |
431 // decodes 34 byte -> 64 short | |
432 sh_audio->i_bps=IMA4_BLOCK_SIZE*(sh_audio->channels*sh_audio->samplerate)/IMA4_SAMPLES_PER_BLOCK; // 1:4 | |
433 break; | |
434 } | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
435 case AFM_MPEG: { |
296 | 436 // MPEG Audio: |
1289 | 437 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
|
438 #ifdef USE_FAKE_MONO |
e14114170e01
applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents:
640
diff
changeset
|
439 MP3_Init(fakemono); |
e14114170e01
applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents:
640
diff
changeset
|
440 #else |
296 | 441 MP3_Init(); |
732
e14114170e01
applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents:
640
diff
changeset
|
442 #endif |
296 | 443 MP3_samplerate=MP3_channels=0; |
444 // printf("[\n"); | |
445 sh_audio->a_buffer_len=MP3_DecodeFrame(sh_audio->a_buffer,-1); | |
446 // printf("]\n"); | |
447 sh_audio->channels=2; // hack | |
448 sh_audio->samplerate=MP3_samplerate; | |
746 | 449 sh_audio->i_bps=MP3_bitrate*(1000/8); |
303 | 450 break; |
451 } | |
1828 | 452 #ifdef HAVE_OGGVORBIS |
453 case AFM_VORBIS: { | |
454 // OggVorbis Audio: | |
455 #if 0 /* just here for reference - atmos */ | |
456 ogg_sync_state oy; /* sync and verify incoming physical bitstream */ | |
457 ogg_stream_state os; /* take physical pages, weld into a logical | |
458 stream of packets */ | |
459 ogg_page og; /* one Ogg bitstream page. Vorbis packets are inside */ | |
460 ogg_packet op; /* one raw packet of data for decode */ | |
461 | |
462 vorbis_info vi; /* struct that stores all the static vorbis bitstream | |
463 settings */ | |
464 vorbis_comment vc; /* struct that stores all the bitstream user comments */ | |
465 vorbis_dsp_state vd; /* central working state for the packet->PCM decoder */ | |
466 vorbis_block vb; /* local working space for packet->PCM decode */ | |
467 #else | |
468 /* nix, nada, rien, nothing, nem, nüx */ | |
469 #endif | |
470 | |
471 uint32_t hdrsizes[3];/* stores vorbis header sizes from AVI audio header, | |
472 maybe use ogg_uint32_t */ | |
473 //int i; | |
474 int ret; | |
475 char *buffer; | |
476 ogg_packet hdr; | |
477 //ov_struct_t *s=&sh_audio->ov; | |
478 sh_audio->ov=malloc(sizeof(ov_struct_t)); | |
479 //s=&sh_audio->ov; | |
480 | |
481 vorbis_info_init(&sh_audio->ov->vi); | |
482 vorbis_comment_init(&sh_audio->ov->vc); | |
483 | |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
484 mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"OggVorbis: cbsize: %i\n", sh_audio->wf->cbSize); |
1828 | 485 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
|
486 mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"OggVorbis: Read header sizes: initial: %i comment: %i codebook: %i\n", hdrsizes[0], hdrsizes[1], hdrsizes[2]); |
1828 | 487 /*for(i=12; i <= 40; i+=2) { // header bruteforce :) |
488 memcpy(hdrsizes, ((unsigned char*)sh_audio->wf)+i, 3*sizeof(uint32_t)); | |
489 printf("OggVorbis: Read header sizes (%i): %ld %ld %ld\n", i, hdrsizes[0], hdrsizes[1], hdrsizes[2]); | |
490 }*/ | |
491 | |
492 /* read headers */ // FIXME disable sound on errors here, we absolutely need this headers! - atmos | |
493 hdr.packet=NULL; | |
494 hdr.b_o_s = 1; /* beginning of stream for first packet */ | |
495 hdr.bytes = hdrsizes[0]; | |
496 hdr.packet = realloc(hdr.packet,hdr.bytes); | |
497 memcpy(hdr.packet,((unsigned char*)sh_audio->wf)+2*sizeof(WAVEFORMATEX)+3*sizeof(uint32_t),hdr.bytes); | |
498 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
|
499 mp_msg(MSGT_DECAUDIO,MSGL_WARN,"OggVorbis: initial (identification) header broken!\n"); |
1828 | 500 hdr.b_o_s = 0; |
501 hdr.bytes = hdrsizes[1]; | |
502 hdr.packet = realloc(hdr.packet,hdr.bytes); | |
503 memcpy(hdr.packet,((unsigned char*)sh_audio->wf)+2*sizeof(WAVEFORMATEX)+3*sizeof(uint32_t)+hdrsizes[0],hdr.bytes); | |
504 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
|
505 mp_msg(MSGT_DECAUDIO,MSGL_WARN,"OggVorbis: comment header broken!\n"); |
1828 | 506 hdr.bytes = hdrsizes[2]; |
507 hdr.packet = realloc(hdr.packet,hdr.bytes); | |
508 memcpy(hdr.packet,((unsigned char*)sh_audio->wf)+2*sizeof(WAVEFORMATEX)+3*sizeof(uint32_t)+hdrsizes[0]+hdrsizes[1],hdr.bytes); | |
509 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
|
510 mp_msg(MSGT_DECAUDIO,MSGL_WARN,"OggVorbis: codebook header broken!\n"); |
1828 | 511 hdr.bytes=0; |
512 hdr.packet = realloc(hdr.packet,hdr.bytes); /* free */ | |
513 /* done with the headers */ | |
514 | |
515 | |
516 /* Throw the comments plus a few lines about the bitstream we're | |
517 decoding */ | |
518 { | |
519 char **ptr=sh_audio->ov->vc.user_comments; | |
520 while(*ptr){ | |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
521 mp_msg(MSGT_DECAUDIO,MSGL_V,"OggVorbisComment: %s\n",*ptr); |
1828 | 522 ++ptr; |
523 } | |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
524 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
|
525 mp_msg(MSGT_DECAUDIO,MSGL_V,"OggVorbis: Encoded by: %s\n",sh_audio->ov->vc.vendor); |
1828 | 526 } |
527 sh_audio->channels=sh_audio->ov->vi.channels; | |
528 sh_audio->samplerate=sh_audio->ov->vi.rate; | |
529 sh_audio->i_bps=sh_audio->ov->vi.bitrate_nominal/8; | |
530 | |
531 // printf("[\n"); | |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
532 // sh_audio->a_buffer_len=sh_audio->audio_out_minsize;///ov->vi.channels; |
1828 | 533 // printf("]\n"); |
534 | |
535 /* OK, got and parsed all three headers. Initialize the Vorbis | |
536 packet->PCM decoder. */ | |
537 vorbis_synthesis_init(&sh_audio->ov->vd,&sh_audio->ov->vi); /* central decode state */ | |
538 vorbis_block_init(&sh_audio->ov->vd,&sh_audio->ov->vb); /* local state for most of the decode | |
539 so multiple block decodes can | |
540 proceed in parallel. We could init | |
541 multiple vorbis_block structures | |
542 for vd here */ | |
543 //printf("OggVorbis: synthesis and block init done.\n"); | |
544 ogg_sync_init(&sh_audio->ov->oy); /* Now we can read pages */ | |
545 | |
546 while((ret = ogg_sync_pageout(&sh_audio->ov->oy,&sh_audio->ov->og))!=1) { | |
547 if(ret == -1) | |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
548 mp_msg(MSGT_DECAUDIO,MSGL_WARN,"OggVorbis: Pageout: not properly synced, had to skip some bytes.\n"); |
1828 | 549 else |
550 if(ret == 0) { | |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
551 mp_msg(MSGT_DECAUDIO,MSGL_V,"OggVorbis: Pageout: need more data to verify page, reading more data.\n"); |
1828 | 552 /* 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
|
553 buffer=ogg_sync_buffer(&sh_audio->ov->oy,256); |
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
554 ogg_sync_wrote(&sh_audio->ov->oy,demux_read_data(sh_audio->ds,buffer,256)); |
1828 | 555 } |
556 } | |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
557 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
|
558 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
|
559 as they'll also become apparent |
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
560 at packetout */ |
1828 | 561 |
562 /* Get the serial number and set up the rest of decode. */ | |
563 /* serialno first; use it to set up a logical stream */ | |
564 ogg_stream_init(&sh_audio->ov->os,ogg_page_serialno(&sh_audio->ov->og)); | |
565 | |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
566 mp_msg(MSGT_DECAUDIO,MSGL_V,"OggVorbis: Init OK!\n"); |
1828 | 567 |
568 break; | |
569 } | |
570 #endif | |
2415 | 571 |
572 #ifdef USE_LIBMAD | |
573 case AFM_MAD: | |
574 { | |
575 printf(__FILE__ ":%d:mad: initialising\n", __LINE__); | |
576 mad_frame_init(&mad_frame); | |
577 mad_stream_init(&mad_stream); | |
578 | |
579 printf(__FILE__ ":%d:mad: preparing buffer\n", __LINE__); | |
580 mad_prepare_buffer(sh_audio, &mad_stream, sh_audio->a_in_buffer_size); | |
581 mad_stream_buffer(&mad_stream, (unsigned char*)(sh_audio->a_in_buffer), sh_audio->a_in_buffer_len); | |
582 mad_stream_sync(&mad_stream); | |
583 mad_synth_init(&mad_synth); | |
584 | |
585 if(mad_frame_decode(&mad_frame, &mad_stream) == 0) | |
586 { | |
587 printf(__FILE__ ":%d:mad: post processing buffer\n", __LINE__); | |
588 mad_postprocess_buffer(sh_audio, &mad_stream); | |
589 } | |
590 else | |
591 { | |
592 printf(__FILE__ ":%d:mad: frame decoding failed\n", __LINE__); | |
593 } | |
594 | |
2434
571538d73e08
audio channels nr is identified from libmad's channel mode
alex
parents:
2432
diff
changeset
|
595 switch (mad_frame.header.mode) |
571538d73e08
audio channels nr is identified from libmad's channel mode
alex
parents:
2432
diff
changeset
|
596 { |
571538d73e08
audio channels nr is identified from libmad's channel mode
alex
parents:
2432
diff
changeset
|
597 case MAD_MODE_SINGLE_CHANNEL: |
571538d73e08
audio channels nr is identified from libmad's channel mode
alex
parents:
2432
diff
changeset
|
598 sh_audio->channels=1; |
571538d73e08
audio channels nr is identified from libmad's channel mode
alex
parents:
2432
diff
changeset
|
599 break; |
571538d73e08
audio channels nr is identified from libmad's channel mode
alex
parents:
2432
diff
changeset
|
600 case MAD_MODE_DUAL_CHANNEL: |
571538d73e08
audio channels nr is identified from libmad's channel mode
alex
parents:
2432
diff
changeset
|
601 case MAD_MODE_JOINT_STEREO: |
571538d73e08
audio channels nr is identified from libmad's channel mode
alex
parents:
2432
diff
changeset
|
602 case MAD_MODE_STEREO: |
571538d73e08
audio channels nr is identified from libmad's channel mode
alex
parents:
2432
diff
changeset
|
603 sh_audio->channels=2; |
571538d73e08
audio channels nr is identified from libmad's channel mode
alex
parents:
2432
diff
changeset
|
604 break; |
571538d73e08
audio channels nr is identified from libmad's channel mode
alex
parents:
2432
diff
changeset
|
605 default: |
571538d73e08
audio channels nr is identified from libmad's channel mode
alex
parents:
2432
diff
changeset
|
606 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
|
607 } |
571538d73e08
audio channels nr is identified from libmad's channel mode
alex
parents:
2432
diff
changeset
|
608 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
|
609 sh_audio->channels, mad_frame.header.mode); |
2432 | 610 /* var. name changed in 0.13.0 (beta) (libmad/CHANGES) -- alex */ |
611 #if (MAD_VERSION_MAJOR >= 0) && (MAD_VERSION_MINOR >= 13) | |
612 sh_audio->samplerate=mad_frame.header.samplerate; | |
613 #else | |
2415 | 614 sh_audio->samplerate=mad_frame.header.sfreq; |
2432 | 615 #endif |
2415 | 616 sh_audio->i_bps=mad_frame.header.bitrate; |
617 printf(__FILE__ ":%d:mad: continuing\n", __LINE__); | |
618 break; | |
619 } | |
620 #endif | |
296 | 621 } |
622 | |
623 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
|
624 mp_msg(MSGT_DECAUDIO,MSGL_WARN,MSGTR_UnknownAudio); |
303 | 625 driver=0; |
296 | 626 } |
627 | |
303 | 628 if(!driver){ |
629 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
|
630 sh_audio->a_buffer=NULL; |
303 | 631 return 0; |
632 } | |
296 | 633 |
1529 | 634 if(!sh_audio->o_bps) |
303 | 635 sh_audio->o_bps=sh_audio->channels*sh_audio->samplerate*sh_audio->samplesize; |
636 return driver; | |
296 | 637 } |
291 | 638 |
746 | 639 // Audio decoding: |
291 | 640 |
746 | 641 // Decode a single frame (mp3,acm etc) or 'minlen' bytes (pcm/alaw etc) |
642 // buffer length is 'maxlen' bytes, it shouldn't be exceeded... | |
643 | |
644 int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen){ | |
291 | 645 int len=-1; |
303 | 646 switch(sh_audio->codec->driver){ |
1927 | 647 #ifdef USE_LIBAVCODEC |
648 case AFM_FFMPEG: { | |
649 unsigned char *start=NULL; | |
650 int y; | |
651 while(len<minlen){ | |
652 int len2=0; | |
653 int x=ds_get_packet(sh_audio->ds,&start); | |
654 if(x<=0) break; // error | |
2049
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
1973
diff
changeset
|
655 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
|
656 if(y<0){ mp_msg(MSGT_DECAUDIO,MSGL_V,"lavc_audio: error\n");break; } |
1927 | 657 if(y<x) sh_audio->ds->buffer_pos+=y-x; // put back data (HACK!) |
658 if(len2>0){ | |
659 //len=len2;break; | |
660 if(len<0) len=len2; else len+=len2; | |
661 buf+=len2; | |
662 } | |
663 mp_dbg(MSGT_DECAUDIO,MSGL_DBG2,"Decoded %d -> %d \n",y,len2); | |
664 } | |
665 } | |
666 break; | |
667 #endif | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
668 case AFM_MPEG: // MPEG layer 2 or 3 |
291 | 669 len=MP3_DecodeFrame(buf,-1); |
1485
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
670 // len=MP3_DecodeFrame(buf,3); |
291 | 671 break; |
1830 | 672 #ifdef HAVE_OGGVORBIS |
1828 | 673 case AFM_VORBIS: { // OggVorbis |
674 /* note: good minlen would be 4k or 8k IMHO - atmos */ | |
675 int ret; | |
676 char *buffer; | |
677 int bytes; | |
678 int samples; | |
679 float **pcm; | |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
680 //ogg_int16_t convbuffer[4096]; |
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
681 // int convsize; |
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
682 int readlen=1024; |
1834
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
683 len=0; |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
684 // 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
|
685 |
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
686 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
|
687 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
|
688 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
|
689 if(ret==0) { |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
690 int xxx=0; |
1834
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
691 //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
|
692 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
|
693 if(ret == -1) |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
694 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
|
695 else |
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
696 if(ret == 0) { |
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
697 //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
|
698 /* 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
|
699 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
|
700 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
|
701 xxx+=bytes; |
1834
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
702 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
|
703 if(bytes==0) |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
704 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
|
705 } |
1828 | 706 } |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
707 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
|
708 //printf("OggVorbis: Pageout: successfull, pagin in.\n"); |
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
709 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
|
710 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
|
711 break; |
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
712 } else if(ret<0) { |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
713 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
|
714 break; |
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
715 } else { |
1828 | 716 |
717 /* we have a packet. Decode it */ | |
718 | |
719 if(vorbis_synthesis(&sh_audio->ov->vb,&sh_audio->ov->op)==0) /* test for success! */ | |
720 vorbis_synthesis_blockin(&sh_audio->ov->vd,&sh_audio->ov->vb); | |
721 | |
722 /* **pcm is a multichannel float vector. In stereo, for | |
723 example, pcm[0] is left, and pcm[1] is right. samples is | |
724 the size of each channel. Convert the float values | |
725 (-1.<=range<=1.) to whatever PCM format and write it out */ | |
726 | |
727 while((samples=vorbis_synthesis_pcmout(&sh_audio->ov->vd,&pcm))>0){ | |
728 int i,j; | |
729 int clipflag=0; | |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
730 int convsize=(maxlen-len)/(2*sh_audio->ov->vi.channels); // max size! |
1828 | 731 int bout=(samples<convsize?samples:convsize); |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
732 |
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
733 if(bout<=0) break; |
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
734 |
1828 | 735 /* convert floats to 16 bit signed ints (host order) and |
736 interleave */ | |
737 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
|
738 ogg_int16_t *convbuffer=(ogg_int16_t *)(&buf[len]); |
1828 | 739 ogg_int16_t *ptr=convbuffer+i; |
740 float *mono=pcm[i]; | |
741 for(j=0;j<bout;j++){ | |
742 #if 1 | |
743 int val=mono[j]*32767.f; | |
744 #else /* optional dither */ | |
745 int val=mono[j]*32767.f+drand48()-0.5f; | |
746 #endif | |
747 /* might as well guard against clipping */ | |
748 if(val>32767){ | |
749 val=32767; | |
750 clipflag=1; | |
751 } | |
752 if(val<-32768){ | |
753 val=-32768; | |
754 clipflag=1; | |
755 } | |
756 *ptr=val; | |
757 ptr+=sh_audio->ov->vi.channels; | |
758 } | |
759 } | |
760 | |
761 if(clipflag) | |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
762 mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"Clipping in frame %ld\n",(long)(sh_audio->ov->vd.sequence)); |
1828 | 763 |
764 //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
|
765 //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
|
766 len+=2*sh_audio->ov->vi.channels*bout; |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
767 |
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
768 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
|
769 |
1828 | 770 vorbis_synthesis_read(&sh_audio->ov->vd,bout); /* tell libvorbis how |
771 many samples we | |
772 actually consumed */ | |
773 } | |
1834
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
774 } // from else, packetout ok |
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
775 } // while len |
3f8da9408f04
Now oggvorbis decoding properly works, but a/v sync is bad.
atmos4
parents:
1831
diff
changeset
|
776 } // outer while len |
1828 | 777 if(ogg_page_eos(&sh_audio->ov->og)) |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
778 mp_msg(MSGT_DECAUDIO,MSGL_V,"OggVorbis: End of Stream reached!\n"); // FIXME clearup decoder, notify mplayer - atmos |
1828 | 779 |
1837
9fd8b5e0b864
ogg/vorbis stuff cleanup, buffering fixes, printf->mp_msg
arpi
parents:
1834
diff
changeset
|
780 mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"\n[len: %d ]\n",len); |
1828 | 781 |
782 break; | |
1831 | 783 } |
1830 | 784 #endif |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
785 case AFM_PCM: // AVI PCM |
1058 | 786 len=demux_read_data(sh_audio->ds,buf,minlen); |
401 | 787 break; |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
788 case AFM_DVDPCM: // DVD PCM |
401 | 789 { int j; |
746 | 790 len=demux_read_data(sh_audio->ds,buf,minlen); |
291 | 791 //if(i&1){ printf("Warning! pcm_audio_size&1 !=0 (%d)\n",i);i&=~1; } |
746 | 792 // swap endian: |
291 | 793 for(j=0;j<len;j+=2){ |
794 char x=buf[j]; | |
795 buf[j]=buf[j+1]; | |
796 buf[j+1]=x; | |
797 } | |
798 break; | |
799 } | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
800 case AFM_ALAW: // aLaw decoder |
746 | 801 { int l=demux_read_data(sh_audio->ds,buf,minlen/2); |
291 | 802 unsigned short *d=(unsigned short *) buf; |
803 unsigned char *s=buf; | |
804 len=2*l; | |
758 | 805 if(sh_audio->format==6){ |
806 // aLaw | |
883 | 807 while(l>0){ --l; d[l]=alaw2short[s[l]]; } |
758 | 808 } else { |
809 // uLaw | |
883 | 810 while(l>0){ --l; d[l]=ulaw2short[s[l]]; } |
291 | 811 } |
812 break; | |
813 } | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
814 case AFM_GSM: // MS-GSM decoder |
2420 | 815 { unsigned char ibuf[65]; // 65 bytes / frame |
816 if(demux_read_data(sh_audio->ds,ibuf,65)!=65) break; // EOF | |
817 XA_MSGSM_Decoder(ibuf,(unsigned short *) buf); // decodes 65 byte -> 320 short | |
746 | 818 // XA_GSM_Decoder(buf,(unsigned short *) &sh_audio->a_buffer[sh_audio->a_buffer_len]); // decodes 33 byte -> 160 short |
819 len=2*320; | |
291 | 820 break; |
821 } | |
2420 | 822 case AFM_IMA4: // IMA-ADPCM 4:1 audio codec: |
823 { unsigned char ibuf[IMA4_BLOCK_SIZE]; // bytes / frame | |
824 if(demux_read_data(sh_audio->ds,ibuf,IMA4_BLOCK_SIZE)!=IMA4_BLOCK_SIZE) break; // EOF | |
2424 | 825 len=2*ima4_decode_block((unsigned short*)buf,ibuf,2*IMA4_SAMPLES_PER_BLOCK); |
2420 | 826 break; |
827 } | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
828 case AFM_AC3: // AC3 decoder |
291 | 829 //printf("{1:%d}",avi_header.idx_pos);fflush(stdout); |
830 if(!sh_audio->ac3_frame) sh_audio->ac3_frame=ac3_decode_frame(); | |
831 //printf("{2:%d}",avi_header.idx_pos);fflush(stdout); | |
832 if(sh_audio->ac3_frame){ | |
296 | 833 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
|
834 memcpy(buf,((ac3_frame_t*)sh_audio->ac3_frame)->audio_data,len); |
291 | 835 sh_audio->ac3_frame=NULL; |
836 } | |
837 //printf("{3:%d}",avi_header.idx_pos);fflush(stdout); | |
838 break; | |
1528
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
839 case AFM_HWAC3: // AC3 through SPDIF |
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
840 if(demux_read_data(sh_audio->ds,sh_audio->ac3_frame, 6144) != 6144) |
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
841 break; //EOF |
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
842 ac3_iec958_build_burst(1536, 0x1F, 1, buf, sh_audio->ac3_frame); |
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
843 len = 6144; |
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
844 break; |
1517
0e9c29538a86
Use USE_WIN32DLL define instead of ARCH_X86 to decide whether or not to compile
jkeil
parents:
1485
diff
changeset
|
845 #ifdef USE_WIN32DLL |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
846 case AFM_ACM: |
758 | 847 // len=sh_audio->audio_out_minsize; // optimal decoded fragment size |
848 // if(len<minlen) len=minlen; else | |
849 // if(len>maxlen) len=maxlen; | |
850 // len=acm_decode_audio(sh_audio,buf,len); | |
851 len=acm_decode_audio(sh_audio,buf,minlen,maxlen); | |
291 | 852 break; |
1309
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1291
diff
changeset
|
853 #endif |
746 | 854 |
291 | 855 #ifdef USE_DIRECTSHOW |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
856 case AFM_DSHOW: // DirectShow |
1327
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
857 { int size_in=0; |
291 | 858 int size_out=0; |
859 int srcsize=DS_AudioDecoder_GetSrcSize(maxlen); | |
1567 | 860 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 | 861 if(srcsize>sh_audio->a_in_buffer_size) srcsize=sh_audio->a_in_buffer_size; // !!!!!! |
862 if(sh_audio->a_in_buffer_len<srcsize){ | |
863 sh_audio->a_in_buffer_len+= | |
864 demux_read_data(sh_audio->ds,&sh_audio->a_in_buffer[sh_audio->a_in_buffer_len], | |
865 srcsize-sh_audio->a_in_buffer_len); | |
866 } | |
867 DS_AudioDecoder_Convert(sh_audio->a_in_buffer,sh_audio->a_in_buffer_len, | |
868 buf,maxlen, &size_in,&size_out); | |
1567 | 869 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 | 870 if(size_in>=sh_audio->a_in_buffer_len){ |
871 sh_audio->a_in_buffer_len=0; | |
872 } else { | |
873 sh_audio->a_in_buffer_len-=size_in; | |
874 memcpy(sh_audio->a_in_buffer,&sh_audio->a_in_buffer[size_in],sh_audio->a_in_buffer_len); | |
875 } | |
876 len=size_out; | |
877 break; | |
878 } | |
879 #endif | |
2415 | 880 |
881 #ifdef USE_LIBMAD | |
882 case AFM_MAD: | |
883 { | |
884 mad_prepare_buffer(sh_audio, &mad_stream, sh_audio->a_in_buffer_size); | |
885 mad_stream_buffer(&mad_stream, sh_audio->a_in_buffer, sh_audio->a_in_buffer_len); | |
886 if(mad_frame_decode(&mad_frame, &mad_stream) == 0) | |
887 { | |
888 mad_synth_frame(&mad_synth, &mad_frame); | |
889 mad_postprocess_buffer(sh_audio, &mad_stream); | |
890 | |
891 /* and fill buffer */ | |
892 | |
893 { | |
894 int i; | |
895 int end_size = mad_synth.pcm.length; | |
896 signed short* samples = (signed short*)buf; | |
897 if(end_size > maxlen/4) | |
898 end_size=maxlen/4; | |
899 | |
900 for(i=0; i<mad_synth.pcm.length; ++i) { | |
901 *samples++ = mad_scale(mad_synth.pcm.samples[0][i]); | |
902 *samples++ = mad_scale(mad_synth.pcm.samples[0][i]); | |
903 // *buf++ = mad_scale(mad_synth.pcm.sampAles[1][i]); | |
904 } | |
905 len = end_size*4; | |
906 } | |
907 } | |
908 else | |
909 { | |
910 printf(__FILE__ ":%d:mad: frame decoding failed\n", __LINE__); | |
911 } | |
912 | |
913 break; | |
914 } | |
915 #endif | |
291 | 916 } |
917 return len; | |
918 } | |
919 | |
1327
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
920 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
|
921 switch(sh_audio->codec->driver){ |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
922 case AFM_MPEG: |
1327
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
923 MP3_DecodeFrame(NULL,-2); // resync |
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
924 MP3_DecodeFrame(NULL,-2); // resync |
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
925 MP3_DecodeFrame(NULL,-2); // resync |
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
926 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
|
927 #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
|
928 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
|
929 //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
|
930 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
|
931 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
|
932 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
|
933 #endif |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
934 case AFM_AC3: |
1327
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
935 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
|
936 // 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
|
937 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
|
938 // if(verbose) printf(" OK!\n"); |
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
939 break; |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
940 case AFM_ACM: |
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
941 case AFM_DSHOW: |
1528
a444bd456fcc
ac3/spdif patch by German Gomez Garcia <german@piraos.com>
arpi
parents:
1517
diff
changeset
|
942 case AFM_HWAC3: |
1327
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
943 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
|
944 break; |
2415 | 945 |
946 #ifdef USE_LIBMAD | |
947 case AFM_MAD: | |
948 mad_prepare_buffer(sh_audio, &mad_stream, sh_audio->a_in_buffer_size); | |
949 mad_stream_buffer(&mad_stream, sh_audio->a_in_buffer, sh_audio->a_in_buffer_len); | |
950 mad_stream_sync(&mad_stream); | |
951 mad_postprocess_buffer(sh_audio, &mad_stream); | |
952 break; | |
2418 | 953 #endif |
1327
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
954 } |
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
955 } |
291 | 956 |
1327
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
957 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
|
958 switch(sh_audio->codec->driver){ |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
959 case AFM_MPEG: MP3_DecodeFrame(NULL,-2);break; // skip MPEG frame |
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
960 case AFM_AC3: sh_audio->ac3_frame=ac3_decode_frame();break; // skip AC3 frame |
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
961 case AFM_ACM: |
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
962 case AFM_DSHOW: { |
1408 | 963 int skip=sh_audio->wf->nBlockAlign; |
964 if(skip<16){ | |
965 skip=(sh_audio->wf->nAvgBytesPerSec/16)&(~7); | |
966 if(skip<16) skip=16; | |
967 } | |
968 demux_read_data(sh_audio->ds,NULL,skip); | |
969 break; | |
970 } | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
971 case AFM_PCM: |
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
972 case AFM_DVDPCM: |
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1408
diff
changeset
|
973 case AFM_ALAW: { |
1408 | 974 int skip=sh_audio->i_bps/16; |
975 skip=skip&(~3); | |
976 demux_read_data(sh_audio->ds,NULL,skip); | |
977 break; | |
978 } | |
2415 | 979 #ifdef USE_LIBMAD |
980 case AFM_MAD: | |
981 { | |
982 mad_prepare_buffer(sh_audio, &mad_stream, sh_audio->a_in_buffer_size); | |
983 mad_stream_buffer(&mad_stream, sh_audio->a_in_buffer, sh_audio->a_in_buffer_len); | |
984 mad_stream_skip(&mad_stream, 2); | |
985 mad_stream_sync(&mad_stream); | |
986 mad_postprocess_buffer(sh_audio, &mad_stream); | |
987 break; | |
988 } | |
989 #endif | |
990 | |
1327
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
991 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
|
992 } |
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1320
diff
changeset
|
993 } |