# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#ifdef HAVE_ALLOCA_H
# include <alloca.h>
{
msg_Err( p_aout, "too many audio channels (%u)",
p_format->i_channels );
- goto error;
+ return NULL;
+ }
+ if( p_format->i_channels <= 0 )
+ {
+ msg_Err( p_aout, "no audio channels" );
+ return NULL;
}
if( p_format->i_rate > 192000 )
{
msg_Err( p_aout, "excessive audio sample frequency (%u)",
p_format->i_rate );
- goto error;
+ return NULL;
+ }
+ if( p_format->i_rate < 4000 )
+ {
+ msg_Err( p_aout, "too low audio sample frequency (%u)",
+ p_format->i_rate );
+ return NULL;
}
/* We can only be called by the decoder, so no need to lock
* p_input->lock. */
- vlc_mutex_lock( &p_aout->mixer_lock );
+ aout_lock_mixer( p_aout );
if ( p_aout->i_nb_inputs >= AOUT_MAX_INPUTS )
{
p_input = malloc(sizeof(aout_input_t));
if ( p_input == NULL )
- {
- msg_Err( p_aout, "out of memory" );
goto error;
- }
memset( p_input, 0, sizeof(aout_input_t) );
- vlc_mutex_init( p_aout, &p_input->lock );
+ vlc_mutex_init( &p_input->lock );
p_input->b_changed = 0;
p_input->b_error = 1;
if( p_replay_gain )
p_input->replay_gain = *p_replay_gain;
+ aout_lock_input_fifos( p_aout );
p_aout->pp_inputs[p_aout->i_nb_inputs] = p_input;
p_aout->i_nb_inputs++;
{
for ( i = 0; i < p_aout->i_nb_inputs - 1; i++ )
{
- vlc_mutex_lock( &p_aout->pp_inputs[i]->lock );
+ aout_lock_input( p_aout, p_aout->pp_inputs[i] );
aout_InputDelete( p_aout, p_aout->pp_inputs[i] );
- vlc_mutex_unlock( &p_aout->pp_inputs[i]->lock );
+ aout_unlock_input( p_aout, p_aout->pp_inputs[i] );
}
- vlc_mutex_unlock( &p_aout->mixer_lock );
+ aout_unlock_input_fifos( p_aout );
+ aout_unlock_mixer( p_aout );
return p_input;
}
/* Create other input streams. */
for ( i = 0; i < p_aout->i_nb_inputs - 1; i++ )
{
- vlc_mutex_lock( &p_aout->pp_inputs[i]->lock );
+ 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] );
- vlc_mutex_unlock( &p_aout->pp_inputs[i]->lock );
+ aout_unlock_input( p_aout, p_aout->pp_inputs[i] );
}
}
else
if ( aout_MixerNew( p_aout ) == -1 )
{
aout_OutputDelete( p_aout );
+ aout_unlock_input_fifos( p_aout );
goto error;
}
aout_InputNew( p_aout, p_input );
+ aout_unlock_input_fifos( p_aout );
- vlc_mutex_unlock( &p_aout->mixer_lock );
+ aout_unlock_mixer( p_aout );
p_input->i_desync = var_CreateGetInteger( p_this, "audio-desync" ) * 1000;
p_input_thread = (input_thread_t *)vlc_object_find( p_this,
return p_input;
error:
- vlc_mutex_unlock( &p_aout->mixer_lock );
+ aout_unlock_mixer( p_aout );
return NULL;
}
audio_sample_format_t * p_format,
audio_replay_gain_t *p_replay_gain )
{
- if ( *pp_aout == NULL )
+ aout_instance_t *p_aout = *pp_aout;
+ if ( p_aout == NULL )
{
- /* Create an audio output if there is none. */
- *pp_aout = vlc_object_find( p_this, VLC_OBJECT_AOUT, FIND_ANYWHERE );
+ msg_Dbg( p_this, "no aout present, spawning one" );
+ p_aout = aout_New( p_this );
- if( *pp_aout == NULL )
- {
- msg_Dbg( p_this, "no aout present, spawning one" );
+ /* Everything failed, I'm a loser, I just wanna die */
+ if( p_aout == NULL )
+ return NULL;
- *pp_aout = aout_New( p_this );
- /* Everything failed, I'm a loser, I just wanna die */
- if( *pp_aout == NULL )
- {
- return NULL;
- }
- vlc_object_attach( *pp_aout, p_this->p_libvlc );
- }
- else
- {
- vlc_object_release( *pp_aout );
- }
+ vlc_object_attach( p_aout, p_this );
+ *pp_aout = p_aout;
}
- return DecNew( p_this, *pp_aout, p_format, p_replay_gain );
+ return DecNew( p_this, p_aout, p_format, p_replay_gain );
}
/*****************************************************************************
/* This function can only be called by the decoder itself, so no need
* to lock p_input->lock. */
- vlc_mutex_lock( &p_aout->mixer_lock );
+ aout_lock_mixer( p_aout );
for ( i_input = 0; i_input < p_aout->i_nb_inputs; i_input++ )
{
if ( i_input == p_aout->i_nb_inputs )
{
msg_Err( p_aout, "cannot find an input to delete" );
+ aout_unlock_mixer( p_aout );
return -1;
}
}
}
- vlc_mutex_unlock( &p_aout->mixer_lock );
+ aout_unlock_mixer( p_aout );
return 0;
}
aout_buffer_t * p_buffer;
mtime_t duration;
- vlc_mutex_lock( &p_input->lock );
+ aout_lock_input( NULL, p_input );
if ( p_input->b_error )
{
- vlc_mutex_unlock( &p_input->lock );
+ aout_unlock_input( NULL, p_input );
return NULL;
}
/* Suppose the decoder doesn't have more than one buffered buffer */
p_input->b_changed = 0;
- vlc_mutex_unlock( &p_input->lock );
+ aout_unlock_input( NULL, p_input );
if( p_buffer == NULL )
return NULL;
return -1;
}
+#ifndef FIXME
+ /* This hack for #transcode{acodec=...}:display to work -- Courmisch */
+ if( i_input_rate == 0 )
+ i_input_rate = INPUT_RATE_DEFAULT;
+#endif
if( i_input_rate > INPUT_RATE_DEFAULT * AOUT_MAX_INPUT_RATE ||
i_input_rate < INPUT_RATE_DEFAULT / AOUT_MAX_INPUT_RATE )
{
+ (mtime_t)p_buffer->i_nb_samples * 1000000
/ p_input->input.i_rate;
- vlc_mutex_lock( &p_input->lock );
+ aout_lock_input( p_aout, p_input );
if ( p_input->b_error )
{
- vlc_mutex_unlock( &p_input->lock );
+ aout_unlock_input( p_aout, p_input );
aout_BufferFree( p_buffer );
return -1;
}
/* If the buffer is too early, wait a while. */
mwait( p_buffer->start_date - AOUT_MAX_PREPARE_TIME );
- if ( aout_InputPlay( p_aout, p_input, p_buffer, i_input_rate ) == -1 )
- {
- vlc_mutex_unlock( &p_input->lock );
- return -1;
- }
+ int ret = aout_InputPlay( p_aout, p_input, p_buffer, i_input_rate );
+
+ aout_unlock_input( p_aout, p_input );
- vlc_mutex_unlock( &p_input->lock );
+ if ( ret == -1 ) return -1;
/* Run the mixer if it is able to run. */
- vlc_mutex_lock( &p_aout->mixer_lock );
+ aout_lock_mixer( p_aout );
aout_MixerRun( p_aout );
if( p_input->p_input_thread )
{
1, NULL );
vlc_mutex_unlock( &p_input->p_input_thread->p->counters.counters_lock);
}
- vlc_mutex_unlock( &p_aout->mixer_lock );
+ aout_unlock_mixer( p_aout );
return 0;
}
projects / vlc / blobdiff