X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Ffaad.c;h=7af61bc7f092c271e143a51843a31c37f69a72ce;hb=53424e95057b7a53fd19e8a7fa0be9a87d21e54e;hp=d15aa6f6bb0e00827bd63884769368e6b4b96609;hpb=ea33ac4ce9e2faeeb072cc8e41b7a6cc6fdaf8ba;p=vlc diff --git a/modules/codec/faad.c b/modules/codec/faad.c index d15aa6f6bb..7af61bc7f0 100644 --- a/modules/codec/faad.c +++ b/modules/codec/faad.c @@ -1,10 +1,11 @@ /***************************************************************************** * decoder.c: AAC decoder using libfaad2 ***************************************************************************** - * Copyright (C) 2001, 2003 VideoLAN - * $Id: faad.c,v 1.2 2003/11/04 02:23:11 fenrir Exp $ + * Copyright (C) 2001, 2003 the VideoLAN team + * $Id$ * * Authors: Laurent Aimar + * Gildas Bazin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,308 +19,485 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include -#include -#include +#include +#include +#include +#include +#include #include -#include "codecs.h" /***************************************************************************** * Module descriptor *****************************************************************************/ static int Open( vlc_object_t * ); +static void Close( vlc_object_t * ); vlc_module_begin(); - set_description( _("AAC audio decoder (using libfaad2)") ); - set_capability( "decoder", 60 ); - set_callbacks( Open, NULL ); + set_description( N_("AAC audio decoder (using libfaad2)") ); + set_capability( "decoder", 100 ); + set_category( CAT_INPUT ); + set_subcategory( SUBCAT_INPUT_ACODEC ); + set_callbacks( Open, Close ); vlc_module_end(); - /**************************************************************************** * Local prototypes ****************************************************************************/ -static int InitDecoder ( decoder_t * ); -static int RunDecoder ( decoder_t *, block_t * ); -static int EndDecoder ( decoder_t * ); +static aout_buffer_t *DecodeBlock( decoder_t *, block_t ** ); +static void DoReordering( uint32_t *, uint32_t *, int, int, uint32_t * ); + +#define MAX_CHANNEL_POSITIONS 9 struct decoder_sys_t { /* faad handler */ faacDecHandle *hfaad; - /* audio output */ - audio_sample_format_t output_format; - aout_instance_t * p_aout; /* opaque */ - aout_input_t * p_aout_input; /* opaque */ - /* samples */ - audio_date_t date; + audio_date_t date; /* temporary buffer */ - uint8_t *p_buffer; - int i_buffer; - int i_buffer_size; -}; - -/***************************************************************************** - * OpenDecoder: probe the decoder and return score - *****************************************************************************/ -static int Open( vlc_object_t *p_this ) -{ - decoder_t *p_dec = (decoder_t*)p_this; - - if( p_dec->p_fifo->i_fourcc != VLC_FOURCC('m','p','4','a') ) - { - return VLC_EGENERIC; - } - - p_dec->pf_init = InitDecoder; - p_dec->pf_decode = RunDecoder; - p_dec->pf_end = EndDecoder; + uint8_t *p_buffer; + int i_buffer; + size_t i_buffer_size; - p_dec->p_sys = malloc( sizeof( decoder_sys_t ) ); + /* Channel positions of the current stream (for re-ordering) */ + uint32_t pi_channel_positions[MAX_CHANNEL_POSITIONS]; - return VLC_SUCCESS; -} + bool b_sbr, b_ps; -static unsigned int pi_channels_maps[7] = -{ - 0, - AOUT_CHAN_CENTER, - AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT, - AOUT_CHAN_CENTER | AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT, - AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT, - AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT, - /* FIXME */ - AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT | AOUT_CHAN_REARCENTER + int i_input_rate; }; +static const uint32_t pi_channels_in[MAX_CHANNEL_POSITIONS] = + { FRONT_CHANNEL_CENTER, FRONT_CHANNEL_LEFT, FRONT_CHANNEL_RIGHT, + SIDE_CHANNEL_LEFT, SIDE_CHANNEL_RIGHT, + BACK_CHANNEL_LEFT, BACK_CHANNEL_RIGHT, + BACK_CHANNEL_CENTER, LFE_CHANNEL }; +static const uint32_t pi_channels_out[MAX_CHANNEL_POSITIONS] = + { AOUT_CHAN_CENTER, AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT, + AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT, + AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT, + AOUT_CHAN_REARCENTER, AOUT_CHAN_LFE }; +static const uint32_t pi_channels_ordered[MAX_CHANNEL_POSITIONS] = + { AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT, + AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT, + AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT, + AOUT_CHAN_CENTER, AOUT_CHAN_REARCENTER, AOUT_CHAN_LFE + }; +static const uint32_t pi_channels_guessed[MAX_CHANNEL_POSITIONS] = + { 0, AOUT_CHAN_CENTER, AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT, + AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_LFE, + AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_REARLEFT + | AOUT_CHAN_REARRIGHT, + AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_REARLEFT + | AOUT_CHAN_REARRIGHT | AOUT_CHAN_CENTER, + AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_REARLEFT + | AOUT_CHAN_REARRIGHT | AOUT_CHAN_CENTER | AOUT_CHAN_LFE, + AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_MIDDLELEFT + | AOUT_CHAN_MIDDLERIGHT | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT + | AOUT_CHAN_CENTER, + AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_MIDDLELEFT + | AOUT_CHAN_MIDDLERIGHT | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT + | AOUT_CHAN_CENTER | AOUT_CHAN_LFE + }; + /***************************************************************************** - * InitDecoder: + * OpenDecoder: probe the decoder and return score *****************************************************************************/ -static int InitDecoder ( decoder_t *p_dec ) +static int Open( vlc_object_t *p_this ) { + decoder_t *p_dec = (decoder_t*)p_this; decoder_sys_t *p_sys = p_dec->p_sys; - WAVEFORMATEX wf, *p_wf; faacDecConfiguration *cfg; - if( ( p_wf = (WAVEFORMATEX*)p_dec->p_fifo->p_waveformatex ) == NULL ) + if( p_dec->fmt_in.i_codec != VLC_FOURCC('m','p','4','a') ) { - p_wf = &wf; - memset( p_wf, 0, sizeof( WAVEFORMATEX ) ); + return VLC_EGENERIC; } + /* Allocate the memory needed to store the decoder's structure */ + if( ( p_dec->p_sys = p_sys = + (decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL ) + return VLC_ENOMEM; + /* Open a faad context */ if( ( p_sys->hfaad = faacDecOpen() ) == NULL ) { - msg_Err( p_dec, "Cannot initialize faad" ); + msg_Err( p_dec, "cannot initialize faad" ); return VLC_EGENERIC; } - if( p_wf->cbSize > 0 ) + /* Misc init */ + aout_DateSet( &p_sys->date, 0 ); + p_dec->fmt_out.i_cat = AUDIO_ES; + + if (vlc_CPU() & CPU_CAPABILITY_FPU) + p_dec->fmt_out.i_codec = VLC_FOURCC('f','l','3','2'); + else + p_dec->fmt_out.i_codec = AOUT_FMT_S16_NE; + p_dec->pf_decode_audio = DecodeBlock; + + p_dec->fmt_out.audio.i_physical_channels = + p_dec->fmt_out.audio.i_original_channels = 0; + + if( p_dec->fmt_in.i_extra > 0 ) { /* We have a decoder config so init the handle */ - unsigned long i_rate; - unsigned char i_channels; + unsigned long i_rate; + unsigned char i_channels; - if( faacDecInit2( p_sys->hfaad, - (uint8_t*)&p_wf[1], p_wf->cbSize, + if( faacDecInit2( p_sys->hfaad, p_dec->fmt_in.p_extra, + p_dec->fmt_in.i_extra, &i_rate, &i_channels ) < 0 ) { return VLC_EGENERIC; } - p_sys->output_format.i_rate = i_rate; - p_sys->output_format.i_physical_channels = - p_sys->output_format.i_original_channels = - pi_channels_maps[i_channels]; + p_dec->fmt_out.audio.i_rate = i_rate; + p_dec->fmt_out.audio.i_channels = i_channels; + p_dec->fmt_out.audio.i_physical_channels + = p_dec->fmt_out.audio.i_original_channels + = pi_channels_guessed[i_channels]; + aout_DateInit( &p_sys->date, i_rate ); } else { /* Will be initalised from first frame */ - p_sys->output_format.i_rate = 0; - p_sys->output_format.i_physical_channels = - p_sys->output_format.i_original_channels = 0; + p_dec->fmt_out.audio.i_rate = 0; + p_dec->fmt_out.audio.i_channels = 0; } - p_sys->output_format.i_format = VLC_FOURCC('f','l','3','2'); - p_sys->p_aout = NULL; - p_sys->p_aout_input = NULL; - - /* set the faad config */ + /* Set the faad config */ cfg = faacDecGetCurrentConfiguration( p_sys->hfaad ); - cfg->outputFormat = FAAD_FMT_FLOAT; + if (vlc_CPU() & CPU_CAPABILITY_FPU) + cfg->outputFormat = FAAD_FMT_FLOAT; + else + cfg->outputFormat = FAAD_FMT_16BIT; faacDecSetConfiguration( p_sys->hfaad, cfg ); /* buffer */ - p_sys->i_buffer = 0; - p_sys->i_buffer_size = 10000; - p_sys->p_buffer = malloc( p_sys->i_buffer_size ); + p_sys->i_buffer = p_sys->i_buffer_size = 0; + p_sys->p_buffer = NULL; + + p_sys->i_input_rate = INPUT_RATE_DEFAULT; + /* Faad2 can't deal with truncated data (eg. from MPEG TS) */ + p_dec->b_need_packetized = true; + + p_sys->b_sbr = p_sys->b_ps = false; return VLC_SUCCESS; } /***************************************************************************** - * InitDecoder: + * DecodeBlock: *****************************************************************************/ -static int RunDecoder ( decoder_t *p_dec, block_t *p_block ) +static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) { decoder_sys_t *p_sys = p_dec->p_sys; + block_t *p_block; + + if( !pp_block || !*pp_block ) return NULL; + + p_block = *pp_block; + + if( p_block->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) ) + { + block_Release( p_block ); + return NULL; + } - int i_used = 0; - mtime_t i_pts = p_block->i_pts; + if( p_block->i_rate > 0 ) + p_sys->i_input_rate = p_block->i_rate; + + /* Remove ADTS header if we have decoder specific config */ + if( p_dec->fmt_in.i_extra && p_block->i_buffer > 7 ) + { + if( p_block->p_buffer[0] == 0xff && + ( p_block->p_buffer[1] & 0xf0 ) == 0xf0 ) /* syncword */ + { /* ADTS header present */ + size_t i_header_size; /* 7 bytes (+ 2 bytes for crc) */ + i_header_size = 7 + ( ( p_block->p_buffer[1] & 0x01 ) ? 0 : 2 ); + /* FIXME: multiple blocks per frame */ + if( p_block->i_buffer > i_header_size ) + { + vlc_memcpy( p_block->p_buffer, + p_block->p_buffer + i_header_size, + p_block->i_buffer - i_header_size ); + p_block->i_buffer -= i_header_size; + } + } + } /* Append the block to the temporary buffer */ if( p_sys->i_buffer_size < p_sys->i_buffer + p_block->i_buffer ) { - p_sys->i_buffer_size += p_block->i_buffer; + p_sys->i_buffer_size = p_sys->i_buffer + p_block->i_buffer; p_sys->p_buffer = realloc( p_sys->p_buffer, p_sys->i_buffer_size ); } - memcpy( &p_sys->p_buffer[p_sys->i_buffer], p_block->p_buffer, p_block->i_buffer ); - p_sys->i_buffer += p_block->i_buffer; - if( p_sys->output_format.i_rate == 0 ) + if( p_block->i_buffer > 0 ) { - unsigned long i_rate; - unsigned char i_channels; + vlc_memcpy( &p_sys->p_buffer[p_sys->i_buffer], + p_block->p_buffer, p_block->i_buffer ); + p_sys->i_buffer += p_block->i_buffer; + p_block->i_buffer = 0; + } + + if( p_dec->fmt_out.audio.i_rate == 0 && p_dec->fmt_in.i_extra > 0 ) + { + /* We have a decoder config so init the handle */ + unsigned long i_rate; + unsigned char i_channels; + + if( faacDecInit2( p_sys->hfaad, p_dec->fmt_in.p_extra, + p_dec->fmt_in.i_extra, + &i_rate, &i_channels ) >= 0 ) + { + p_dec->fmt_out.audio.i_rate = i_rate; + p_dec->fmt_out.audio.i_channels = i_channels; + p_dec->fmt_out.audio.i_physical_channels + = p_dec->fmt_out.audio.i_original_channels + = pi_channels_guessed[i_channels]; + + aout_DateInit( &p_sys->date, i_rate ); + } + } + + if( p_dec->fmt_out.audio.i_rate == 0 && p_sys->i_buffer ) + { + unsigned long i_rate; + unsigned char i_channels; /* Init faad with the first frame */ if( faacDecInit( p_sys->hfaad, p_sys->p_buffer, p_sys->i_buffer, &i_rate, &i_channels ) < 0 ) { - return VLC_EGENERIC; + block_Release( p_block ); + return NULL; } - p_sys->output_format.i_rate = i_rate; - p_sys->output_format.i_physical_channels = - p_sys->output_format.i_original_channels = - pi_channels_maps[i_channels]; + + p_dec->fmt_out.audio.i_rate = i_rate; + p_dec->fmt_out.audio.i_channels = i_channels; + p_dec->fmt_out.audio.i_physical_channels + = p_dec->fmt_out.audio.i_original_channels + = pi_channels_guessed[i_channels]; + aout_DateInit( &p_sys->date, i_rate ); + } + + if( p_block->i_pts != 0 && p_block->i_pts != aout_DateGet( &p_sys->date ) ) + { + aout_DateSet( &p_sys->date, p_block->i_pts ); + } + else if( !aout_DateGet( &p_sys->date ) ) + { + /* We've just started the stream, wait for the first PTS. */ + block_Release( p_block ); + p_sys->i_buffer = 0; + return NULL; } /* Decode all data */ - while( i_used < p_sys->i_buffer ) + if( p_sys->i_buffer ) { void *samples; faacDecFrameInfo frame; - aout_buffer_t *out; + aout_buffer_t *p_out; + int i, j; samples = faacDecDecode( p_sys->hfaad, &frame, - &p_sys->p_buffer[i_used], p_sys->i_buffer - i_used ); + p_sys->p_buffer, p_sys->i_buffer ); if( frame.error > 0 ) { msg_Warn( p_dec, "%s", faacDecGetErrorMessage( frame.error ) ); - /* flush the buffer */ + + /* Flush the buffer */ p_sys->i_buffer = 0; - return VLC_SUCCESS; + block_Release( p_block ); + return NULL; } - if( frame.channels <= 0 || frame.channels > 6 ) + + if( frame.channels <= 0 || frame.channels > 8 || frame.channels == 7 ) { - msg_Warn( p_dec, "invalid channels count" ); - /* flush the buffer */ - p_sys->i_buffer = 0; - return VLC_SUCCESS; + msg_Warn( p_dec, "invalid channels count: %i", frame.channels ); + + /* Flush the buffer */ + p_sys->i_buffer -= frame.bytesconsumed; + if( p_sys->i_buffer > 0 ) + { + memmove( p_sys->p_buffer,&p_sys->p_buffer[frame.bytesconsumed], + p_sys->i_buffer ); + } + block_Release( p_block ); + return NULL; } + if( frame.samples <= 0 ) { - msg_Warn( p_dec, "decoded zero samples" ); - /* flush the buffer */ - p_sys->i_buffer = 0; - return VLC_SUCCESS; + msg_Warn( p_dec, "decoded zero sample" ); + + /* Flush the buffer */ + p_sys->i_buffer -= frame.bytesconsumed; + if( p_sys->i_buffer > 0 ) + { + memmove( p_sys->p_buffer,&p_sys->p_buffer[frame.bytesconsumed], + p_sys->i_buffer ); + } + block_Release( p_block ); + return NULL; } - /* we have decoded a valid frame */ - /* msg_Dbg( p_dec, "consumed %d for %dHz %dc %lld", frame.bytesconsumed, frame.samplerate, frame.channels, i_pts ); */ - i_used += frame.bytesconsumed; - - - /* create/recreate the output */ - if( p_sys->p_aout_input && - ( p_sys->output_format.i_original_channels != pi_channels_maps[frame.channels] || - p_sys->output_format.i_rate != frame.samplerate ) ) + /* We decoded a valid frame */ + if( p_dec->fmt_out.audio.i_rate != frame.samplerate ) { - aout_DecDelete( p_sys->p_aout, p_sys->p_aout_input ); - p_sys->p_aout_input = NULL; + aout_DateInit( &p_sys->date, frame.samplerate ); + aout_DateSet( &p_sys->date, p_block->i_pts ); } + p_block->i_pts = 0; /* PTS is valid only once */ - if( p_sys->p_aout_input == NULL ) - { - p_sys->output_format.i_physical_channels = - p_sys->output_format.i_original_channels = pi_channels_maps[frame.channels]; - p_sys->output_format.i_rate = frame.samplerate; - - aout_DateInit( &p_sys->date, p_sys->output_format.i_rate ); - aout_DateSet( &p_sys->date, 0 ); + p_dec->fmt_out.audio.i_rate = frame.samplerate; + p_dec->fmt_out.audio.i_channels = frame.channels; + p_dec->fmt_out.audio.i_physical_channels + = p_dec->fmt_out.audio.i_original_channels + = pi_channels_guessed[frame.channels]; - p_sys->p_aout_input = aout_DecNew( p_dec, &p_sys->p_aout, &p_sys->output_format ); - } - - if( p_sys->p_aout_input == NULL ) + /* Adjust stream info when dealing with SBR/PS */ + if( (p_sys->b_sbr != frame.sbr || p_sys->b_ps != frame.ps) && + p_dec->p_parent->i_object_type == VLC_OBJECT_INPUT ) { - msg_Err( p_dec, "cannot create aout" ); - return VLC_EGENERIC; + input_thread_t *p_input = (input_thread_t *)p_dec->p_parent; + char *psz_cat; + const char *psz_ext = (frame.sbr && frame.ps) ? "SBR+PS" : + frame.sbr ? "SBR" : "PS"; + + msg_Dbg( p_dec, "AAC %s (channels: %u, samplerate: %lu)", + psz_ext, frame.channels, frame.samplerate ); + + if( asprintf( &psz_cat, _("Stream %d"), p_dec->fmt_in.i_id ) != -1 ) + { + input_Control( p_input, INPUT_ADD_INFO, psz_cat, + _("AAC extension"), "%s", psz_ext ); + input_Control( p_input, INPUT_ADD_INFO, psz_cat, + _("Channels"), "%d", frame.channels ); + input_Control( p_input, INPUT_ADD_INFO, psz_cat, + _("Sample rate"), _("%d Hz"), frame.samplerate ); + free( psz_cat ); + } + p_sys->b_sbr = frame.sbr; p_sys->b_ps = frame.ps; } - if( i_pts != 0 && i_pts != aout_DateGet( &p_sys->date ) ) + /* Convert frame.channel_position to our own channel values */ + p_dec->fmt_out.audio.i_physical_channels = 0; + for( i = 0; i < frame.channels; i++ ) { - aout_DateSet( &p_sys->date, i_pts ); + /* Find the channel code */ + for( j = 0; j < MAX_CHANNEL_POSITIONS; j++ ) + { + if( frame.channel_position[i] == pi_channels_in[j] ) + break; + } + if( j >= MAX_CHANNEL_POSITIONS ) + { + msg_Warn( p_dec, "unknown channel ordering" ); + /* Invent something */ + j = i; + } + /* */ + p_sys->pi_channel_positions[i] = pi_channels_out[j]; + if( p_dec->fmt_out.audio.i_physical_channels & pi_channels_out[j] ) + frame.channels--; /* We loose a duplicated channel */ + else + p_dec->fmt_out.audio.i_physical_channels |= pi_channels_out[j]; } - else if( !aout_DateGet( &p_sys->date ) ) + p_dec->fmt_out.audio.i_original_channels = + p_dec->fmt_out.audio.i_physical_channels; + + p_out = p_dec->pf_aout_buffer_new(p_dec, frame.samples/frame.channels); + if( p_out == NULL ) { - /* Wait for a dated packet */ - msg_Dbg( p_dec, "no date" ); p_sys->i_buffer = 0; - return VLC_SUCCESS; + block_Release( p_block ); + return NULL; } - i_pts = 0; /* PTS is valid only once */ - if( ( out = aout_DecNewBuffer( p_sys->p_aout, p_sys->p_aout_input, - frame.samples / frame.channels ) ) == NULL ) + p_out->start_date = aout_DateGet( &p_sys->date ); + p_out->end_date = aout_DateIncrement( &p_sys->date, + (frame.samples / frame.channels) * p_sys->i_input_rate / INPUT_RATE_DEFAULT ); + + DoReordering( (uint32_t *)p_out->p_buffer, samples, + frame.samples / frame.channels, frame.channels, + p_sys->pi_channel_positions ); + + p_sys->i_buffer -= frame.bytesconsumed; + if( p_sys->i_buffer > 0 ) { - msg_Err( p_dec, "cannot get a new buffer" ); - return VLC_EGENERIC; + memmove( p_sys->p_buffer, &p_sys->p_buffer[frame.bytesconsumed], + p_sys->i_buffer ); } - out->start_date = aout_DateGet( &p_sys->date ); - out->end_date = aout_DateIncrement( &p_sys->date, - frame.samples / frame.channels ); - memcpy( out->p_buffer, samples, out->i_nb_bytes ); - - aout_DecPlay( p_sys->p_aout, p_sys->p_aout_input, out ); - } - p_sys->i_buffer -= i_used; - if( p_sys->i_buffer > 0 ) - { - memmove( &p_sys->p_buffer[0], &p_sys->p_buffer[i_used], p_sys->i_buffer ); + return p_out; } - return VLC_SUCCESS; + block_Release( p_block ); + return NULL; } /***************************************************************************** - * InitDecoder: + * Close: *****************************************************************************/ -static int EndDecoder ( decoder_t *p_dec ) +static void Close( vlc_object_t *p_this ) { + decoder_t *p_dec = (decoder_t *)p_this; decoder_sys_t *p_sys = p_dec->p_sys; - if( p_sys->p_aout_input ) - { - aout_DecDelete( p_sys->p_aout, p_sys->p_aout_input ); - } - faacDecClose( p_sys->hfaad ); + free( p_sys->p_buffer ); free( p_sys ); - - return VLC_SUCCESS; } +/***************************************************************************** + * DoReordering: do some channel re-ordering (the ac3 channel order is + * different from the aac one). + *****************************************************************************/ +static void DoReordering( uint32_t *p_out, uint32_t *p_in, int i_samples, + int i_nb_channels, uint32_t *pi_chan_positions ) +{ + int pi_chan_table[MAX_CHANNEL_POSITIONS]; + int i, j, k; + /* Find the channels mapping */ + for( i = 0, j = 0; i < MAX_CHANNEL_POSITIONS; i++ ) + { + for( k = 0; k < i_nb_channels; k++ ) + { + if( pi_channels_ordered[i] == pi_chan_positions[k] ) + { + pi_chan_table[k] = j++; + break; + } + } + } + + /* Do the actual reordering */ + if( vlc_CPU() & CPU_CAPABILITY_FPU ) + for( i = 0; i < i_samples; i++ ) + for( j = 0; j < i_nb_channels; j++ ) + p_out[i * i_nb_channels + pi_chan_table[j]] = + p_in[i * i_nb_channels + j]; + else + for( i = 0; i < i_samples; i++ ) + for( j = 0; j < i_nb_channels; j++ ) + ((uint16_t *)p_out)[i * i_nb_channels + pi_chan_table[j]] = + ((uint16_t *)p_in)[i * i_nb_channels + j]; +}