annotate dec_audio.c @ 3798:d1e3ad5bcd8f

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