/*****************************************************************************
- * simple.c : simple channel mixer plug-in (only 7/7.1/5/5.1 -> Stereo for now)
+ * simple.c : simple channel mixer plug-in
*****************************************************************************
- * Copyright (C) 2002, 2006 the VideoLAN team
+ * Copyright (C) 2002, 2004, 2006-2009 the VideoLAN team
* $Id$
*
* Authors: Gildas Bazin <gbazin@videolan.org>
#include <vlc_aout.h>
#include <vlc_filter.h>
#include <vlc_block.h>
+#include <assert.h>
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-static int Create ( vlc_object_t * );
static int OpenFilter( vlc_object_t * );
vlc_module_begin ()
set_description( N_("Audio filter for simple channel mixing") )
- set_capability( "audio filter", 10 )
set_category( CAT_AUDIO )
set_subcategory( SUBCAT_AUDIO_MISC )
- set_callbacks( Create, NULL )
-
- add_submodule ()
- set_description( N_("audio filter for simple channel mixing") )
- set_capability( "audio filter2", 10 )
+ set_capability( "audio filter", 10 )
set_callbacks( OpenFilter, NULL )
vlc_module_end ()
#define AOUT_CHANS_STEREO_MIDDLE (AOUT_CHAN_MIDDLELEFT | AOUT_CHAN_MIDDLERIGHT )
#define AOUT_CHANS_2_0 AOUT_CHANS_STEREO_FRONT
+#define AOUT_CHANS_3_0 ( AOUT_CHANS_STEREO_FRONT | AOUT_CHAN_CENTER )
#define AOUT_CHANS_4_0 ( AOUT_CHANS_STEREO_FRONT | AOUT_CHANS_STEREO_REAR )
#define AOUT_CHANS_4_0_MIDDLE ( AOUT_CHANS_STEREO_FRONT | AOUT_CHANS_STEREO_MIDDLE )
+#define AOUT_CHANS_4_CENTER_REAR (AOUT_CHANS_STEREO_FRONT | AOUT_CHAN_CENTER | AOUT_CHAN_REARCENTER)
#define AOUT_CHANS_5_0 ( AOUT_CHANS_4_0 | AOUT_CHAN_CENTER )
#define AOUT_CHANS_5_0_MIDDLE ( AOUT_CHANS_4_0_MIDDLE | AOUT_CHAN_CENTER )
#define AOUT_CHANS_6_0 ( AOUT_CHANS_STEREO_FRONT | AOUT_CHANS_STEREO_REAR | AOUT_CHANS_STEREO_MIDDLE )
static bool IsSupported( const audio_format_t *p_input, const audio_format_t *p_output );
-static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
- aout_buffer_t * );
-
static block_t *Filter( filter_t *, block_t * );
-/*****************************************************************************
- * Create: allocate trivial channel mixer
- *****************************************************************************/
-static int Create( vlc_object_t *p_this )
-{
- aout_filter_t * p_filter = (aout_filter_t *)p_this;
-
- if( !IsSupported( &p_filter->input, &p_filter->output ) )
- return -1;
-
- p_filter->pf_do_work = DoWork;
- p_filter->b_in_place = 0;
-
- return 0;
-}
-
/*****************************************************************************
* DoWork: convert a buffer
*****************************************************************************/
-static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
+static void DoWork( filter_t * p_filter,
aout_buffer_t * p_in_buf, aout_buffer_t * p_out_buf )
{
- VLC_UNUSED(p_aout);
- const unsigned i_input_physical = p_filter->input.i_physical_channels;
+ const unsigned i_input_physical = p_filter->fmt_in.audio.i_physical_channels;
const bool b_input_7_0 = (i_input_physical & ~AOUT_CHAN_LFE) == AOUT_CHANS_7_0;
const bool b_input_5_0 = !b_input_7_0 &&
( (i_input_physical & AOUT_CHANS_5_0) == AOUT_CHANS_5_0 ||
(i_input_physical & AOUT_CHANS_5_0_MIDDLE) == AOUT_CHANS_5_0_MIDDLE );
- int i_input_nb = aout_FormatNbChannels( &p_filter->input );
- int i_output_nb = aout_FormatNbChannels( &p_filter->output );
+ const bool b_input_4_center_rear = !b_input_7_0 && !b_input_5_0 &&
+ (i_input_physical & ~AOUT_CHAN_LFE) == AOUT_CHANS_4_CENTER_REAR;
+ const bool b_input_3_0 = !b_input_7_0 && !b_input_5_0 && !b_input_4_center_rear &&
+ (i_input_physical & ~AOUT_CHAN_LFE) == AOUT_CHANS_3_0;
+
+ int i_input_nb = aout_FormatNbChannels( &p_filter->fmt_in.audio );
+ int i_output_nb = aout_FormatNbChannels( &p_filter->fmt_out.audio );
float *p_dest = (float *)p_out_buf->p_buffer;
const float *p_src = (const float *)p_in_buf->p_buffer;
int i;
p_out_buf->i_nb_samples = p_in_buf->i_nb_samples;
- p_out_buf->i_nb_bytes = p_in_buf->i_nb_bytes * i_output_nb / i_input_nb;
+ p_out_buf->i_buffer = p_in_buf->i_buffer * i_output_nb / i_input_nb;
- if( p_filter->output.i_physical_channels == AOUT_CHANS_2_0 )
+ if( p_filter->fmt_out.audio.i_physical_channels == AOUT_CHANS_2_0 )
{
if( b_input_7_0 )
for( i = p_in_buf->i_nb_samples; i--; )
p_src += 7;
- if( p_filter->input.i_physical_channels & AOUT_CHAN_LFE ) p_src++;
+ if( p_filter->fmt_in.audio.i_physical_channels & AOUT_CHAN_LFE ) p_src++;
}
- else
+ else if( b_input_5_0 )
for( i = p_in_buf->i_nb_samples; i--; )
{
*p_dest = p_src[4] + 0.5 * p_src[0] + 0.33 * p_src[2];
p_src += 5;
- if( p_filter->input.i_physical_channels & AOUT_CHAN_LFE ) p_src++;
+ if( p_filter->fmt_in.audio.i_physical_channels & AOUT_CHAN_LFE ) p_src++;
+ }
+ else if( b_input_3_0 )
+ for( i = p_in_buf->i_nb_samples; i--; )
+ {
+ *p_dest = p_src[2] + 0.5 * p_src[0];
+ p_dest++;
+ *p_dest = p_src[2] + 0.5 * p_src[1];
+ p_dest++;
+
+ p_src += 3;
+
+ if( p_filter->fmt_in.audio.i_physical_channels & AOUT_CHAN_LFE ) p_src++;
+ }
+ else if (b_input_4_center_rear)
+ for( i = p_in_buf->i_nb_samples; i--; )
+ {
+ *p_dest = p_src[2] + p_src[3] + 0.5 * p_src[0];
+ p_dest++;
+ *p_dest = p_src[2] + p_src[3] + 0.5 * p_src[1];
+ p_dest++;
+ p_src += 4;
}
}
- else if( p_filter->output.i_physical_channels == AOUT_CHAN_CENTER )
+ else if( p_filter->fmt_out.audio.i_physical_channels == AOUT_CHAN_CENTER )
{
if( b_input_7_0 )
for( i = p_in_buf->i_nb_samples; i--; )
p_src += 7;
- if( p_filter->input.i_physical_channels & AOUT_CHAN_LFE ) p_src++;
+ if( p_filter->fmt_in.audio.i_physical_channels & AOUT_CHAN_LFE ) p_src++;
}
else if( b_input_5_0 )
for( i = p_in_buf->i_nb_samples; i--; )
p_src += 5;
- if( p_filter->input.i_physical_channels & AOUT_CHAN_LFE ) p_src++;
+ if( p_filter->fmt_in.audio.i_physical_channels & AOUT_CHAN_LFE ) p_src++;
+ }
+ else if( b_input_3_0 )
+ for( i = p_in_buf->i_nb_samples; i--; )
+ {
+ *p_dest = p_src[2] + p_src[0] / 4 + p_src[1] / 4;
+ p_dest++;
+
+ p_src += 3;
+
+ if( p_filter->fmt_in.audio.i_physical_channels & AOUT_CHAN_LFE ) p_src++;
}
else
for( i = p_in_buf->i_nb_samples; i--; )
}
else
{
+ assert( p_filter->fmt_out.audio.i_physical_channels == AOUT_CHANS_4_0 );
+ assert( b_input_7_0 || b_input_5_0 );
+
if( b_input_7_0 )
for( i = p_in_buf->i_nb_samples; i--; )
{
p_src += 7;
- if( p_filter->input.i_physical_channels & AOUT_CHAN_LFE ) p_src++;
+ if( p_filter->fmt_in.audio.i_physical_channels & AOUT_CHAN_LFE ) p_src++;
}
else
for( i = p_in_buf->i_nb_samples; i--; )
p_src += 5;
- if( p_filter->input.i_physical_channels & AOUT_CHAN_LFE ) p_src++;
+ if( p_filter->fmt_in.audio.i_physical_channels & AOUT_CHAN_LFE ) p_src++;
}
}
}
*****************************************************************************/
static block_t *Filter( filter_t *p_filter, block_t *p_block )
{
- aout_filter_t aout_filter;
- aout_buffer_t in_buf, out_buf;
- 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 *
+ size_t i_out_size = p_block->i_nb_samples *
p_filter->fmt_out.audio.i_bitspersample *
p_filter->fmt_out.audio.i_channels / 8;
- p_out = p_filter->pf_audio_buffer_new( p_filter, i_out_size );
+ block_t *p_out = filter_NewAudioBuffer( p_filter, i_out_size );
if( !p_out )
{
msg_Warn( p_filter, "can't get output buffer" );
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;
-
- 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;
- 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;
-
- DoWork( (aout_instance_t *)p_filter, &aout_filter, &in_buf, &out_buf );
+ DoWork( p_filter, p_block, p_out );
block_Release( p_block );
- p_out->i_buffer = out_buf.i_nb_bytes;
- p_out->i_samples = out_buf.i_nb_samples;
-
return p_out;
}
return false;
}
- /* Only from 7/7.1/5/5.1/2.0
+ /* Only from 7/7.1/5/5.1/3/3.1/2.0
* XXX 5.X rear and middle are handled the same way */
if( (p_input->i_physical_channels & ~AOUT_CHAN_LFE) != AOUT_CHANS_7_0 &&
(p_input->i_physical_channels & ~AOUT_CHAN_LFE) != AOUT_CHANS_5_0 &&
(p_input->i_physical_channels & ~AOUT_CHAN_LFE) != AOUT_CHANS_5_0_MIDDLE &&
+ (p_input->i_physical_channels & ~AOUT_CHAN_LFE) != AOUT_CHANS_3_0 &&
+ (p_input->i_physical_channels & ~AOUT_CHAN_LFE) != AOUT_CHANS_4_CENTER_REAR &&
p_input->i_physical_channels != AOUT_CHANS_2_0 )
{
return false;
projects / vlc / blobdiff