* trivial.c : trivial mixer plug-in (1 input, no downmixing)
*****************************************************************************
* Copyright (C) 2002 VideoLAN
- * $Id: trivial.c,v 1.8 2002/09/28 13:05:16 massiot Exp $
+ * $Id: trivial.c,v 1.11 2002/11/20 16:43:33 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <errno.h>
#include <stdlib.h> /* malloc(), free() */
#include <string.h>
{
aout_instance_t * p_aout = (aout_instance_t *)p_this;
- if ( p_aout->mixer.mixer.i_format != AOUT_FMT_FLOAT32
- && p_aout->mixer.mixer.i_format != AOUT_FMT_FIXED32 )
+ if ( p_aout->mixer.mixer.i_format != VLC_FOURCC('f','l','3','2')
+ && p_aout->mixer.mixer.i_format != VLC_FOURCC('f','i','3','2') )
{
return -1;
}
{
int i = 0;
aout_input_t * p_input = p_aout->pp_inputs[i];
+ int i_nb_channels = aout_FormatNbChannels( &p_aout->mixer.mixer );
int i_nb_bytes = p_buffer->i_nb_samples * sizeof(s32)
- * p_aout->mixer.mixer.i_channels;
+ * i_nb_channels;
byte_t * p_in;
byte_t * p_out;
- p_in)
+ p_input->fifo.p_first->i_nb_samples
* sizeof(s32)
- * p_aout->mixer.mixer.i_channels;
+ * i_nb_channels;
if ( i_available_bytes < i_nb_bytes )
{