* This plugin makes use of liba52 to decode A/52 audio
* (http://liba52.sf.net/).
*****************************************************************************
- * Copyright (C) 2001, 2002 the VideoLAN team
+ * Copyright (C) 2001-2009 the VideoLAN team
* $Id$
*
* Authors: Gildas Bazin <gbazin@videolan.org>
set_description( N_("ATSC A/52 (AC-3) audio decoder") )
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_ACODEC )
- add_bool( "a52-dynrng", 1, NULL, DYNRNG_TEXT, DYNRNG_LONGTEXT, false )
- add_bool( "a52-upmix", 0, NULL, UPMIX_TEXT, UPMIX_LONGTEXT, true )
+ add_bool( "a52-dynrng", true, NULL, DYNRNG_TEXT, DYNRNG_LONGTEXT, false )
+ add_bool( "a52-upmix", false, NULL, UPMIX_TEXT, UPMIX_LONGTEXT, true )
set_capability( "audio filter", 100 )
set_callbacks( Create, Destroy )
static int Create( vlc_object_t *p_this )
{
aout_filter_t *p_filter = (aout_filter_t *)p_this;
- filter_sys_t *p_sys = (filter_sys_t *)p_filter->p_sys;
+ filter_sys_t *p_sys;
int i_ret;
- if ( p_filter->input.i_format != VLC_CODEC_A52
+ if ( p_filter->fmt_in.audio.i_format != VLC_CODEC_A52
#ifdef LIBA52_FIXED
- || p_filter->output.i_format != VLC_CODEC_FI32 )
+ || p_filter->fmt_out.audio.i_format != VLC_CODEC_FI32 )
#else
- || p_filter->output.i_format != VLC_CODEC_FL32 )
+ || p_filter->fmt_out.audio.i_format != VLC_CODEC_FL32 )
#endif
{
return -1;
}
- if ( p_filter->input.i_rate != p_filter->output.i_rate )
+ if ( p_filter->fmt_in.audio.i_rate != p_filter->fmt_out.audio.i_rate )
{
return -1;
}
return -1;
i_ret = Open( VLC_OBJECT(p_filter), p_sys,
- p_filter->input, p_filter->output );
+ p_filter->fmt_in.audio, p_filter->fmt_out.audio );
p_filter->pf_do_work = DoWork;
p_filter->b_in_place = 0;
/*****************************************************************************
* Interleave: helper function to interleave channels
*****************************************************************************/
-static void Interleave( float * p_out, const float * p_in, int i_nb_channels,
- int *pi_chan_table )
+static void Interleave( sample_t * p_out, const sample_t * p_in,
+ int i_nb_channels, int *pi_chan_table )
{
/* We do not only have to interleave, but also reorder the channels */
/*****************************************************************************
* Duplicate: helper function to duplicate a unique channel
*****************************************************************************/
-static void Duplicate( float * p_out, const float * p_in )
+static void Duplicate( sample_t * p_out, const sample_t * p_in )
{
int i;
/*****************************************************************************
* Exchange: helper function to exchange left & right channels
*****************************************************************************/
-static void Exchange( float * p_out, const float * p_in )
+static void Exchange( sample_t * p_out, const sample_t * p_in )
{
int i;
- const float * p_first = p_in + 256;
- const float * p_second = p_in;
+ const sample_t * p_first = p_in + 256;
+ const sample_t * p_second = p_in;
for ( i = 0; i < 256; i++ )
{
#endif
int i_flags = p_sys->i_flags;
int i_bytes_per_block = 256 * p_sys->i_nb_channels
- * sizeof(float);
+ * sizeof(sample_t);
int i;
/* Do the actual decoding now. */
if ( ((p_sys->i_flags & A52_CHANNEL_MASK) == A52_CHANNEL1
|| (p_sys->i_flags & A52_CHANNEL_MASK) == A52_CHANNEL2
|| (p_sys->i_flags & A52_CHANNEL_MASK) == A52_MONO)
- && (p_filter->output.i_physical_channels
+ && (p_filter->fmt_out.audio.i_physical_channels
& (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT)) )
{
- Duplicate( (float *)(p_out_buf->p_buffer + i * i_bytes_per_block),
+ Duplicate( (sample_t *)(p_out_buf->p_buffer + i * i_bytes_per_block),
p_samples );
}
- else if ( p_filter->output.i_original_channels
+ else if ( p_filter->fmt_out.audio.i_original_channels
& AOUT_CHAN_REVERSESTEREO )
{
- Exchange( (float *)(p_out_buf->p_buffer + i * i_bytes_per_block),
+ Exchange( (sample_t *)(p_out_buf->p_buffer + i * i_bytes_per_block),
p_samples );
}
else
{
/* Interleave the *$£%ù samples. */
- Interleave( (float *)(p_out_buf->p_buffer + i * i_bytes_per_block),
+ Interleave( (sample_t *)(p_out_buf->p_buffer + i * i_bytes_per_block),
p_samples, p_sys->i_nb_channels, p_sys->pi_chan_table);
}
}
p_out_buf->i_nb_samples = p_in_buf->i_nb_samples;
- p_out_buf->i_nb_bytes = i_bytes_per_block * 6;
+ p_out_buf->i_buffer = i_bytes_per_block * 6;
}
/*****************************************************************************
block_t *p_out;
int i_out_size;
- if( !p_block || !p_block->i_samples )
+ if( !p_block || !p_block->i_nb_samples )
{
if( p_block )
block_Release( p_block );
return NULL;
}
- i_out_size = p_block->i_samples *
+ i_out_size = p_block->i_nb_samples *
p_filter->fmt_out.audio.i_bitspersample *
p_filter->fmt_out.audio.i_channels / 8;
return NULL;
}
- p_out->i_samples = p_block->i_samples;
+ p_out->i_nb_samples = p_block->i_nb_samples;
p_out->i_dts = p_block->i_dts;
p_out->i_pts = p_block->i_pts;
p_out->i_length = p_block->i_length;
aout_filter.p_sys = (struct aout_filter_sys_t *)p_filter->p_sys;
- aout_filter.input = p_filter->fmt_in.audio;
- aout_filter.input.i_format = p_filter->fmt_in.i_codec;
- aout_filter.output = p_filter->fmt_out.audio;
- aout_filter.output.i_format = p_filter->fmt_out.i_codec;
+ aout_filter.fmt_in.audio = p_filter->fmt_in.audio;
+ aout_filter.fmt_in.audio.i_format = p_filter->fmt_in.i_codec;
+ aout_filter.fmt_out.audio = p_filter->fmt_out.audio;
+ aout_filter.fmt_out.audio.i_format = p_filter->fmt_out.i_codec;
in_buf.p_buffer = p_block->p_buffer;
- in_buf.i_nb_bytes = p_block->i_buffer;
- in_buf.i_nb_samples = p_block->i_samples;
+ in_buf.i_buffer = p_block->i_buffer;
+ in_buf.i_nb_samples = p_block->i_nb_samples;
out_buf.p_buffer = p_out->p_buffer;
- out_buf.i_nb_bytes = p_out->i_buffer;
- out_buf.i_nb_samples = p_out->i_samples;
+ out_buf.i_buffer = p_out->i_buffer;
+ out_buf.i_nb_samples = p_out->i_nb_samples;
DoWork( (aout_instance_t *)p_filter, &aout_filter, &in_buf, &out_buf );
- p_out->i_buffer = out_buf.i_nb_bytes;
- p_out->i_samples = out_buf.i_nb_samples;
+ p_out->i_buffer = out_buf.i_buffer;
+ p_out->i_nb_samples = out_buf.i_nb_samples;
block_Release( p_block );
projects / vlc / blobdiff