X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Ffaad.c;h=9aaaed63e9977324bdccdbe1d6588f5a90e9637f;hb=49fc0b18011e38bb1886bd15575e249ed1728977;hp=3633bc893dfa6d6f89c72ecd7837845fc85980bb;hpb=51bbf793131496c6f31f70953ff434f17be80d63;p=vlc diff --git a/modules/codec/faad.c b/modules/codec/faad.c index 3633bc893d..9aaaed63e9 100644 --- a/modules/codec/faad.c +++ b/modules/codec/faad.c @@ -1,27 +1,35 @@ /***************************************************************************** - * decoder.c: AAC decoder using libfaad2 + * faad.c: AAC decoder using libfaad2 ***************************************************************************** - * Copyright (C) 2001, 2003 the VideoLAN team + * Copyright (C) 2001, 2003 VLC authors and VideoLAN * $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 - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +/***************************************************************************** + * NOTA BENE: this module requires the linking against a library which is + * known to require licensing under the GNU General Public License version 2 + * (or later). Therefore, the result of compiling this module will normally + * be subject to the terms of that later license. + *****************************************************************************/ + + #ifdef HAVE_CONFIG_H # include "config.h" #endif @@ -29,8 +37,8 @@ #include #include #include -#include #include +#include #include @@ -51,7 +59,7 @@ vlc_module_end () /**************************************************************************** * Local prototypes ****************************************************************************/ -static aout_buffer_t *DecodeBlock( decoder_t *, block_t ** ); +static block_t *DecodeBlock( decoder_t *, block_t ** ); static void DoReordering( uint32_t *, uint32_t *, int, int, uint32_t * ); #define MAX_CHANNEL_POSITIONS 9 @@ -62,7 +70,7 @@ struct decoder_sys_t faacDecHandle *hfaad; /* samples */ - audio_date_t date; + date_t date; /* temporary buffer */ uint8_t *p_buffer; @@ -114,7 +122,7 @@ static const uint32_t pi_channels_guessed[MAX_CHANNEL_POSITIONS] = 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; + decoder_sys_t *p_sys; faacDecConfiguration *cfg; if( p_dec->fmt_in.i_codec != VLC_CODEC_MP4A ) @@ -130,18 +138,15 @@ static int Open( vlc_object_t *p_this ) 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_CODEC_FL32; - else - p_dec->fmt_out.i_codec = VLC_CODEC_S16N; - p_dec->pf_decode_audio = DecodeBlock; + p_dec->fmt_out.i_codec = HAVE_FPU ? VLC_CODEC_FL32 : VLC_CODEC_S16N; p_dec->fmt_out.audio.i_physical_channels = p_dec->fmt_out.audio.i_original_channels = 0; @@ -157,6 +162,8 @@ static int Open( vlc_object_t *p_this ) &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; } @@ -165,7 +172,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 { @@ -176,10 +183,7 @@ static int Open( vlc_object_t *p_this ) /* Set the faad config */ cfg = faacDecGetCurrentConfiguration( p_sys->hfaad ); - if (vlc_CPU() & CPU_CAPABILITY_FPU) - cfg->outputFormat = FAAD_FMT_FLOAT; - else - cfg->outputFormat = FAAD_FMT_16BIT; + cfg->outputFormat = HAVE_FPU ? FAAD_FMT_FLOAT : FAAD_FMT_16BIT; faacDecSetConfiguration( p_sys->hfaad, cfg ); /* buffer */ @@ -190,13 +194,15 @@ static int Open( vlc_object_t *p_this ) p_dec->b_need_packetized = true; p_sys->b_sbr = p_sys->b_ps = false; + + p_dec->pf_decode_audio = DecodeBlock; return VLC_SUCCESS; } /***************************************************************************** * DecodeBlock: *****************************************************************************/ -static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) +static block_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) { decoder_sys_t *p_sys = p_dec->p_sys; block_t *p_block; @@ -222,9 +228,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; } } @@ -233,13 +237,22 @@ 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 ) { - vlc_memcpy( &p_sys->p_buffer[p_sys->i_buffer], + 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; @@ -261,7 +274,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 ); } } @@ -284,14 +297,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 ); @@ -304,8 +317,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; + block_t *p_out; samples = faacDecDecode( p_sys->hfaad, &frame, p_sys->p_buffer, p_sys->i_buffer ); @@ -314,6 +326,48 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) { msg_Warn( p_dec, "%s", faacDecGetErrorMessage( frame.error ) ); + if( frame.error == 21 || frame.error == 12 ) + { + /* + * Once an "Unexpected channel configuration change" + * or a "Invalid number of channels" error + * occurs, it will occurs afterwards, and we got no sound. + * Reinitialization of the decoder is required. + */ + unsigned long i_rate; + unsigned char i_channels; + faacDecHandle *hfaad; + faacDecConfiguration *cfg,*oldcfg; + + oldcfg = faacDecGetCurrentConfiguration( p_sys->hfaad ); + hfaad = faacDecOpen(); + cfg = faacDecGetCurrentConfiguration( hfaad ); + if( oldcfg->defSampleRate ) + cfg->defSampleRate = oldcfg->defSampleRate; + cfg->defObjectType = oldcfg->defObjectType; + cfg->outputFormat = oldcfg->outputFormat; + faacDecSetConfiguration( hfaad, cfg ); + + if( faacDecInit( hfaad, p_sys->p_buffer, p_sys->i_buffer, + &i_rate,&i_channels ) < 0 ) + { + /* reinitialization failed */ + faacDecClose( hfaad ); + faacDecSetConfiguration( p_sys->hfaad, oldcfg ); + } + else + { + faacDecClose( p_sys->hfaad ); + p_sys->hfaad = hfaad; + 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]; + date_Init( &p_sys->date, i_rate, 1 ); + } + } + /* Flush the buffer */ p_sys->i_buffer = 0; block_Release( p_block ); @@ -353,22 +407,20 @@ 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; - 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 ) + bool b_sbr = (frame.sbr == 1) || (frame.sbr == 2); + if( p_sys->b_sbr != b_sbr || p_sys->b_ps != frame.ps ) { - 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 ); @@ -378,12 +430,15 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) 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; + p_sys->b_sbr = b_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++ ) + const uint32_t nbChannels = frame.channels; + unsigned j; + for( unsigned i = 0; i < nbChannels; i++ ) { /* Find the channel code */ for( j = 0; j < MAX_CHANNEL_POSITIONS; j++ ) @@ -404,10 +459,19 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) 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 = decoder_NewAudioBuffer(p_dec, frame.samples/frame.channels); + if ( nbChannels != frame.channels ) + { + p_dec->fmt_out.audio.i_physical_channels + = p_dec->fmt_out.audio.i_original_channels + = pi_channels_guessed[nbChannels]; + } + else + { + p_dec->fmt_out.audio.i_original_channels = + p_dec->fmt_out.audio.i_physical_channels; + } + p_dec->fmt_out.audio.i_channels = nbChannels; + p_out = decoder_NewAudioBuffer( p_dec, frame.samples / nbChannels ); if( p_out == NULL ) { p_sys->i_buffer = 0; @@ -415,18 +479,31 @@ 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_out->i_pts = date_Get( &p_sys->date ); + p_out->i_length = date_Increment( &p_sys->date, + frame.samples / nbChannels ) + - p_out->i_pts; DoReordering( (uint32_t *)p_out->p_buffer, samples, - frame.samples / frame.channels, frame.channels, + frame.samples / nbChannels, nbChannels, p_sys->pi_channel_positions ); 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 ); + /* drop byte of raw AAC padding (if present) */ + if ( frame.header_type == RAW && + p_sys->i_buffer == 1 && + p_sys->p_buffer[0] == 0x21 && + p_sys->p_buffer[frame.bytesconsumed] == 0 ) + { + p_sys->i_buffer = 0; + } + else + { + memmove( p_sys->p_buffer, &p_sys->p_buffer[frame.bytesconsumed], + p_sys->i_buffer ); + } } return p_out; @@ -456,7 +533,7 @@ static void Close( vlc_object_t *p_this ) 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 pi_chan_table[MAX_CHANNEL_POSITIONS] = {0}; int i, j, k; /* Find the channels mapping */ @@ -473,7 +550,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]] =