#include <vlc_input.h>
#include "aout_internal.h"
+#include "libvlc.h"
-#undef aout_DecNew
/**
* Creates an audio output
*/
-aout_input_t *aout_DecNew( aout_instance_t *p_aout,
- audio_sample_format_t *p_format,
- const audio_replay_gain_t *p_replay_gain,
- const aout_request_vout_t *p_request_vout )
+int aout_DecNew( audio_output_t *p_aout,
+ const audio_sample_format_t *p_format,
+ const audio_replay_gain_t *p_replay_gain,
+ const aout_request_vout_t *p_request_vout )
{
- aout_input_t * p_input;
-
/* Sanitize audio format */
if( p_format->i_channels > 32 )
{
msg_Err( p_aout, "too many audio channels (%u)",
p_format->i_channels );
- return NULL;
+ return -1;
}
if( p_format->i_channels <= 0 )
{
msg_Err( p_aout, "no audio channels" );
- return NULL;
+ return -1;
}
if( p_format->i_channels != aout_FormatNbChannels( p_format ) )
{
msg_Err( p_aout, "incompatible audio channels count with layout mask" );
- return NULL;
+ return -1;
}
if( p_format->i_rate > 192000 )
{
msg_Err( p_aout, "excessive audio sample frequency (%u)",
p_format->i_rate );
- return NULL;
+ return -1;
}
if( p_format->i_rate < 4000 )
{
msg_Err( p_aout, "too low audio sample frequency (%u)",
p_format->i_rate );
- return NULL;
+ return -1;
}
- /* We can only be called by the decoder, so no need to lock
- * p_input->lock. */
- aout_lock_mixer( p_aout );
- assert( p_aout->i_nb_inputs == 0 );
-
- p_input = calloc( 1, sizeof(aout_input_t));
+ aout_input_t *p_input = calloc( 1, sizeof(aout_input_t));
if( !p_input )
- goto error;
-
- vlc_mutex_init( &p_input->lock );
+ return -1;
- p_input->b_changed = false;
p_input->b_error = true;
- p_input->b_paused = false;
- p_input->i_pause_date = 0;
-
- aout_FormatPrepare( p_format );
memcpy( &p_input->input, p_format,
sizeof(audio_sample_format_t) );
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++;
+ /* We can only be called by the decoder, so no need to lock
+ * p_input->lock. */
+ aout_owner_t *owner = aout_owner(p_aout);
+ aout_lock( p_aout );
+ assert (owner->input == NULL);
- if ( !p_aout->p_mixer )
- {
- int i;
-
- var_Destroy( p_aout, "audio-device" );
- var_Destroy( p_aout, "audio-channels" );
-
- /* Recreate the output using the new format. */
- if ( aout_OutputNew( p_aout, p_format ) < 0 )
- {
- 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_unlock_input( p_aout, p_aout->pp_inputs[i] );
- }
- 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++ )
- {
- 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
- {
- aout_MixerDelete( p_aout );
- }
+ var_Destroy( p_aout, "audio-device" );
+ var_Destroy( p_aout, "audio-channels" );
- if ( aout_MixerNew( p_aout ) == -1 )
+ /* Recreate the output using the new format. */
+ if( aout_OutputNew( p_aout, p_format ) < 0 )
+ goto error;
+
+ assert (owner->volume.mixer == NULL);
+ owner->volume.mixer = aout_MixerNew (p_aout, owner->mixer_format.i_format);
+ if (owner->volume.mixer == NULL)
{
aout_OutputDelete( p_aout );
- aout_unlock_input_fifos( p_aout );
goto error;
}
+ owner->input = p_input;
aout_InputNew( p_aout, p_input, p_request_vout );
- aout_unlock_input_fifos( p_aout );
-
- aout_unlock_mixer( p_aout );
-
- return p_input;
-
+ aout_unlock( p_aout );
+ return 0;
error:
- aout_unlock_mixer( p_aout );
- return NULL;
+ aout_unlock( p_aout );
+ free( p_input );
+ return -1;
}
/*****************************************************************************
* aout_DecDelete : delete a decoder
*****************************************************************************/
-int aout_DecDelete( aout_instance_t * p_aout, aout_input_t * p_input )
+void aout_DecDelete( audio_output_t * p_aout )
{
- int i_input;
-
- /* This function can only be called by the decoder itself, so no need
- * to lock p_input->lock. */
- aout_lock_mixer( p_aout );
-
- for ( i_input = 0; i_input < p_aout->i_nb_inputs; i_input++ )
- {
- if ( p_aout->pp_inputs[i_input] == p_input )
- {
- break;
- }
- }
+ aout_owner_t *owner = aout_owner (p_aout);
+ aout_input_t *input;
+ struct audio_mixer *mixer;
+
+ aout_lock( p_aout );
+ /* Remove the input. */
+ input = owner->input;
+ aout_InputDelete (p_aout, input);
+ owner->input = NULL;
+
+ aout_OutputDelete( p_aout );
+ mixer = owner->volume.mixer;
+ owner->volume.mixer = NULL;
+ var_Destroy( p_aout, "audio-device" );
+ var_Destroy( p_aout, "audio-channels" );
+
+ aout_unlock( p_aout );
+
+ aout_MixerDelete (mixer);
+ free (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;
- }
+static void aout_CheckRestart (audio_output_t *aout)
+{
+ aout_owner_t *owner = aout_owner (aout);
+ aout_input_t *input = owner->input;
- /* Remove the input from the list. */
- p_aout->i_nb_inputs--;
- assert( p_aout->i_nb_inputs == 0 );
+ aout_assert_locked (aout);
- aout_InputDelete( p_aout, p_input );
+ if (likely(!owner->need_restart))
+ return;
+ owner->need_restart = false;
- vlc_mutex_destroy( &p_input->lock );
- free( p_input );
+ /* Reinitializes the output */
+ aout_InputDelete (aout, owner->input);
+ aout_MixerDelete (owner->volume.mixer);
+ owner->volume.mixer = NULL;
+ aout_OutputDelete (aout);
- if ( !p_aout->i_nb_inputs )
+ if (aout_OutputNew (aout, &input->input))
{
- aout_OutputDelete( p_aout );
- aout_MixerDelete( p_aout );
- var_Destroy( p_aout, "audio-device" );
- var_Destroy( p_aout, "audio-channels" );
+error:
+ input->b_error = true;
+ return; /* we are officially screwed */
}
- aout_unlock_mixer( p_aout );
+ owner->volume.mixer = aout_MixerNew (aout, owner->mixer_format.i_format);
+ if (owner->volume.mixer == NULL)
+ {
+ aout_OutputDelete (aout);
+ goto error;
+ }
- return 0;
+ if (aout_InputNew (aout, input, &input->request_vout))
+ assert (input->b_error);
+ else
+ assert (!input->b_error);
}
/*****************************************************************************
* aout_DecNewBuffer : ask for a new empty buffer
*****************************************************************************/
-aout_buffer_t * aout_DecNewBuffer( aout_input_t * p_input,
- size_t i_nb_samples )
+block_t *aout_DecNewBuffer (audio_output_t *aout, size_t samples)
{
- aout_buffer_t * p_buffer;
- mtime_t duration;
-
- aout_lock_input( NULL, p_input );
-
- if ( p_input->b_error )
+ /* NOTE: the caller is responsible for serializing input change */
+ aout_owner_t *owner = aout_owner (aout);
+ aout_input_t *input = owner->input;
+
+ size_t length = samples * input->input.i_bytes_per_frame
+ / input->input.i_frame_length;
+ block_t *block = block_Alloc( length );
+ if( likely(block != NULL) )
{
- aout_unlock_input( NULL, p_input );
- return NULL;
+ block->i_nb_samples = samples;
+ block->i_pts = block->i_length = 0;
}
-
- duration = (1000000 * (mtime_t)i_nb_samples) / p_input->input.i_rate;
-
- /* This necessarily allocates in the heap. */
- p_buffer = aout_BufferAlloc( &p_input->input_alloc, duration, NULL );
- if( p_buffer != NULL )
- p_buffer->i_buffer = i_nb_samples * p_input->input.i_bytes_per_frame
- / p_input->input.i_frame_length;
-
- /* Suppose the decoder doesn't have more than one buffered buffer */
- p_input->b_changed = false;
-
- aout_unlock_input( NULL, p_input );
-
- if( p_buffer == NULL )
- return NULL;
-
- p_buffer->i_nb_samples = i_nb_samples;
- p_buffer->i_pts = p_buffer->i_length = 0;
- return p_buffer;
+ return block;
}
/*****************************************************************************
* aout_DecDeleteBuffer : destroy an undecoded buffer
*****************************************************************************/
-void aout_DecDeleteBuffer( aout_instance_t * p_aout, aout_input_t * p_input,
- aout_buffer_t * p_buffer )
+void aout_DecDeleteBuffer (audio_output_t *aout, block_t *block)
{
- (void)p_aout; (void)p_input;
- aout_BufferFree( p_buffer );
+ (void) aout;
+ aout_BufferFree (block);
}
/*****************************************************************************
* aout_DecPlay : filter & mix the decoded buffer
*****************************************************************************/
-int aout_DecPlay( aout_instance_t * p_aout, aout_input_t * p_input,
- aout_buffer_t * p_buffer, int i_input_rate )
+int aout_DecPlay (audio_output_t *p_aout, block_t *p_buffer, int i_input_rate)
{
+ aout_owner_t *owner = aout_owner (p_aout);
+ aout_input_t *p_input = owner->input;
+
assert( i_input_rate >= INPUT_RATE_DEFAULT / AOUT_MAX_INPUT_RATE &&
i_input_rate <= INPUT_RATE_DEFAULT * AOUT_MAX_INPUT_RATE );
-
assert( p_buffer->i_pts > 0 );
p_buffer->i_length = (mtime_t)p_buffer->i_nb_samples * 1000000
/ p_input->input.i_rate;
- aout_lock_mixer( p_aout );
- aout_lock_input( p_aout, p_input );
-
+ aout_lock( p_aout );
if( p_input->b_error )
{
- aout_unlock_input( p_aout, p_input );
- aout_unlock_mixer( p_aout );
-
+ aout_unlock( p_aout );
aout_BufferFree( p_buffer );
return -1;
}
- if( p_input->b_changed )
- {
- /* Maybe the allocation size has changed. Re-allocate a buffer. */
- aout_buffer_t * p_new_buffer;
- mtime_t duration = (1000000 * (mtime_t)p_buffer->i_nb_samples)
- / p_input->input.i_rate;
-
- p_new_buffer = aout_BufferAlloc( &p_input->input_alloc, duration, NULL);
- vlc_memcpy( p_new_buffer->p_buffer, p_buffer->p_buffer,
- p_buffer->i_buffer );
- p_new_buffer->i_nb_samples = p_buffer->i_nb_samples;
- p_new_buffer->i_buffer = p_buffer->i_buffer;
- p_new_buffer->i_pts = p_buffer->i_pts;
- p_new_buffer->i_length = p_buffer->i_length;
- aout_BufferFree( p_buffer );
- p_buffer = p_new_buffer;
- p_input->b_changed = false;
- }
-
+ aout_CheckRestart( p_aout );
aout_InputCheckAndRestart( p_aout, p_input );
- aout_unlock_mixer( p_aout );
-
- int i_ret = aout_InputPlay( p_aout, p_input, p_buffer, i_input_rate );
-
- aout_unlock_input( p_aout, p_input );
- if( i_ret == -1 )
- return -1;
-
- /* Run the mixer if it is able to run. */
- aout_lock_mixer( p_aout );
+ /* Input */
+ p_buffer = aout_InputPlay( p_aout, p_input, p_buffer, i_input_rate );
- aout_MixerRun( p_aout );
+ if( p_buffer != NULL )
+ {
+ /* Mixer */
+ float amp = owner->volume.multiplier * p_input->multiplier;
+ aout_MixerRun (owner->volume.mixer, p_buffer, amp);
- aout_unlock_mixer( p_aout );
+ /* Output */
+ aout_OutputPlay( p_aout, p_buffer );
+ }
+ aout_unlock( p_aout );
return 0;
}
-int aout_DecGetResetLost( aout_instance_t *p_aout, aout_input_t *p_input )
+int aout_DecGetResetLost (audio_output_t *aout)
{
- aout_lock_input( p_aout, p_input );
- int i_value = p_input->i_buffer_lost;
- p_input->i_buffer_lost = 0;
- aout_unlock_input( p_aout, p_input );
+ aout_owner_t *owner = aout_owner (aout);
+ aout_input_t *input = owner->input;
+ int val;
- return i_value;
+ aout_lock (aout);
+ val = input->i_buffer_lost;
+ input->i_buffer_lost = 0;
+ aout_unlock (aout);
+
+ return val;
}
-void aout_DecChangePause( aout_instance_t *p_aout, aout_input_t *p_input, bool b_paused, mtime_t i_date )
+void aout_DecChangePause (audio_output_t *aout, bool paused, mtime_t date)
{
- mtime_t i_duration = 0;
- aout_lock_input( p_aout, p_input );
- assert( !p_input->b_paused || !b_paused );
- if( p_input->b_paused )
- {
- i_duration = i_date - p_input->i_pause_date;
- }
- p_input->b_paused = b_paused;
- p_input->i_pause_date = i_date;
- aout_unlock_input( p_aout, p_input );
+ aout_owner_t *owner = aout_owner (aout);
+ aout_input_t *p_input = owner->input;
- if( i_duration != 0 )
- {
- aout_lock_mixer( p_aout );
- for( aout_buffer_t *p = p_input->mixer.fifo.p_first; p != NULL; p = p->p_next )
- {
- p->i_pts += i_duration;
- }
- aout_unlock_mixer( p_aout );
- }
+ aout_lock (aout);
+
+ /* XXX: Should the input date be offset by the pause duration instead? */
+ date_Set (&p_input->date, VLC_TS_INVALID);
+ aout_OutputPause (aout, paused, date);
+ aout_unlock (aout);
}
-void aout_DecFlush( aout_instance_t *p_aout, aout_input_t *p_input )
+void aout_DecFlush (audio_output_t *aout)
{
- aout_lock_input_fifos( p_aout );
-
- aout_FifoSet( p_aout, &p_input->mixer.fifo, 0 );
- p_input->mixer.begin = NULL;
+ aout_owner_t *owner = aout_owner (aout);
+ aout_input_t *input = owner->input;
- aout_unlock_input_fifos( p_aout );
+ aout_lock (aout);
+ date_Set (&input->date, VLC_TS_INVALID);
+ aout_OutputFlush (aout, false);
+ aout_unlock (aout);
}
+bool aout_DecIsEmpty (audio_output_t *aout)
+{
+ aout_owner_t *owner = aout_owner (aout);
+ aout_input_t *input = owner->input;
+ mtime_t end_date;
+
+ aout_lock (aout);
+ /* FIXME: tell output to drain */
+ end_date = date_Get (&input->date);
+ aout_unlock (aout);
+ return end_date == VLC_TS_INVALID || end_date <= mdate();
+}
projects / vlc / blobdiff