# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_input.h>
#include <vlc_aout.h>
#include <vlc_codec.h>
-#include <vlc_input.h>
#include <faad.h>
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
/* 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] =
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 )
- {
- 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 )
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');
+ p_dec->fmt_out.i_codec = VLC_CODEC_FL32;
else
p_dec->fmt_out.i_codec = AOUT_FMT_S16_NE;
p_dec->pf_decode_audio = DecodeBlock;
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;
}
/* 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;
}
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 )
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) &&
- 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 */
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;
}
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,
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 );
}
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] )
{
((uint16_t *)p_out)[i * i_nb_channels + pi_chan_table[j]] =
((uint16_t *)p_in)[i * i_nb_channels + j];
}
+
projects / vlc / blobdiff