Mercurial > mplayer.hg
annotate dec_audio.c @ 1320:18374d49befa
On big-endian architectures, all audio decoders default to big-endian 16-bit
audio sample format.
Add support to play both big- and little-endian 16-bit audio format to the
sun audio_out driver.
author | jkeil |
---|---|
date | Sat, 14 Jul 2001 16:58:55 +0000 |
parents | d797ecb9778f |
children | b12e1817bcc2 |
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> |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
4 |
1038
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents:
1020
diff
changeset
|
5 #include "config.h" |
1058 | 6 #include "libao2/afmt.h" |
758 | 7 |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
8 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
|
9 |
732
e14114170e01
applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents:
640
diff
changeset
|
10 #ifdef USE_FAKE_MONO |
e14114170e01
applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents:
640
diff
changeset
|
11 int fakemono=0; |
e14114170e01
applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents:
640
diff
changeset
|
12 #endif |
e14114170e01
applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents:
640
diff
changeset
|
13 |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
14 #include "stream.h" |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
15 #include "demuxer.h" |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
16 |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
17 #include "wine/mmreg.h" |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
18 #include "wine/avifmt.h" |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
19 #include "wine/vfw.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 |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
24 #include "mp3lib/mp3.h" |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
25 #include "libac3/ac3.h" |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
26 |
883 | 27 #include "alaw.h" |
28 | |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
29 #include "xa/xa_gsm.h" |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
30 |
1291 | 31 #ifdef USE_DIRECTSHOW |
604 | 32 #include "loader/DirectShow/DS_AudioDec.h" |
1291 | 33 #endif |
1038
b36fb1ae4b53
applied solaris8/netbsd/other fixes patch by J¸«ärgen Keil <jk@tools.de>
arpi_esp
parents:
1020
diff
changeset
|
34 |
1289 | 35 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
|
36 |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
37 // AC3 decoder buffer callback: |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
38 static void ac3_fill_buffer(uint8_t **start,uint8_t **end){ |
1289 | 39 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
|
40 //printf("<ac3:%d>\n",len); |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
41 if(len<0) |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
42 *start = *end = NULL; |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
43 else |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
44 *end = *start + len; |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
45 } |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
432
diff
changeset
|
46 |
1289 | 47 // MP3 decoder buffer callback: |
48 int mplayer_audio_read(char *buf,int size){ | |
49 int len; | |
50 len=demux_read_data(dec_audio_sh->ds,buf,size); | |
51 return len; | |
52 } | |
53 | |
296 | 54 |
55 int init_audio(sh_audio_t *sh_audio){ | |
303 | 56 |
57 int driver=sh_audio->codec->driver; | |
296 | 58 |
604 | 59 extern int init_acm_audio_codec(sh_audio_t *sh_audio); |
758 | 60 //extern int acm_decode_audio(sh_audio_t *sh_audio, void* a_buffer,int len); |
61 extern int acm_decode_audio(sh_audio_t *sh_audio, void* a_buffer,int minlen,int maxlen); | |
604 | 62 |
296 | 63 sh_audio->samplesize=2; |
1320
18374d49befa
On big-endian architectures, all audio decoders default to big-endian 16-bit
jkeil
parents:
1313
diff
changeset
|
64 #if WORDS_BIGENDIAN |
18374d49befa
On big-endian architectures, all audio decoders default to big-endian 16-bit
jkeil
parents:
1313
diff
changeset
|
65 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
|
66 #else |
758 | 67 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
|
68 #endif |
303 | 69 sh_audio->samplerate=0; |
401 | 70 //sh_audio->pcm_bswap=0; |
303 | 71 |
758 | 72 sh_audio->a_buffer_size=0; |
303 | 73 sh_audio->a_buffer=NULL; |
296 | 74 |
746 | 75 sh_audio->a_in_buffer_len=0; |
76 | |
758 | 77 // setup required min. in/out buffer size: |
78 sh_audio->audio_out_minsize=8192;// default size, maybe not enough for Win32/ACM | |
79 | |
80 switch(driver){ | |
81 case 4: | |
1309
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1291
diff
changeset
|
82 #ifndef ARCH_X86 |
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1291
diff
changeset
|
83 printf("Win32/ACM audio codec unavailable on non-x86 CPU -> force nosound :(\n"); |
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1291
diff
changeset
|
84 driver=0; |
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1291
diff
changeset
|
85 #else |
296 | 86 // Win32 ACM audio codec: |
87 if(init_acm_audio_codec(sh_audio)){ | |
746 | 88 sh_audio->i_bps=sh_audio->wf->nAvgBytesPerSec; |
296 | 89 sh_audio->channels=sh_audio->o_wf.nChannels; |
90 sh_audio->samplerate=sh_audio->o_wf.nSamplesPerSec; | |
758 | 91 // if(sh_audio->audio_out_minsize>16384) sh_audio->audio_out_minsize=16384; |
92 // sh_audio->a_buffer_size=sh_audio->audio_out_minsize; | |
93 // if(sh_audio->a_buffer_size<sh_audio->audio_out_minsize+MAX_OUTBURST) | |
94 // sh_audio->a_buffer_size=sh_audio->audio_out_minsize+MAX_OUTBURST; | |
296 | 95 } else { |
96 printf("Could not load/initialize Win32/ACM AUDIO codec (missing DLL file?)\n"); | |
303 | 97 driver=0; |
296 | 98 } |
1309
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1291
diff
changeset
|
99 #endif |
758 | 100 break; |
101 case 7: | |
296 | 102 #ifndef USE_DIRECTSHOW |
103 printf("Compiled without DirectShow support -> force nosound :(\n"); | |
303 | 104 driver=0; |
296 | 105 #else |
106 // Win32 DShow audio codec: | |
340 | 107 // 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
|
108 if(DS_AudioDecoder_Open(sh_audio->codec->dll,&sh_audio->codec->guid,sh_audio->wf)){ |
303 | 109 printf("ERROR: Could not load/initialize Win32/DirctShow AUDIO codec: %s\n",sh_audio->codec->dll); |
110 driver=0; | |
111 } else { | |
746 | 112 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
|
113 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
|
114 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
|
115 sh_audio->audio_in_minsize=2*sh_audio->wf->nBlockAlign; |
296 | 116 if(sh_audio->audio_in_minsize<8192) sh_audio->audio_in_minsize=8192; |
117 sh_audio->a_in_buffer_size=sh_audio->audio_in_minsize; | |
118 sh_audio->a_in_buffer=malloc(sh_audio->a_in_buffer_size); | |
119 sh_audio->a_in_buffer_len=0; | |
758 | 120 sh_audio->audio_out_minsize=16384; |
296 | 121 } |
122 #endif | |
758 | 123 break; |
124 case 2: | |
125 case 8: | |
126 case 5: | |
127 // PCM, aLaw | |
128 sh_audio->audio_out_minsize=2048; | |
129 break; | |
130 case 3: | |
131 // Dolby AC3 audio: | |
132 sh_audio->audio_out_minsize=4*256*6; | |
133 break; | |
134 case 6: | |
135 // MS-GSM audio codec: | |
136 sh_audio->audio_out_minsize=4*320; | |
137 break; | |
138 case 1: | |
139 // MPEG Audio: | |
140 sh_audio->audio_out_minsize=4608; | |
141 break; | |
296 | 142 } |
143 | |
303 | 144 if(!driver) return 0; |
296 | 145 |
146 // allocate audio out buffer: | |
758 | 147 sh_audio->a_buffer_size=sh_audio->audio_out_minsize+MAX_OUTBURST; // worst case calc. |
148 | |
149 printf("dec_audio: Allocating %d + %d = %d bytes for output buffer\n", | |
150 sh_audio->audio_out_minsize,MAX_OUTBURST,sh_audio->a_buffer_size); | |
151 | |
296 | 152 sh_audio->a_buffer=malloc(sh_audio->a_buffer_size); |
758 | 153 if(!sh_audio->a_buffer){ |
154 printf("Cannot allocate audio out buffer\n"); | |
155 return 0; | |
156 } | |
296 | 157 memset(sh_audio->a_buffer,0,sh_audio->a_buffer_size); |
158 sh_audio->a_buffer_len=0; | |
159 | |
303 | 160 switch(driver){ |
1309
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1291
diff
changeset
|
161 #ifdef ARCH_X86 |
303 | 162 case 4: { |
758 | 163 int ret=acm_decode_audio(sh_audio,sh_audio->a_buffer,4096,sh_audio->a_buffer_size); |
296 | 164 if(ret<0){ |
303 | 165 printf("ACM decoding error: %d\n",ret); |
166 driver=0; | |
296 | 167 } |
640 | 168 sh_audio->a_buffer_len=ret; |
303 | 169 break; |
296 | 170 } |
1309
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1291
diff
changeset
|
171 #endif |
303 | 172 case 2: { |
296 | 173 // 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
|
174 WAVEFORMATEX *h=sh_audio->wf; |
746 | 175 sh_audio->i_bps=h->nAvgBytesPerSec; |
296 | 176 sh_audio->channels=h->nChannels; |
177 sh_audio->samplerate=h->nSamplesPerSec; | |
178 sh_audio->samplesize=(h->wBitsPerSample+7)/8; | |
758 | 179 switch(sh_audio->format){ // hardware formats: |
180 case 0x6: sh_audio->sample_format=AFMT_A_LAW;break; | |
181 case 0x7: sh_audio->sample_format=AFMT_MU_LAW;break; | |
182 case 0x11: sh_audio->sample_format=AFMT_IMA_ADPCM;break; | |
183 case 0x50: sh_audio->sample_format=AFMT_MPEG;break; | |
184 // case 0x2000: sh_audio->sample_format=AFMT_AC3; | |
185 default: sh_audio->sample_format=(sh_audio->samplesize==2)?AFMT_S16_LE:AFMT_U8; | |
186 } | |
401 | 187 break; |
188 } | |
189 case 8: { | |
190 // DVD PCM Audio: | |
191 sh_audio->channels=2; | |
192 sh_audio->samplerate=48000; | |
746 | 193 sh_audio->i_bps=2*2*48000; |
296 | 194 // sh_audio->pcm_bswap=1; |
303 | 195 break; |
196 } | |
197 case 3: { | |
296 | 198 // Dolby AC3 audio: |
1289 | 199 dec_audio_sh=sh_audio; // save sh_audio for the callback: |
296 | 200 ac3_config.fill_buffer_callback = ac3_fill_buffer; |
201 ac3_config.num_output_ch = 2; | |
202 ac3_config.flags = 0; | |
203 #ifdef HAVE_MMX | |
204 ac3_config.flags |= AC3_MMX_ENABLE; | |
205 #endif | |
206 #ifdef HAVE_3DNOW | |
207 ac3_config.flags |= AC3_3DNOW_ENABLE; | |
208 #endif | |
209 ac3_init(); | |
210 sh_audio->ac3_frame = ac3_decode_frame(); | |
211 if(sh_audio->ac3_frame){ | |
746 | 212 ac3_frame_t* fr=(ac3_frame_t*)sh_audio->ac3_frame; |
213 sh_audio->samplerate=fr->sampling_rate; | |
296 | 214 sh_audio->channels=2; |
746 | 215 // 1 frame: 6*256 samples 1 sec: sh_audio->samplerate samples |
216 //sh_audio->i_bps=fr->frame_size*fr->sampling_rate/(6*256); | |
217 sh_audio->i_bps=fr->bit_rate*(1000/8); | |
303 | 218 } else { |
219 driver=0; // bad frame -> disable audio | |
220 } | |
221 break; | |
222 } | |
223 case 5: { | |
296 | 224 // 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
|
225 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
|
226 sh_audio->samplerate=sh_audio->wf->nSamplesPerSec; |
746 | 227 sh_audio->i_bps=sh_audio->channels*sh_audio->samplerate; |
303 | 228 break; |
229 } | |
230 case 6: { | |
296 | 231 // MS-GSM audio codec: |
232 GSM_Init(); | |
432
5251b0c57e39
sh_audio->wf and sh_video->bih changed to dynamic (thanx to Jens Hoffmann)
arpi_esp
parents:
401
diff
changeset
|
233 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
|
234 sh_audio->samplerate=sh_audio->wf->nSamplesPerSec; |
746 | 235 // decodes 65 byte -> 320 short |
236 // 1 sec: sh_audio->channels*sh_audio->samplerate samples | |
237 // 1 frame: 320 samples | |
238 sh_audio->i_bps=65*(sh_audio->channels*sh_audio->samplerate)/320; // 1:10 | |
303 | 239 break; |
296 | 240 } |
303 | 241 case 1: { |
296 | 242 // MPEG Audio: |
1289 | 243 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
|
244 #ifdef USE_FAKE_MONO |
e14114170e01
applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents:
640
diff
changeset
|
245 MP3_Init(fakemono); |
e14114170e01
applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents:
640
diff
changeset
|
246 #else |
296 | 247 MP3_Init(); |
732
e14114170e01
applied 'fakemono' patch by Bryan Chan scorpio@acm.org
arpi_esp
parents:
640
diff
changeset
|
248 #endif |
296 | 249 MP3_samplerate=MP3_channels=0; |
250 // printf("[\n"); | |
251 sh_audio->a_buffer_len=MP3_DecodeFrame(sh_audio->a_buffer,-1); | |
252 // printf("]\n"); | |
253 sh_audio->channels=2; // hack | |
254 sh_audio->samplerate=MP3_samplerate; | |
746 | 255 sh_audio->i_bps=MP3_bitrate*(1000/8); |
303 | 256 break; |
257 } | |
296 | 258 } |
259 | |
260 if(!sh_audio->channels || !sh_audio->samplerate){ | |
261 printf("Unknown/missing audio format, using nosound\n"); | |
303 | 262 driver=0; |
296 | 263 } |
264 | |
303 | 265 if(!driver){ |
266 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
|
267 sh_audio->a_buffer=NULL; |
303 | 268 sh_audio->o_bps=0; |
269 return 0; | |
270 } | |
296 | 271 |
303 | 272 sh_audio->o_bps=sh_audio->channels*sh_audio->samplerate*sh_audio->samplesize; |
273 return driver; | |
296 | 274 } |
291 | 275 |
746 | 276 // Audio decoding: |
291 | 277 |
746 | 278 // Decode a single frame (mp3,acm etc) or 'minlen' bytes (pcm/alaw etc) |
279 // buffer length is 'maxlen' bytes, it shouldn't be exceeded... | |
280 | |
281 int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen){ | |
291 | 282 int len=-1; |
303 | 283 switch(sh_audio->codec->driver){ |
291 | 284 case 1: // MPEG layer 2 or 3 |
285 len=MP3_DecodeFrame(buf,-1); | |
286 break; | |
401 | 287 case 2: // AVI PCM |
1058 | 288 len=demux_read_data(sh_audio->ds,buf,minlen); |
401 | 289 break; |
290 case 8: // DVD PCM | |
291 { int j; | |
746 | 292 len=demux_read_data(sh_audio->ds,buf,minlen); |
291 | 293 //if(i&1){ printf("Warning! pcm_audio_size&1 !=0 (%d)\n",i);i&=~1; } |
746 | 294 // swap endian: |
291 | 295 for(j=0;j<len;j+=2){ |
296 char x=buf[j]; | |
297 buf[j]=buf[j+1]; | |
298 buf[j+1]=x; | |
299 } | |
300 break; | |
301 } | |
302 case 5: // aLaw decoder | |
746 | 303 { int l=demux_read_data(sh_audio->ds,buf,minlen/2); |
291 | 304 unsigned short *d=(unsigned short *) buf; |
305 unsigned char *s=buf; | |
306 len=2*l; | |
758 | 307 if(sh_audio->format==6){ |
308 // aLaw | |
883 | 309 while(l>0){ --l; d[l]=alaw2short[s[l]]; } |
758 | 310 } else { |
311 // uLaw | |
883 | 312 while(l>0){ --l; d[l]=ulaw2short[s[l]]; } |
291 | 313 } |
314 break; | |
315 } | |
316 case 6: // MS-GSM decoder | |
317 { unsigned char buf[65]; // 65 bytes / frame | |
746 | 318 if(demux_read_data(sh_audio->ds,buf,65)!=65) break; // EOF |
319 XA_MSGSM_Decoder(buf,(unsigned short *) buf); // decodes 65 byte -> 320 short | |
320 // XA_GSM_Decoder(buf,(unsigned short *) &sh_audio->a_buffer[sh_audio->a_buffer_len]); // decodes 33 byte -> 160 short | |
321 len=2*320; | |
291 | 322 break; |
323 } | |
324 case 3: // AC3 decoder | |
325 //printf("{1:%d}",avi_header.idx_pos);fflush(stdout); | |
326 if(!sh_audio->ac3_frame) sh_audio->ac3_frame=ac3_decode_frame(); | |
327 //printf("{2:%d}",avi_header.idx_pos);fflush(stdout); | |
328 if(sh_audio->ac3_frame){ | |
296 | 329 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
|
330 memcpy(buf,((ac3_frame_t*)sh_audio->ac3_frame)->audio_data,len); |
291 | 331 sh_audio->ac3_frame=NULL; |
332 } | |
333 //printf("{3:%d}",avi_header.idx_pos);fflush(stdout); | |
334 break; | |
1309
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1291
diff
changeset
|
335 #ifdef ARCH_X86 |
291 | 336 case 4: |
758 | 337 // len=sh_audio->audio_out_minsize; // optimal decoded fragment size |
338 // if(len<minlen) len=minlen; else | |
339 // if(len>maxlen) len=maxlen; | |
340 // len=acm_decode_audio(sh_audio,buf,len); | |
341 len=acm_decode_audio(sh_audio,buf,minlen,maxlen); | |
291 | 342 break; |
1309
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1291
diff
changeset
|
343 #endif |
746 | 344 |
291 | 345 #ifdef USE_DIRECTSHOW |
346 case 7: // DirectShow | |
347 { int ret; | |
348 int size_in=0; | |
349 int size_out=0; | |
350 int srcsize=DS_AudioDecoder_GetSrcSize(maxlen); | |
351 if(verbose>2)printf("DShow says: srcsize=%d (buffsize=%d) out_size=%d\n",srcsize,sh_audio->a_in_buffer_size,maxlen); | |
352 if(srcsize>sh_audio->a_in_buffer_size) srcsize=sh_audio->a_in_buffer_size; // !!!!!! | |
353 if(sh_audio->a_in_buffer_len<srcsize){ | |
354 sh_audio->a_in_buffer_len+= | |
355 demux_read_data(sh_audio->ds,&sh_audio->a_in_buffer[sh_audio->a_in_buffer_len], | |
356 srcsize-sh_audio->a_in_buffer_len); | |
357 } | |
358 DS_AudioDecoder_Convert(sh_audio->a_in_buffer,sh_audio->a_in_buffer_len, | |
359 buf,maxlen, &size_in,&size_out); | |
754 | 360 if(verbose) |
361 printf("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 | 362 if(size_in>=sh_audio->a_in_buffer_len){ |
363 sh_audio->a_in_buffer_len=0; | |
364 } else { | |
365 sh_audio->a_in_buffer_len-=size_in; | |
366 memcpy(sh_audio->a_in_buffer,&sh_audio->a_in_buffer[size_in],sh_audio->a_in_buffer_len); | |
367 } | |
368 len=size_out; | |
369 break; | |
370 } | |
371 #endif | |
372 } | |
373 return len; | |
374 } | |
375 | |
376 |