/*****************************************************************************
* decoder.c: AAC decoder using libfaad2
*****************************************************************************
- * Copyright (C) 2001, 2003 VideoLAN
- * $Id: faad.c,v 1.14 2004/02/25 17:48:52 fenrir Exp $
+ * Copyright (C) 2001, 2003 the VideoLAN team
+ * $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
- * Gildas Bazin <gbazin@netcourrier.com>
+ * Gildas Bazin <gbazin@videolan.org>
*
* 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
*
* 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include <vlc/vlc.h>
-#include <vlc/aout.h>
-#include <vlc/decoder.h>
+#include <vlc_aout.h>
+#include <vlc_codec.h>
+#include <vlc_input.h>
#include <faad.h>
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();
/* Channel positions of the current stream (for re-ordering) */
uint32_t pi_channel_positions[MAX_CHANNEL_POSITIONS];
+
+ vlc_bool_t b_sbr, b_ps;
};
static const uint32_t pi_channels_in[MAX_CHANNEL_POSITIONS] =
aout_DateSet( &p_sys->date, 0 );
p_dec->fmt_out.i_cat = AUDIO_ES;
- if (p_this->p_libvlc->i_cpu & CPU_CAPABILITY_FPU)
+ if (p_this->p_libvlc_global->i_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;
/* Set the faad config */
cfg = faacDecGetCurrentConfiguration( p_sys->hfaad );
- if (p_this->p_libvlc->i_cpu & CPU_CAPABILITY_FPU)
+ if (p_this->p_libvlc_global->i_cpu & CPU_CAPABILITY_FPU)
cfg->outputFormat = FAAD_FMT_FLOAT;
else
cfg->outputFormat = FAAD_FMT_16BIT;
p_sys->i_buffer = p_sys->i_buffer_size = 0;
p_sys->p_buffer = 0;
+ /* Faad2 can't deal with truncated data (eg. from MPEG TS) */
+ p_dec->b_need_packetized = VLC_TRUE;
+
+ p_sys->b_sbr = p_sys->b_ps = VLC_FALSE;
return VLC_SUCCESS;
}
p_block = *pp_block;
- if( p_block->i_flags&BLOCK_FLAG_DISCONTINUITY )
+ if( p_block->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
{
block_Release( p_block );
return NULL;
p_block->i_buffer = 0;
}
+ if( p_dec->fmt_out.audio.i_rate == 0 && p_dec->fmt_in.i_extra > 0 )
+ {
+ /* We have a decoder config so init the handle */
+ unsigned long i_rate;
+ unsigned char i_channels;
+
+ if( faacDecInit2( p_sys->hfaad, p_dec->fmt_in.p_extra,
+ p_dec->fmt_in.i_extra,
+ &i_rate, &i_channels ) >= 0 )
+ {
+ p_dec->fmt_out.audio.i_rate = i_rate;
+ p_dec->fmt_out.audio.i_channels = i_channels;
+ aout_DateInit( &p_sys->date, i_rate );
+ }
+ }
+
if( p_dec->fmt_out.audio.i_rate == 0 && p_sys->i_buffer )
{
unsigned long i_rate;
p_dec->fmt_out.audio.i_rate = frame.samplerate;
p_dec->fmt_out.audio.i_channels = 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;
+ }
/* Convert frame.channel_position to our own channel values */
for( i = 0; i < frame.channels; i++ )
break;
}
}
+
+ 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];
+ }
}
p_dec->fmt_out.audio.i_original_channels =
p_dec->fmt_out.audio.i_physical_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 );
}
}
/* Do the actual reordering */
- if( p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_FPU )
+ if( p_dec->p_libvlc_global->i_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]] =