X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Ffaad.c;h=e050a94bc0e15293f45ca1502f5998f249bd1437;hb=96c92ae914fa80fff8cc369f4fd297af0b47203f;hp=632cd12c81fd3cac7ee6f7f5169a0079bd7c9dcf;hpb=079a1818dc58b9dc81ca92b5217da2a8d599572f;p=vlc diff --git a/modules/codec/faad.c b/modules/codec/faad.c index 632cd12c81..e050a94bc0 100644 --- a/modules/codec/faad.c +++ b/modules/codec/faad.c @@ -26,10 +26,11 @@ # include "config.h" #endif -#include +#include +#include +#include #include #include -#include #include @@ -39,13 +40,13 @@ 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", 100 ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACODEC ); - 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 @@ -71,9 +72,7 @@ struct decoder_sys_t /* Channel positions of the current stream (for re-ordering) */ uint32_t pi_channel_positions[MAX_CHANNEL_POSITIONS]; - vlc_bool_t b_sbr, b_ps; - - int i_input_rate; + bool b_sbr, b_ps; }; static const uint32_t pi_channels_in[MAX_CHANNEL_POSITIONS] = @@ -124,12 +123,8 @@ 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; - } + if( ( p_dec->p_sys = p_sys = malloc( sizeof(*p_sys) ) ) == NULL ) + return VLC_ENOMEM; /* Open a faad context */ if( ( p_sys->hfaad = faacDecOpen() ) == NULL ) @@ -161,6 +156,7 @@ static int Open( vlc_object_t *p_this ) p_dec->fmt_in.i_extra, &i_rate, &i_channels ) < 0 ) { + msg_Err( p_dec, "Failed to initialize faad using extra data" ); return VLC_EGENERIC; } @@ -188,14 +184,12 @@ static int Open( vlc_object_t *p_this ) /* buffer */ p_sys->i_buffer = p_sys->i_buffer_size = 0; - p_sys->p_buffer = 0; - - p_sys->i_input_rate = INPUT_RATE_DEFAULT; + p_sys->p_buffer = NULL; /* Faad2 can't deal with truncated data (eg. from MPEG TS) */ - p_dec->b_need_packetized = VLC_TRUE; + p_dec->b_need_packetized = true; - p_sys->b_sbr = p_sys->b_ps = VLC_FALSE; + p_sys->b_sbr = p_sys->b_ps = false; return VLC_SUCCESS; } @@ -217,8 +211,24 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) return NULL; } - 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 ) @@ -227,10 +237,10 @@ 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; } @@ -247,6 +257,10 @@ 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_guessed[i_channels]; + aout_DateInit( &p_sys->date, i_rate ); } } @@ -267,6 +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_guessed[i_channels]; aout_DateInit( &p_sys->date, i_rate ); } @@ -343,28 +360,25 @@ 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_guessed[frame.channels]; /* 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 ) + if( p_sys->b_sbr != frame.sbr || p_sys->b_ps != frame.ps ) { - 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" : + 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 ); - - asprintf( &psz_cat, _("Stream %d"), p_dec->fmt_in.i_id ); - 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; + 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 */ @@ -393,7 +407,7 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) 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; @@ -402,8 +416,7 @@ 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_sys->i_input_rate / INPUT_RATE_DEFAULT ); + p_out->end_date = aout_DateIncrement( &p_sys->date, frame.samples / frame.channels ); DoReordering( (uint32_t *)p_out->p_buffer, samples, frame.samples / frame.channels, frame.channels, @@ -432,7 +445,7 @@ static void Close( vlc_object_t *p_this ) decoder_sys_t *p_sys = p_dec->p_sys; faacDecClose( p_sys->hfaad ); - if( p_sys->p_buffer ) free( p_sys->p_buffer ); + free( p_sys->p_buffer ); free( p_sys ); } @@ -447,9 +460,9 @@ static void DoReordering( uint32_t *p_out, uint32_t *p_in, int i_samples, int i, j, k; /* Find the channels mapping */ - for( k = 0, j = 0; k < i_nb_channels; k++ ) + for( i = 0, j = 0; i < MAX_CHANNEL_POSITIONS; i++ ) { - for( i = 0; i < MAX_CHANNEL_POSITIONS; i++ ) + for( k = 0; k < i_nb_channels; k++ ) { if( pi_channels_ordered[i] == pi_chan_positions[k] ) { @@ -471,3 +484,4 @@ static void DoReordering( uint32_t *p_out, uint32_t *p_in, int i_samples, ((uint16_t *)p_out)[i * i_nb_channels + pi_chan_table[j]] = ((uint16_t *)p_in)[i * i_nb_channels + j]; } +