X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Ffaad.c;h=fd5636efbf8a4109d8510952f420aa0c2835c5fe;hb=5a4afbeb5bcdf6515871efdd0bd9fe4d435a2be9;hp=dffe725b93394c4747bf43ffa92a7554cdd6dedf;hpb=2226791315f6cd235b7c84b4cd23e1a63882ad65;p=vlc diff --git a/modules/codec/faad.c b/modules/codec/faad.c index dffe725b93..fd5636efbf 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.6 2003/11/27 20:51:31 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,12 +19,18 @@ * * 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 -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include +#include #include @@ -33,17 +40,21 @@ 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, Close ); -vlc_module_end(); - +vlc_module_begin () + 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 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 { @@ -56,24 +67,47 @@ struct decoder_sys_t /* temporary buffer */ uint8_t *p_buffer; int i_buffer; - int i_buffer_size; -}; + size_t i_buffer_size; -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 + /* Channel positions of the current stream (for re-ordering) */ + uint32_t pi_channel_positions[MAX_CHANNEL_POSITIONS]; + + bool b_sbr, b_ps; }; +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 + }; + /***************************************************************************** * OpenDecoder: probe the decoder and return score *****************************************************************************/ @@ -91,24 +125,28 @@ static int Open( vlc_object_t *p_this ) /* 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 ) - { - msg_Err( p_dec, "out of memory" ); - return VLC_EGENERIC; - } + 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; } /* Misc init */ aout_DateSet( &p_sys->date, 0 ); p_dec->fmt_out.i_cat = AUDIO_ES; - p_dec->fmt_out.i_codec = VLC_FOURCC('f','l','3','2'); + + 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 */ @@ -124,10 +162,9 @@ static int Open( vlc_object_t *p_this ) 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_maps[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 @@ -135,20 +172,24 @@ static int Open( vlc_object_t *p_this ) /* Will be initalised from first frame */ p_dec->fmt_out.audio.i_rate = 0; p_dec->fmt_out.audio.i_channels = 0; - p_dec->fmt_out.audio.i_physical_channels = - p_dec->fmt_out.audio.i_original_channels = 0; } /* 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; + /* 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; } @@ -164,12 +205,31 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) p_block = *pp_block; - if( p_block->b_discontinuity ) + if( p_block->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) ) { block_Release( p_block ); return NULL; } + /* 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 ) { @@ -177,14 +237,34 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) p_sys->p_buffer = realloc( p_sys->p_buffer, p_sys->i_buffer_size ); } - if( p_block->i_buffer ) + if( p_block->i_buffer > 0 ) { - memcpy( &p_sys->p_buffer[p_sys->i_buffer], - p_block->p_buffer, p_block->i_buffer ); + 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; @@ -201,10 +281,9 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) 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_maps[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 ); } @@ -226,6 +305,7 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) void *samples; faacDecFrameInfo frame; aout_buffer_t *p_out; + int i, j; samples = faacDecDecode( p_sys->hfaad, &frame, p_sys->p_buffer, p_sys->i_buffer ); @@ -240,22 +320,32 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_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" ); + msg_Warn( p_dec, "invalid channels count: %i", frame.channels ); /* Flush the buffer */ - p_sys->i_buffer = 0; + 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" ); + msg_Warn( p_dec, "decoded zero sample" ); /* Flush the buffer */ - p_sys->i_buffer = 0; + 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; } @@ -270,12 +360,54 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) 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_maps[frame.channels]; + p_dec->fmt_out.audio.i_physical_channels + = p_dec->fmt_out.audio.i_original_channels + = pi_channels_guessed[frame.channels]; + + /* Adjust stream info when dealing with SBR/PS */ + if( p_sys->b_sbr != frame.sbr || p_sys->b_ps != frame.ps ) + { + 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( !p_dec->p_description ) + p_dec->p_description = vlc_meta_New(); + if( p_dec->p_description ) + vlc_meta_AddExtra( p_dec->p_description, _("AAC extension"), psz_ext ); + + p_sys->b_sbr = frame.sbr; p_sys->b_ps = frame.ps; + } + + /* 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++ ) + { + /* 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]; + } + 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 ); + p_out = decoder_NewAudioBuffer(p_dec, frame.samples/frame.channels); if( p_out == NULL ) { p_sys->i_buffer = 0; @@ -284,10 +416,11 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) } p_out->start_date = aout_DateGet( &p_sys->date ); - p_out->end_date = aout_DateIncrement( &p_sys->date, - frame.samples / frame.channels ); + p_out->end_date = aout_DateIncrement( &p_sys->date, frame.samples / frame.channels ); - memcpy( p_out->p_buffer, samples, p_out->i_nb_bytes ); + 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 ) @@ -312,5 +445,43 @@ static void Close( vlc_object_t *p_this ) decoder_sys_t *p_sys = p_dec->p_sys; faacDecClose( p_sys->hfaad ); + free( p_sys->p_buffer ); free( p_sys ); } + +/***************************************************************************** + * 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]; +} +