X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Ffaad.c;h=6d1c927f48e42a42faca4c22fe4b548aa1560767;hb=c60652e38ac6afd74bd8225e9dae5406f13aaa4f;hp=0d922a6268e1b11278f1f29d4ffbd4e55ddc66fb;hpb=f5266ccf92db33ce9f6234de82b46b96f089e37d;p=vlc diff --git a/modules/codec/faad.c b/modules/codec/faad.c index 0d922a6268..6d1c927f48 100644 --- a/modules/codec/faad.c +++ b/modules/codec/faad.c @@ -26,11 +26,12 @@ # include "config.h" #endif -#include +#include #include +#include #include #include -#include +#include #include @@ -40,13 +41,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 @@ -62,7 +63,7 @@ struct decoder_sys_t faacDecHandle *hfaad; /* samples */ - audio_date_t date; + date_t date; /* temporary buffer */ uint8_t *p_buffer; @@ -73,8 +74,6 @@ struct decoder_sys_t uint32_t pi_channel_positions[MAX_CHANNEL_POSITIONS]; bool b_sbr, b_ps; - - int i_input_rate; }; static const uint32_t pi_channels_in[MAX_CHANNEL_POSITIONS] = @@ -119,31 +118,31 @@ static int Open( vlc_object_t *p_this ) decoder_sys_t *p_sys = p_dec->p_sys; faacDecConfiguration *cfg; - if( p_dec->fmt_in.i_codec != VLC_FOURCC('m','p','4','a') ) + if( p_dec->fmt_in.i_codec != VLC_CODEC_MP4A ) { 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 ) + 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 ) { msg_Err( p_dec, "cannot initialize faad" ); + free( p_sys ); return VLC_EGENERIC; } /* Misc init */ - aout_DateSet( &p_sys->date, 0 ); + date_Set( &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'); + if (HAVE_FPU) + p_dec->fmt_out.i_codec = VLC_CODEC_FL32; else - p_dec->fmt_out.i_codec = AOUT_FMT_S16_NE; + p_dec->fmt_out.i_codec = VLC_CODEC_S16N; p_dec->pf_decode_audio = DecodeBlock; p_dec->fmt_out.audio.i_physical_channels = @@ -159,6 +158,9 @@ 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" ); + faacDecClose( p_sys->hfaad ); + free( p_sys ); return VLC_EGENERIC; } @@ -167,7 +169,7 @@ static int Open( vlc_object_t *p_this ) 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 ); + date_Init( &p_sys->date, i_rate, 1 ); } else { @@ -178,7 +180,7 @@ static int Open( vlc_object_t *p_this ) /* Set the faad config */ cfg = faacDecGetCurrentConfiguration( p_sys->hfaad ); - if (vlc_CPU() & CPU_CAPABILITY_FPU) + if (HAVE_FPU) cfg->outputFormat = FAAD_FMT_FLOAT; else cfg->outputFormat = FAAD_FMT_16BIT; @@ -188,8 +190,6 @@ static int Open( vlc_object_t *p_this ) 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; @@ -215,9 +215,6 @@ 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 ) { @@ -229,9 +226,7 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) /* 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->p_buffer += i_header_size; p_block->i_buffer -= i_header_size; } } @@ -240,8 +235,17 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) /* 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_sys->i_buffer + p_block->i_buffer; - p_sys->p_buffer = realloc( p_sys->p_buffer, p_sys->i_buffer_size ); + size_t i_buffer_size = p_sys->i_buffer + p_block->i_buffer; + uint8_t *p_buffer = realloc( p_sys->p_buffer, i_buffer_size ); + if( p_buffer ) + { + p_sys->i_buffer_size = i_buffer_size; + p_sys->p_buffer = p_buffer; + } + else + { + p_block->i_buffer = 0; + } } if( p_block->i_buffer > 0 ) @@ -268,7 +272,7 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) = p_dec->fmt_out.audio.i_original_channels = pi_channels_guessed[i_channels]; - aout_DateInit( &p_sys->date, i_rate ); + date_Init( &p_sys->date, i_rate, 1 ); } } @@ -291,14 +295,14 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) 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 ); + date_Init( &p_sys->date, i_rate, 1 ); } - if( p_block->i_pts != 0 && p_block->i_pts != aout_DateGet( &p_sys->date ) ) + if( p_block->i_pts > VLC_TS_INVALID && p_block->i_pts != date_Get( &p_sys->date ) ) { - aout_DateSet( &p_sys->date, p_block->i_pts ); + date_Set( &p_sys->date, p_block->i_pts ); } - else if( !aout_DateGet( &p_sys->date ) ) + else if( !date_Get( &p_sys->date ) ) { /* We've just started the stream, wait for the first PTS. */ block_Release( p_block ); @@ -360,10 +364,10 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) /* We decoded a valid frame */ if( p_dec->fmt_out.audio.i_rate != frame.samplerate ) { - aout_DateInit( &p_sys->date, frame.samplerate ); - aout_DateSet( &p_sys->date, p_block->i_pts ); + date_Init( &p_sys->date, frame.samplerate, 1 ); + date_Set( &p_sys->date, p_block->i_pts ); } - p_block->i_pts = 0; /* PTS is valid only once */ + p_block->i_pts = VLC_TS_INVALID; /* PTS is valid only once */ p_dec->fmt_out.audio.i_rate = frame.samplerate; p_dec->fmt_out.audio.i_channels = frame.channels; @@ -372,28 +376,22 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) = 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 ) + bool b_sbr = (frame.sbr == 1) || (frame.sbr == 2); + if( p_sys->b_sbr != b_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"; + const char *psz_ext = (b_sbr && frame.ps) ? "SBR+PS" : + b_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( !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 = b_sbr; + p_sys->b_ps = frame.ps; } /* Convert frame.channel_position to our own channel values */ @@ -422,7 +420,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; @@ -430,9 +428,10 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) return 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 ); + p_out->i_pts = date_Get( &p_sys->date ); + p_out->i_length = date_Increment( &p_sys->date, + frame.samples / frame.channels ) + - p_out->i_pts; DoReordering( (uint32_t *)p_out->p_buffer, samples, frame.samples / frame.channels, frame.channels, @@ -489,7 +488,7 @@ static void DoReordering( uint32_t *p_out, uint32_t *p_in, int i_samples, } /* Do the actual reordering */ - if( vlc_CPU() & CPU_CAPABILITY_FPU ) + if( HAVE_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]] =