X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Ffaad.c;h=7af61bc7f092c271e143a51843a31c37f69a72ce;hb=8cb6c0e68064b2ec798487b81a97e01336d88cfd;hp=26b01a13a61b7961da650b65969fd1c87e8b9be8;hpb=410b11fd0f49e1c0b1afc895c3ff4c2de093b347;p=vlc diff --git a/modules/codec/faad.c b/modules/codec/faad.c index 26b01a13a6..7af61bc7f0 100644 --- a/modules/codec/faad.c +++ b/modules/codec/faad.c @@ -22,10 +22,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include +#include #include @@ -36,7 +41,7 @@ static int Open( vlc_object_t * ); static void Close( vlc_object_t * ); vlc_module_begin(); - set_description( _("AAC audio decoder (using libfaad2)") ); + set_description( N_("AAC audio decoder (using libfaad2)") ); set_capability( "decoder", 100 ); set_category( CAT_INPUT ); set_subcategory( SUBCAT_INPUT_ACODEC ); @@ -47,8 +52,7 @@ vlc_module_end(); * Local prototypes ****************************************************************************/ static aout_buffer_t *DecodeBlock( decoder_t *, block_t ** ); -static void DoReordering( decoder_t *, uint32_t *, uint32_t *, int, int, - uint32_t * ); +static void DoReordering( uint32_t *, uint32_t *, int, int, uint32_t * ); #define MAX_CHANNEL_POSITIONS 9 @@ -63,12 +67,14 @@ struct decoder_sys_t /* temporary buffer */ uint8_t *p_buffer; int i_buffer; - int i_buffer_size; + size_t i_buffer_size; /* Channel positions of the current stream (for re-ordering) */ uint32_t pi_channel_positions[MAX_CHANNEL_POSITIONS]; - vlc_bool_t b_sbr, b_ps; + bool b_sbr, b_ps; + + int i_input_rate; }; static const uint32_t pi_channels_in[MAX_CHANNEL_POSITIONS] = @@ -87,6 +93,22 @@ static const uint32_t pi_channels_ordered[MAX_CHANNEL_POSITIONS] = 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 @@ -105,10 +127,7 @@ 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 ) @@ -121,7 +140,7 @@ static int Open( vlc_object_t *p_this ) aout_DateSet( &p_sys->date, 0 ); p_dec->fmt_out.i_cat = AUDIO_ES; - if (p_this->p_libvlc_global->i_cpu & CPU_CAPABILITY_FPU) + 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; @@ -145,6 +164,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_guessed[i_channels]; aout_DateInit( &p_sys->date, i_rate ); } else @@ -156,7 +178,7 @@ static int Open( vlc_object_t *p_this ) /* Set the faad config */ cfg = faacDecGetCurrentConfiguration( p_sys->hfaad ); - if (p_this->p_libvlc_global->i_cpu & CPU_CAPABILITY_FPU) + if (vlc_CPU() & CPU_CAPABILITY_FPU) cfg->outputFormat = FAAD_FMT_FLOAT; else cfg->outputFormat = FAAD_FMT_16BIT; @@ -164,12 +186,14 @@ 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->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 = 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; } @@ -191,6 +215,28 @@ 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 ) { @@ -198,10 +244,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; } @@ -218,6 +264,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 ); } } @@ -238,6 +288,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 ); } @@ -314,53 +367,57 @@ 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 ) { - input_thread_t *p_input = (input_thread_t *)p_dec->p_parent; - char *psz_cat, *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; + 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; } /* 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] ) - { - p_sys->pi_channel_positions[i] = pi_channels_out[j]; - p_dec->fmt_out.audio.i_physical_channels |= - pi_channels_out[j]; break; - } } - - if( j == MAX_CHANNEL_POSITIONS ) + if( j >= MAX_CHANNEL_POSITIONS ) { msg_Warn( p_dec, "unknown channel ordering" ); - - /* Try to invent something */ - p_sys->pi_channel_positions[i] = pi_channels_out[i]; - p_dec->fmt_out.audio.i_physical_channels |= - pi_channels_out[i]; + /* 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; @@ -375,9 +432,9 @@ 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 ); + (frame.samples / frame.channels) * p_sys->i_input_rate / INPUT_RATE_DEFAULT ); - DoReordering( p_dec, (uint32_t *)p_out->p_buffer, samples, + DoReordering( (uint32_t *)p_out->p_buffer, samples, frame.samples / frame.channels, frame.channels, p_sys->pi_channel_positions ); @@ -404,6 +461,7 @@ 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 ); } @@ -411,8 +469,7 @@ static void Close( vlc_object_t *p_this ) * DoReordering: do some channel re-ordering (the ac3 channel order is * different from the aac one). *****************************************************************************/ -static void DoReordering( decoder_t *p_dec, - uint32_t *p_out, uint32_t *p_in, int i_samples, +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]; @@ -432,7 +489,7 @@ static void DoReordering( decoder_t *p_dec, } /* Do the actual reordering */ - if( p_dec->p_libvlc_global->i_cpu & CPU_CAPABILITY_FPU ) + 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]] = @@ -443,3 +500,4 @@ static void DoReordering( decoder_t *p_dec, ((uint16_t *)p_out)[i * i_nb_channels + pi_chan_table[j]] = ((uint16_t *)p_in)[i * i_nb_channels + j]; } +