# include "config.h"
#endif
+#include <assert.h>
+
#include <vlc_common.h>
#ifdef HAVE_ALLOCA_H
/*****************************************************************************
* aout_DecNew : create a decoder
*****************************************************************************/
-static aout_input_t * DecNew( vlc_object_t * p_this, aout_instance_t * p_aout,
+static aout_input_t * DecNew( aout_instance_t * p_aout,
audio_sample_format_t *p_format,
- const audio_replay_gain_t *p_replay_gain )
+ const audio_replay_gain_t *p_replay_gain,
+ const aout_request_vout_t *p_request_vout )
{
aout_input_t * p_input;
msg_Err( p_aout, "no audio channels" );
return NULL;
}
+ if( p_format->i_channels != aout_FormatNbChannels( p_format ) )
+ {
+ msg_Err( p_aout, "incompatible audio channels count with layout mask" );
+ return NULL;
+ }
if( p_format->i_rate > 192000 )
{
goto error;
}
- p_input = malloc(sizeof(aout_input_t));
- if( p_input == NULL )
+ p_input = calloc( 1, sizeof(aout_input_t));
+ if( !p_input )
goto error;
- memset( p_input, 0, sizeof(aout_input_t) );
vlc_mutex_init( &p_input->lock );
p_aout->pp_inputs[p_aout->i_nb_inputs] = p_input;
p_aout->i_nb_inputs++;
- if ( p_aout->mixer.b_error )
+ if ( !p_aout->p_mixer )
{
int i;
/* Create other input streams. */
for ( i = 0; i < p_aout->i_nb_inputs - 1; i++ )
{
- aout_lock_input( p_aout, p_aout->pp_inputs[i] );
- aout_InputDelete( p_aout, p_aout->pp_inputs[i] );
- aout_InputNew( p_aout, p_aout->pp_inputs[i] );
- aout_unlock_input( p_aout, p_aout->pp_inputs[i] );
+ aout_input_t *p_input = p_aout->pp_inputs[i];
+
+ aout_lock_input( p_aout, p_input );
+ aout_InputDelete( p_aout, p_input );
+ aout_InputNew( p_aout, p_input, &p_input->request_vout );
+ aout_unlock_input( p_aout, p_input );
}
}
else
goto error;
}
- aout_InputNew( p_aout, p_input );
+ aout_InputNew( p_aout, p_input, p_request_vout );
aout_unlock_input_fifos( p_aout );
aout_unlock_mixer( p_aout );
aout_input_t * __aout_DecNew( vlc_object_t * p_this,
aout_instance_t ** pp_aout,
audio_sample_format_t * p_format,
- const audio_replay_gain_t *p_replay_gain )
+ const audio_replay_gain_t *p_replay_gain,
+ const aout_request_vout_t *p_request_video )
{
aout_instance_t *p_aout = *pp_aout;
if ( p_aout == NULL )
*pp_aout = p_aout;
}
- return DecNew( p_this, p_aout, p_format, p_replay_gain );
+ return DecNew( p_aout, p_format, p_replay_gain, p_request_video );
}
/*****************************************************************************
{
aout_OutputDelete( p_aout );
aout_MixerDelete( p_aout );
- if ( var_Type( p_aout, "audio-device" ) != 0 )
- {
- var_Destroy( p_aout, "audio-device" );
- }
- if ( var_Type( p_aout, "audio-channels" ) != 0 )
- {
- var_Destroy( p_aout, "audio-channels" );
- }
+ var_Destroy( p_aout, "audio-device" );
+ var_Destroy( p_aout, "audio-channels" );
}
aout_unlock_mixer( p_aout );
duration = (1000000 * (mtime_t)i_nb_samples) / p_input->input.i_rate;
/* This necessarily allocates in the heap. */
- aout_BufferAlloc( &p_input->input_alloc, duration, NULL, p_buffer );
+ aout_BufferAlloc( &p_input->input_alloc, duration, NULL, &p_buffer );
if( p_buffer != NULL )
p_buffer->i_nb_bytes = i_nb_samples * p_input->input.i_bytes_per_frame
/ p_input->input.i_frame_length;
mtime_t duration = (1000000 * (mtime_t)p_buffer->i_nb_samples)
/ p_input->input.i_rate;
- aout_BufferAlloc( &p_input->input_alloc, duration, NULL, p_new_buffer );
+ aout_BufferAlloc( &p_input->input_alloc, duration, NULL, &p_new_buffer );
vlc_memcpy( p_new_buffer->p_buffer, p_buffer->p_buffer,
p_buffer->i_nb_bytes );
p_new_buffer->i_nb_samples = p_buffer->i_nb_samples;
if( i_duration != 0 )
{
aout_lock_mixer( p_aout );
- for( aout_buffer_t *p = p_input->fifo.p_first; p != NULL; p = p->p_next )
+ for( aout_buffer_t *p = p_input->mixer.fifo.p_first; p != NULL; p = p->p_next )
{
p->start_date += i_duration;
p->end_date += i_duration;
{
aout_lock_input_fifos( p_aout );
- aout_FifoSet( p_aout, &p_input->fifo, 0 );
- p_input->p_first_byte_to_mix = NULL;
+ aout_FifoSet( p_aout, &p_input->mixer.fifo, 0 );
+ p_input->mixer.begin = NULL;
aout_unlock_input_fifos( p_aout );
}