From 66f4e56389d97b61a4a17325201643ef6bd87e37 Mon Sep 17 00:00:00 2001 From: anders Date: Tue, 12 Nov 2002 12:33:56 +0000 Subject: New features: -- Support for runtime cpu detection -- Stand alone compile of libaf -- Unlimited number of channels (compiletime switch) -- Sample format defined by bit-fields -- New formats: float, A-Law and mu-law -- Format conversion set in human readable format i.e. format=4:us_be to set 32 bit unsigned big endian output -- Format reporting in human readable format -- Volume control has only one parameter for setting the volume i.e. volume=-10.0:1:0:1 to set atenuation = -10dB git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8168 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/dec_audio.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libmpcodecs/dec_audio.c') diff --git a/libmpcodecs/dec_audio.c b/libmpcodecs/dec_audio.c index 3b12ae4972..c21806f346 100644 --- a/libmpcodecs/dec_audio.c +++ b/libmpcodecs/dec_audio.c @@ -287,13 +287,13 @@ int init_audio_filters(sh_audio_t *sh_audio, // input format: same as codec's output format: afs->input.rate = in_samplerate; afs->input.nch = in_channels; - afs->input.format = in_format; + afs->input.format = af_format_decode(in_format); afs->input.bps = in_bps; // output format: same as ao driver's input format (if missing, fallback to input) afs->output.rate = out_samplerate ? out_samplerate : afs->input.rate; afs->output.nch = out_channels ? out_channels : afs->input.nch; - afs->output.format = out_format ? out_format : afs->input.format; + afs->output.format = af_format_decode(out_format ? out_format : afs->input.format); afs->output.bps = out_bps ? out_bps : afs->input.bps; // filter config: @@ -375,7 +375,7 @@ int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen) afd.len=declen; afd.rate=sh_audio->samplerate; afd.nch=sh_audio->channels; - afd.format=sh_audio->sample_format; + afd.format=af_format_decode(sh_audio->sample_format); afd.bps=sh_audio->samplesize; //pafd=&afd; // printf("\nAF: %d --> ",declen); -- cgit v1.2.3