* decoder.c: AAC decoder using libfaad2
*****************************************************************************
* Copyright (C) 2001, 2003 VideoLAN
- * $Id: faad.c,v 1.11 2004/02/19 15:42:25 jpsaman Exp $
+ * $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
aout_DateSet( &p_sys->date, 0 );
p_dec->fmt_out.i_cat = AUDIO_ES;
- if (p_intf->p_libvlc->i_cpu & CPU_CAPABILITY_FPU)
+ if (p_this->p_libvlc->i_cpu & CPU_CAPABILITY_FPU)
p_dec->fmt_out.i_codec = VLC_FOURCC('f','l','3','2');
else
- p_dec->fmt_out.i_codec = VLC_FOURCC('f','i','1','6');
+ p_dec->fmt_out.i_codec = AOUT_FMT_S16_NE;
p_dec->pf_decode_audio = DecodeBlock;
p_dec->fmt_out.audio.i_physical_channels =
/* Set the faad config */
cfg = faacDecGetCurrentConfiguration( p_sys->hfaad );
- if (p_intf->p_libvlc->i_cpu & CPU_CAPABILITY_FPU)
+ if (p_this->p_libvlc->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;
+
return VLC_SUCCESS;
}
p_block = *pp_block;
- if( p_block->b_discontinuity )
+ if( p_block->i_flags&BLOCK_FLAG_DISCONTINUITY )
{
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;
break;
}
}
+
+ if( j == MAX_CHANNEL_POSITIONS )
+ {
+ msg_Warn( p_dec, "unknown channel ordering" );
+ block_Release( p_block );
+ return NULL;
+ }
}
p_dec->fmt_out.audio.i_original_channels =
p_dec->fmt_out.audio.i_physical_channels;
}
/* Do the actual reordering */
- 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]] =
- p_in[i * i_nb_channels + j];
- }
- }
+ if( p_dec->p_libvlc->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]] =
+ p_in[i * i_nb_channels + j];
+ else
+ for( i = 0; i < i_samples; i++ )
+ for( j = 0; j < i_nb_channels; j++ )
+ ((uint16_t *)p_out)[i * i_nb_channels + pi_chan_table[j]] =
+ ((uint16_t *)p_in)[i * i_nb_channels + j];
}