/*****************************************************************************
- * 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 VLC authors and VideoLAN
* $Id$
*
* Authors: 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
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_aout.h>
#include <vlc_filter.h>
#include <vlc_block.h>
+#include <assert.h>
/*****************************************************************************
- * Local prototypes
+ * Module descriptor
*****************************************************************************/
-static int Create ( vlc_object_t * );
+static int OpenFilter( vlc_object_t * );
-static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
- aout_buffer_t * );
-
-static int OpenFilter ( vlc_object_t * );
-static block_t *Filter( filter_t *, block_t * );
+vlc_module_begin ()
+ set_description( N_("Audio filter for simple channel mixing") )
+ set_category( CAT_AUDIO )
+ set_subcategory( SUBCAT_AUDIO_MISC )
+ set_capability( "audio converter", 10 )
+ set_callbacks( OpenFilter, NULL )
+vlc_module_end ()
/*****************************************************************************
- * Module descriptor
+ * Local prototypes
*****************************************************************************/
-vlc_module_begin();
- set_description( _("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( _("audio filter for simple channel mixing") );
- set_capability( "audio filter2", 10 );
- set_callbacks( OpenFilter, NULL );
-vlc_module_end();
+static bool IsSupported( const audio_format_t *p_input, const audio_format_t *p_output );
-/*****************************************************************************
- * Create: allocate trivial channel mixer
- *****************************************************************************/
-static int Create( vlc_object_t *p_this )
+struct filter_sys_t
{
- 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') )
+ void (*pf_dowork)(filter_t *, block_t *, block_t * );
+};
+
+static block_t *Filter( filter_t *, block_t * );
+
+static void DoWork_7_x_to_2_0( filter_t * p_filter, block_t * p_in_buf, block_t * p_out_buf ) {
+ float *p_dest = (float *)p_out_buf->p_buffer;
+ const float *p_src = (const float *)p_in_buf->p_buffer;
+ for( int i = p_in_buf->i_nb_samples; i--; )
{
- return -1;
+ *p_dest++ = p_src[6] + 0.5 * p_src[0] + p_src[2] / 4 + p_src[4] / 4;
+ *p_dest++ = p_src[6] + 0.5 * p_src[1] + p_src[3] / 4 + p_src[5] / 4;
+
+ p_src += 7;
+
+ if( p_filter->fmt_in.audio.i_physical_channels & AOUT_CHAN_LFE ) p_src++;
}
+}
- /* Only conversion to Mono, Stereo and 4.0 right now */
- if( p_filter->output.i_physical_channels !=
- (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT)
- && p_filter->output.i_physical_channels !=
- ( AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT |
- AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT)
- && p_filter->output.i_physical_channels != AOUT_CHAN_CENTER )
+static void DoWork_5_x_to_2_0( filter_t * p_filter, block_t * p_in_buf, block_t * p_out_buf ) {
+ float *p_dest = (float *)p_out_buf->p_buffer;
+ const float *p_src = (const float *)p_in_buf->p_buffer;
+ for( int i = p_in_buf->i_nb_samples; i--; )
{
- return -1;
+ *p_dest++ = p_src[0] + 0.7071 * (p_src[4] + p_src[2]);
+ *p_dest++ = p_src[1] + 0.7071 * (p_src[4] + p_src[3]);
+
+ p_src += 5;
+
+ if( p_filter->fmt_in.audio.i_physical_channels & AOUT_CHAN_LFE ) p_src++;
}
+}
- /* Only from 7/7.1/5/5.1/2.0 */
- if( (p_filter->input.i_physical_channels & ~AOUT_CHAN_LFE) !=
- (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER |
- AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT) &&
- (p_filter->input.i_physical_channels & ~AOUT_CHAN_LFE) !=
- (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER |
- AOUT_CHAN_MIDDLELEFT | AOUT_CHAN_MIDDLERIGHT |
- AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT) &&
- p_filter->input.i_physical_channels !=
- (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT) )
+static void DoWork_4_0_to_2_0( filter_t * p_filter, block_t * p_in_buf, block_t * p_out_buf ) {
+ VLC_UNUSED(p_filter);
+ float *p_dest = (float *)p_out_buf->p_buffer;
+ const float *p_src = (const float *)p_in_buf->p_buffer;
+ for( int i = p_in_buf->i_nb_samples; i--; )
{
- return -1;
+ *p_dest++ = p_src[2] + p_src[3] + 0.5 * p_src[0];
+ *p_dest++ = p_src[2] + p_src[3] + 0.5 * p_src[1];
+ p_src += 4;
}
+}
+
+static void DoWork_3_x_to_2_0( filter_t * p_filter, block_t * p_in_buf, block_t * p_out_buf ) {
+ float *p_dest = (float *)p_out_buf->p_buffer;
+ const float *p_src = (const float *)p_in_buf->p_buffer;
+ for( int i = p_in_buf->i_nb_samples; i--; )
+ {
+ *p_dest++ = p_src[2] + 0.5 * p_src[0];
+ *p_dest++ = p_src[2] + 0.5 * p_src[1];
- p_filter->pf_do_work = DoWork;
- p_filter->b_in_place = 0;
+ p_src += 3;
- return 0;
+ if( p_filter->fmt_in.audio.i_physical_channels & AOUT_CHAN_LFE ) p_src++;
+ }
}
-/*****************************************************************************
- * 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 )
-{
- int i_input_nb = aout_FormatNbChannels( &p_filter->input );
- int i_output_nb = aout_FormatNbChannels( &p_filter->output );
+static void DoWork_7_x_to_1_0( filter_t * p_filter, block_t * p_in_buf, block_t * p_out_buf ) {
float *p_dest = (float *)p_out_buf->p_buffer;
- float *p_src = (float *)p_in_buf->p_buffer;
- int i;
+ const float *p_src = (const float *)p_in_buf->p_buffer;
+ for( int i = p_in_buf->i_nb_samples; i--; )
+ {
+ *p_dest++ = p_src[6] + p_src[0] / 4 + p_src[1] / 4 + p_src[2] / 8 + p_src[3] / 8 + p_src[4] / 8 + p_src[5] / 8;
- 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_src += 7;
+
+ if( p_filter->fmt_in.audio.i_physical_channels & AOUT_CHAN_LFE ) p_src++;
+ }
+}
- if( p_filter->output.i_physical_channels ==
- (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT) )
+static void DoWork_5_x_to_1_0( filter_t * p_filter, block_t * p_in_buf, block_t * p_out_buf ) {
+ float *p_dest = (float *)p_out_buf->p_buffer;
+ const float *p_src = (const float *)p_in_buf->p_buffer;
+ for( int i = p_in_buf->i_nb_samples; i--; )
{
- if( p_filter->input.i_physical_channels & AOUT_CHAN_MIDDLELEFT )
- for( i = p_in_buf->i_nb_samples; i--; )
- {
- *p_dest = p_src[6] + 0.5 * p_src[0] + p_src[2] / 4 + p_src[4] / 4;
- p_dest++;
- *p_dest = p_src[6] + 0.5 * p_src[1] + p_src[3] / 4 + p_src[5] / 4;
- p_dest++;
-
- p_src += 7;
-
- if( p_filter->input.i_physical_channels & AOUT_CHAN_LFE ) p_src++;
- }
- else
- 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_dest++;
- *p_dest = p_src[4] + 0.5 * p_src[1] + 0.33 * p_src[3];
- p_dest++;
+ *p_dest++ = 0.7071 * (p_src[0] + p_src[1]) + p_src[4] + 0.5f * (p_src[2] + p_src[3]);
- p_src += 5;
+ 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( p_filter->output.i_physical_channels == AOUT_CHAN_CENTER )
+}
+
+static void DoWork_4_0_to_1_0( filter_t * p_filter, block_t * p_in_buf, block_t * p_out_buf ) {
+ VLC_UNUSED(p_filter);
+ float *p_dest = (float *)p_out_buf->p_buffer;
+ const float *p_src = (const float *)p_in_buf->p_buffer;
+ for( int i = p_in_buf->i_nb_samples; i--; )
{
- if( p_filter->input.i_physical_channels & AOUT_CHAN_MIDDLELEFT )
- for( i = p_in_buf->i_nb_samples; i--; )
- {
- *p_dest = p_src[6] + p_src[0] / 4 + p_src[1] / 4 + p_src[2] / 8 + p_src[3] / 8 + p_src[4] / 8 + p_src[5] / 8;
- p_dest++;
-
- p_src += 7;
-
- if( p_filter->input.i_physical_channels & AOUT_CHAN_LFE ) p_src++;
- }
- else if( p_filter->input.i_physical_channels & AOUT_CHAN_REARLEFT )
- for( i = p_in_buf->i_nb_samples; i--; )
- {
- *p_dest = p_src[4] + p_src[0] / 4 + p_src[1] / 4 + p_src[2] / 6 + p_src[3] / 6;
- p_dest++;
-
- p_src += 5;
-
- if( p_filter->input.i_physical_channels & AOUT_CHAN_LFE ) p_src++;
- }
- else
- for( i = p_in_buf->i_nb_samples; i--; )
- {
- *p_dest = p_src[0] / 2 + p_src[1] / 2;
- p_dest++;
+ *p_dest++ = p_src[2] + p_src[3] + p_src[0] / 4 + p_src[1] / 4;
+ p_src += 4;
+ }
+}
- p_src += 2;
- }
+static void DoWork_3_x_to_1_0( filter_t * p_filter, block_t * p_in_buf, block_t * p_out_buf ) {
+ float *p_dest = (float *)p_out_buf->p_buffer;
+ const float *p_src = (const float *)p_in_buf->p_buffer;
+ for( int i = p_in_buf->i_nb_samples; i--; )
+ {
+ *p_dest++ = p_src[2] + p_src[0] / 4 + p_src[1] / 4;
+
+ p_src += 3;
+
+ if( p_filter->fmt_in.audio.i_physical_channels & AOUT_CHAN_LFE ) p_src++;
}
- else
+}
+
+static void DoWork_2_x_to_1_0( filter_t * p_filter, block_t * p_in_buf, block_t * p_out_buf ) {
+ VLC_UNUSED(p_filter);
+ float *p_dest = (float *)p_out_buf->p_buffer;
+ const float *p_src = (const float *)p_in_buf->p_buffer;
+ for( int i = p_in_buf->i_nb_samples; i--; )
{
- if( p_filter->input.i_physical_channels & AOUT_CHAN_MIDDLELEFT )
- for( i = p_in_buf->i_nb_samples; i--; )
- {
- *p_dest = p_src[6] + 0.5 * p_src[0] + p_src[2] / 6;
- p_dest++;
- *p_dest = p_src[6] + 0.5 * p_src[1] + p_src[3] / 6;
- p_dest++;
- *p_dest = p_src[2] / 6 + p_src[4];
- p_dest++;
- *p_dest = p_src[3] / 6 + p_src[5];
- p_dest++;
-
- p_src += 7;
-
- if( p_filter->input.i_physical_channels & AOUT_CHAN_LFE ) p_src++;
- }
- else
- for( i = p_in_buf->i_nb_samples; i--; )
- {
- *p_dest = p_src[4] + 0.5 * p_src[0];
- p_dest++;
- *p_dest = p_src[4] + 0.5 * p_src[1];
- p_dest++;
- *p_dest = p_src[2];
- p_dest++;
- *p_dest = p_src[3];
- p_dest++;
-
- p_src += 5;
-
- if( p_filter->input.i_physical_channels & AOUT_CHAN_LFE ) p_src++;
- }
+ *p_dest++ = p_src[0] / 2 + p_src[1] / 2;
+
+ p_src += 2;
+ }
+}
+
+static void DoWork_7_x_to_4_0( filter_t * p_filter, block_t * p_in_buf, block_t * p_out_buf ) {
+ float *p_dest = (float *)p_out_buf->p_buffer;
+ const float *p_src = (const float *)p_in_buf->p_buffer;
+ for( int i = p_in_buf->i_nb_samples; i--; )
+ {
+ *p_dest++ = p_src[6] + 0.5 * p_src[0] + p_src[2] / 6;
+ *p_dest++ = p_src[6] + 0.5 * p_src[1] + p_src[3] / 6;
+ *p_dest++ = p_src[2] / 6 + p_src[4];
+ *p_dest++ = p_src[3] / 6 + p_src[5];
+
+ p_src += 7;
+
+ if( p_filter->fmt_in.audio.i_physical_channels & AOUT_CHAN_LFE ) p_src++;
+ }
+}
+
+static void DoWork_5_x_to_4_0( filter_t * p_filter, block_t * p_in_buf, block_t * p_out_buf ) {
+ float *p_dest = (float *)p_out_buf->p_buffer;
+ const float *p_src = (const float *)p_in_buf->p_buffer;
+ for( int i = p_in_buf->i_nb_samples; i--; )
+ {
+ *p_dest++ = p_src[0] + p_src[4] * 0.7071;
+ *p_dest++ = p_src[1] + p_src[4] * 0.7071;
+ *p_dest++ = p_src[2];
+ *p_dest++ = p_src[3];
+
+ p_src += 5;
+
+ if( p_filter->fmt_in.audio.i_physical_channels & AOUT_CHAN_LFE ) p_src++;
+ }
+}
+static void DoWork_7_x_to_5_x( filter_t * p_filter, block_t * p_in_buf, block_t * p_out_buf ) {
+ float *p_dest = (float *)p_out_buf->p_buffer;
+ const float *p_src = (const float *)p_in_buf->p_buffer;
+ for( int i = p_in_buf->i_nb_samples; i--; )
+ {
+ *p_dest++ = p_src[0];
+ *p_dest++ = p_src[1];
+ *p_dest++ = (p_src[2] + p_src[4]) * 0.5;
+ *p_dest++ = (p_src[3] + p_src[5]) * 0.5;
+ *p_dest++ = p_src[6];
+
+ p_src += 7;
+
+ if( p_filter->fmt_in.audio.i_physical_channels & AOUT_CHAN_LFE &&
+ p_filter->fmt_out.audio.i_physical_channels & AOUT_CHAN_LFE )
+ *p_dest++ = *p_src++;
+ else if( p_filter->fmt_in.audio.i_physical_channels & AOUT_CHAN_LFE ) p_src++;
}
}
+
/*****************************************************************************
* OpenFilter:
*****************************************************************************/
static int OpenFilter( vlc_object_t *p_this )
{
filter_t *p_filter = (filter_t *)p_this;
+ filter_sys_t *p_sys;
+
+ audio_format_t fmt_in = p_filter->fmt_in.audio;
+ audio_format_t fmt_out = p_filter->fmt_out.audio;
+
+ fmt_in.i_format = p_filter->fmt_in.i_codec;
+ fmt_out.i_format = p_filter->fmt_out.i_codec;
- 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.i_codec != p_filter->fmt_out.i_codec
- || p_filter->fmt_in.audio.i_rate != p_filter->fmt_out.audio.i_rate
- || p_filter->fmt_in.i_codec != VLC_FOURCC('f','l','3','2') )
+ if( !IsSupported( &fmt_in, &fmt_out ) )
+ return VLC_EGENERIC;
+
+ p_filter->p_sys = malloc( sizeof(*p_sys) );
+ if( unlikely(!p_filter->p_sys) )
+ return VLC_ENOMEM;
+
+ p_filter->pf_audio_filter = Filter;
+
+ 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 );
+ 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;
+
+ if( p_filter->fmt_out.audio.i_physical_channels == AOUT_CHANS_2_0 )
{
- return -1;
+ if( b_input_7_0 )
+ p_filter->p_sys->pf_dowork = DoWork_7_x_to_2_0;
+ else if( b_input_5_0 )
+ p_filter->p_sys->pf_dowork = DoWork_5_x_to_2_0;
+ else if( b_input_4_center_rear )
+ p_filter->p_sys->pf_dowork = DoWork_4_0_to_2_0;
+ else if( b_input_3_0 )
+ p_filter->p_sys->pf_dowork = DoWork_3_x_to_2_0;
}
-
- /* Only conversion to Mono, Stereo and 4.0 right now */
- if( p_filter->fmt_out.audio.i_physical_channels !=
- (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT)
- && p_filter->fmt_out.audio.i_physical_channels !=
- ( AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT |
- AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT)
- && p_filter->fmt_out.audio.i_physical_channels != AOUT_CHAN_CENTER )
+ else if( p_filter->fmt_out.audio.i_physical_channels == AOUT_CHAN_CENTER )
{
- return -1;
+ if( b_input_7_0 )
+ p_filter->p_sys->pf_dowork = DoWork_7_x_to_1_0;
+ else if( b_input_5_0 )
+ p_filter->p_sys->pf_dowork = DoWork_5_x_to_1_0;
+ else if( b_input_4_center_rear )
+ p_filter->p_sys->pf_dowork = DoWork_4_0_to_1_0;
+ else if( b_input_3_0 )
+ p_filter->p_sys->pf_dowork = DoWork_3_x_to_1_0;
+ else
+ p_filter->p_sys->pf_dowork = DoWork_2_x_to_1_0;
}
-
- /* Only from 7/7.1/5/5.1/2.0 */
- if( (p_filter->fmt_in.audio.i_physical_channels & ~AOUT_CHAN_LFE) !=
- (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER |
- AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT) &&
- (p_filter->fmt_in.audio.i_physical_channels & ~AOUT_CHAN_LFE) !=
- (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER |
- AOUT_CHAN_MIDDLELEFT | AOUT_CHAN_MIDDLERIGHT |
- AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT) &&
- p_filter->fmt_in.audio.i_physical_channels !=
- (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT) )
+ else if(p_filter->fmt_out.audio.i_physical_channels == AOUT_CHANS_4_0)
{
- return -1;
+ if( b_input_7_0 )
+ p_filter->p_sys->pf_dowork = DoWork_7_x_to_4_0;
+ else
+ p_filter->p_sys->pf_dowork = DoWork_5_x_to_4_0;
+ }
+ else
+ {
+ assert( b_input_7_0 );
+ p_filter->p_sys->pf_dowork = DoWork_7_x_to_5_x;
}
- p_filter->pf_audio_filter = Filter;
-
- return 0;
+ return VLC_SUCCESS;
}
/*****************************************************************************
*****************************************************************************/
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 )
+ filter_sys_t *p_sys = (filter_sys_t *)p_filter->p_sys;
+ if( !p_block || !p_block->i_nb_samples )
{
- if( p_block ) p_block->pf_release( p_block );
+ 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 = block_Alloc( i_out_size );
if( !p_out )
{
msg_Warn( p_filter, "can't get output buffer" );
- p_block->pf_release( p_block );
+ block_Release( p_block );
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;
+ int i_input_nb = aout_FormatNbChannels( &p_filter->fmt_in.audio );
+ int i_output_nb = aout_FormatNbChannels( &p_filter->fmt_out.audio );
+ p_out->i_nb_samples = p_block->i_nb_samples;
+ p_out->i_buffer = p_block->i_buffer * i_output_nb / i_input_nb;
+
+ p_sys->pf_dowork( p_filter, p_block, p_out );
+
+ block_Release( p_block );
+
+ return p_out;
+}
+
+/*****************************************************************************
+ * Helpers:
+ *****************************************************************************/
+static bool IsSupported( const audio_format_t *p_input, const audio_format_t *p_output )
+{
+ if( p_input->i_format != VLC_CODEC_FL32 ||
+ p_input->i_format != p_output->i_format ||
+ p_input->i_rate != p_output->i_rate )
+ return false;
- 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;
+ if( p_input->i_physical_channels == p_output->i_physical_channels &&
+ p_input->i_original_channels == p_output->i_original_channels )
+ {
+ return false;
+ }
- DoWork( (aout_instance_t *)p_filter, &aout_filter, &in_buf, &out_buf );
+ /* Only conversion to Mono, Stereo and 4.0 right now */
+ if( p_output->i_physical_channels != AOUT_CHAN_CENTER &&
+ p_output->i_physical_channels != AOUT_CHANS_2_0 &&
+ p_output->i_physical_channels != AOUT_CHANS_4_0 &&
+ p_output->i_physical_channels != AOUT_CHANS_5_1 )
+ {
+ return false;
+ }
- p_block->pf_release( p_block );
+ /* 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;
+ }
- p_out->i_buffer = out_buf.i_nb_bytes;
- p_out->i_samples = out_buf.i_nb_samples;
+ /* Only if we downmix */
+ if( aout_FormatNbChannels( p_input ) <= aout_FormatNbChannels( p_output ) )
+ return false;
- return p_out;
+ return true;
}
projects / vlc / blobdiff