/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <string.h>
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_aout.h>
+#include <vlc_filter.h>
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static int Create ( vlc_object_t * );
-static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
- aout_buffer_t * );
+static block_t *DoWork( filter_t *, block_t * );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-vlc_module_begin();
- set_description( _("Audio filter for trivial channel mixing") );
- set_capability( "audio filter", 1 );
- set_category( CAT_AUDIO );
- set_subcategory( SUBCAT_AUDIO_MISC );
- set_callbacks( Create, NULL );
-vlc_module_end();
+vlc_module_begin ()
+ set_description( N_("Audio filter for trivial channel mixing") )
+ set_capability( "audio filter2", 1 )
+ set_category( CAT_AUDIO )
+ set_subcategory( SUBCAT_AUDIO_MISC )
+ set_callbacks( Create, NULL )
+vlc_module_end ()
/*****************************************************************************
* Create: allocate trivial channel mixer
*****************************************************************************/
static int Create( vlc_object_t *p_this )
{
- aout_filter_t * p_filter = (aout_filter_t *)p_this;
-
- if ( (p_filter->input.i_physical_channels
- == p_filter->output.i_physical_channels
- && p_filter->input.i_original_channels
- == p_filter->output.i_original_channels)
- || p_filter->input.i_format != p_filter->output.i_format
- || p_filter->input.i_rate != p_filter->output.i_rate
- || (p_filter->input.i_format != VLC_FOURCC('f','l','3','2')
- && p_filter->input.i_format != VLC_FOURCC('f','i','3','2')) )
- {
- return -1;
- }
+ filter_t * p_filter = (filter_t *)p_this;
- p_filter->pf_do_work = DoWork;
- if ( aout_FormatNbChannels( &p_filter->input )
- > aout_FormatNbChannels( &p_filter->output ) )
+ if ( (p_filter->fmt_in.audio.i_physical_channels
+ == p_filter->fmt_out.audio.i_physical_channels
+ && p_filter->fmt_in.audio.i_original_channels
+ == p_filter->fmt_out.audio.i_original_channels)
+ || p_filter->fmt_in.audio.i_format != p_filter->fmt_out.audio.i_format
+ || p_filter->fmt_in.audio.i_rate != p_filter->fmt_out.audio.i_rate
+ || (p_filter->fmt_in.audio.i_format != VLC_CODEC_FL32
+ && p_filter->fmt_in.audio.i_format != VLC_CODEC_FI32) )
{
- /* Downmixing */
- p_filter->b_in_place = 1;
- }
- else
- {
- /* Upmixing */
- p_filter->b_in_place = 0;
+ return VLC_EGENERIC;
}
- return 0;
+ p_filter->pf_audio_filter = DoWork;
+ return VLC_SUCCESS;
}
/*****************************************************************************
/*****************************************************************************
* DoWork: convert a buffer
*****************************************************************************/
-static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
- aout_buffer_t * p_in_buf, aout_buffer_t * p_out_buf )
+static block_t *DoWork( filter_t * p_filter, block_t * p_in_buf )
{
- int i_input_nb = aout_FormatNbChannels( &p_filter->input );
- int i_output_nb = aout_FormatNbChannels( &p_filter->output );
- int32_t * p_dest = (int32_t *)p_out_buf->p_buffer;
- int32_t * p_src = (int32_t *)p_in_buf->p_buffer;
+ int i_input_nb = aout_FormatNbChannels( &p_filter->fmt_in.audio );
+ int i_output_nb = aout_FormatNbChannels( &p_filter->fmt_out.audio );
- 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;
+ block_t *p_out_buf;
+ if( i_input_nb >= i_output_nb )
+ {
+ p_out_buf = p_in_buf; /* mix in place */
+ p_out_buf->i_buffer = p_in_buf->i_buffer / i_input_nb * i_output_nb;
+ }
+ else
+ {
+ p_out_buf = filter_NewAudioBuffer( p_filter,
+ p_in_buf->i_buffer / i_input_nb * i_output_nb );
+ if( !p_out_buf )
+ goto out;
+ p_out_buf->i_nb_samples = p_in_buf->i_nb_samples;
+ }
+
+ int32_t * p_dest = (int32_t *)p_out_buf->p_buffer;
+ const int32_t * p_src = (int32_t *)p_in_buf->p_buffer;
- if ( (p_filter->output.i_original_channels & AOUT_CHAN_PHYSMASK)
- != (p_filter->input.i_original_channels & AOUT_CHAN_PHYSMASK)
- && (p_filter->input.i_original_channels & AOUT_CHAN_PHYSMASK)
+ if ( (p_filter->fmt_out.audio.i_original_channels & AOUT_CHAN_PHYSMASK)
+ != (p_filter->fmt_in.audio.i_original_channels & AOUT_CHAN_PHYSMASK)
+ && (p_filter->fmt_in.audio.i_original_channels & AOUT_CHAN_PHYSMASK)
== (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT) )
{
int i;
/* This is a bit special. */
- if ( !(p_filter->output.i_original_channels & AOUT_CHAN_LEFT) )
+ if ( !(p_filter->fmt_out.audio.i_original_channels & AOUT_CHAN_LEFT) )
{
p_src++;
}
- if ( p_filter->output.i_physical_channels == AOUT_CHAN_CENTER )
+ if ( p_filter->fmt_out.audio.i_physical_channels == AOUT_CHAN_CENTER )
{
/* Mono mode */
for ( i = p_in_buf->i_nb_samples; i--; )
}
}
}
- else if ( p_filter->output.i_original_channels
+ else if ( p_filter->fmt_out.audio.i_original_channels
& AOUT_CHAN_REVERSESTEREO )
{
/* Reverse-stereo mode */
SparseCopy( p_dest, p_src, p_in_buf->i_nb_samples, i_output_nb,
i_input_nb );
}
+out:
+ if( p_in_buf != p_out_buf )
+ block_Release( p_in_buf );
+ return p_out_buf;
}
projects / vlc / blobdiff