# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_aout.h>
#include <vlc_codec.h>
#include <vlc_input.h>
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 );
/* 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;
};
/* 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 )
/* 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;
}
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 )
{
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;
}
{
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 );
}
}
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 );
}
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) &&
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 );
}
((uint16_t *)p_out)[i * i_nb_channels + pi_chan_table[j]] =
((uint16_t *)p_in)[i * i_nb_channels + j];
}
+