/*****************************************************************************
* mixer.c : audio output mixing operations
*****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: mixer.c,v 1.22 2002/12/18 14:17:11 sam Exp $
+ * Copyright (C) 2002-2004 the VideoLAN team
+ * $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
*
* 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* calloc(), malloc(), free() */
-#include <string.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-#include <vlc/vlc.h>
+#include <stddef.h>
+#include <vlc_common.h>
#ifdef HAVE_ALLOCA_H
# include <alloca.h>
#endif
-
-#include "audio_output.h"
+#include <vlc_aout.h>
#include "aout_internal.h"
-
/*****************************************************************************
* aout_MixerNew: prepare a mixer plug-in
*****************************************************************************
*****************************************************************************/
int aout_MixerNew( aout_instance_t * p_aout )
{
- p_aout->mixer.p_module = module_Need( p_aout, "audio mixer", NULL );
+ p_aout->mixer.p_module = module_need( p_aout, "audio mixer", NULL, false );
if ( p_aout->mixer.p_module == NULL )
{
- msg_Err( p_aout, "no suitable aout mixer" );
+ msg_Err( p_aout, "no suitable audio mixer" );
return -1;
}
p_aout->mixer.b_error = 0;
*****************************************************************************
* Please note that you must hold the mixer lock.
*****************************************************************************/
-int aout_MixerDelete( aout_instance_t * p_aout )
+void aout_MixerDelete( aout_instance_t * p_aout )
{
- if ( p_aout->mixer.b_error ) return 0;
- module_Unneed( p_aout, p_aout->mixer.p_module );
+ if ( p_aout->mixer.b_error ) return;
+ module_unneed( p_aout, p_aout->mixer.p_module );
p_aout->mixer.b_error = 1;
-
- return 0;
}
/*****************************************************************************
int i, i_first_input = 0;
aout_buffer_t * p_output_buffer;
mtime_t start_date, end_date;
- audio_date_t exact_start_date;
+ date_t exact_start_date;
if ( p_aout->mixer.b_error )
{
/* Free all incoming buffers. */
- vlc_mutex_lock( &p_aout->input_fifos_lock );
+ aout_lock_input_fifos( p_aout );
for ( i = 0; i < p_aout->i_nb_inputs; i++ )
{
aout_input_t * p_input = p_aout->pp_inputs[i];
p_buffer = p_next;
}
}
- vlc_mutex_unlock( &p_aout->input_fifos_lock );
+ aout_unlock_input_fifos( p_aout );
return -1;
}
- vlc_mutex_lock( &p_aout->output_fifo_lock );
- vlc_mutex_lock( &p_aout->input_fifos_lock );
+ aout_lock_output_fifo( p_aout );
+ aout_lock_input_fifos( p_aout );
/* Retrieve the date of the next buffer. */
- memcpy( &exact_start_date, &p_aout->output.fifo.end_date,
- sizeof(audio_date_t) );
- start_date = aout_DateGet( &exact_start_date );
+ exact_start_date = p_aout->output.fifo.end_date;
+ start_date = date_Get( &exact_start_date );
if ( start_date != 0 && start_date < mdate() )
{
/* The output is _very_ late. This can only happen if the user
* pauses the stream (or if the decoder is buggy, which cannot
* happen :). */
- msg_Warn( p_aout, "output PTS is out of range ("I64Fd"), clearing out",
+ msg_Warn( p_aout, "output PTS is out of range (%"PRId64"), clearing out",
mdate() - start_date );
aout_FifoSet( p_aout, &p_aout->output.fifo, 0 );
- aout_DateSet( &exact_start_date, 0 );
+ date_Set( &exact_start_date, 0 );
start_date = 0;
}
- vlc_mutex_unlock( &p_aout->output_fifo_lock );
+ aout_unlock_output_fifo( p_aout );
/* See if we have enough data to prepare a new buffer for the audio
* output. First : start date. */
aout_fifo_t * p_fifo = &p_input->fifo;
aout_buffer_t * p_buffer;
- if ( p_input->b_error ) continue;
+ if ( p_input->b_error || p_input->b_paused )
+ continue;
p_buffer = p_fifo->p_first;
while ( p_buffer != NULL && p_buffer->start_date < mdate() )
{
- msg_Warn( p_aout, "input PTS is out of range ("I64Fd"), "
+ msg_Warn( p_aout, "input PTS is out of range (%"PRId64"), "
"trashing", mdate() - p_buffer->start_date );
p_buffer = aout_FifoPop( p_aout, p_fifo );
aout_BufferFree( p_buffer );
p_buffer = p_fifo->p_first;
+ p_input->p_first_byte_to_mix = NULL;
}
if ( p_buffer == NULL )
if ( !start_date || start_date < p_buffer->start_date )
{
- aout_DateSet( &exact_start_date, p_buffer->start_date );
+ date_Set( &exact_start_date, p_buffer->start_date );
start_date = p_buffer->start_date;
}
}
if ( i < p_aout->i_nb_inputs )
{
/* Interrupted before the end... We can't run. */
- vlc_mutex_unlock( &p_aout->input_fifos_lock );
+ aout_unlock_input_fifos( p_aout );
return -1;
}
}
- aout_DateIncrement( &exact_start_date, p_aout->output.i_nb_samples );
- end_date = aout_DateGet( &exact_start_date );
+ date_Increment( &exact_start_date, p_aout->output.i_nb_samples );
+ end_date = date_Get( &exact_start_date );
/* Check that start_date and end_date are available for all input
* streams. */
aout_fifo_t * p_fifo = &p_input->fifo;
aout_buffer_t * p_buffer;
mtime_t prev_date;
- vlc_bool_t b_drop_buffers;
+ bool b_drop_buffers;
- if ( p_input->b_error )
+ if ( p_input->b_error || p_input->b_paused )
{
if ( i_first_input == i ) i_first_input++;
continue;
}
/* Check for the continuity of start_date */
- while ( p_buffer != NULL && p_buffer->end_date < start_date )
+ while ( p_buffer != NULL && p_buffer->end_date < start_date - 1 )
{
+ /* We authorize a +-1 because rounding errors get compensated
+ * regularly. */
aout_buffer_t * p_next = p_buffer->p_next;
- msg_Err( p_aout, "the mixer got a packet in the past ("I64Fd")",
- start_date - p_buffer->end_date );
+ msg_Warn( p_aout, "the mixer got a packet in the past (%"PRId64")",
+ start_date - p_buffer->end_date );
aout_BufferFree( p_buffer );
p_fifo->p_first = p_buffer = p_next;
p_input->p_first_byte_to_mix = NULL;
break;
}
- if ( !AOUT_FMT_NON_LINEAR( &p_aout->mixer.mixer ) )
- {
- /* Additionally check that p_first_byte_to_mix is well
- * located. */
- mtime_t i_nb_bytes = (start_date - p_buffer->start_date)
- * p_aout->mixer.mixer.i_bytes_per_frame
- * p_aout->mixer.mixer.i_rate
- / p_aout->mixer.mixer.i_frame_length
- / 1000000;
- ptrdiff_t mixer_nb_bytes;
-
- if ( p_input->p_first_byte_to_mix == NULL )
- {
- p_input->p_first_byte_to_mix = p_buffer->p_buffer;
- }
- mixer_nb_bytes = p_input->p_first_byte_to_mix
- - p_buffer->p_buffer;
-
- if ( !((i_nb_bytes + p_aout->mixer.mixer.i_bytes_per_frame
- > mixer_nb_bytes) &&
- (i_nb_bytes < p_aout->mixer.mixer.i_bytes_per_frame
- + mixer_nb_bytes)) )
- {
- msg_Warn( p_aout,
- "mixer start isn't output start ("I64Fd,
- i_nb_bytes - mixer_nb_bytes );
-
- /* Round to the nearest multiple */
- i_nb_bytes /= p_aout->mixer.mixer.i_bytes_per_frame;
- i_nb_bytes *= p_aout->mixer.mixer.i_bytes_per_frame;
- p_input->p_first_byte_to_mix = p_buffer->p_buffer
- + i_nb_bytes;
- }
- }
-
/* Check that we have enough samples. */
for ( ; ; )
{
if ( prev_date != p_buffer->start_date )
{
msg_Warn( p_aout,
- "buffer hole, dropping packets ("I64Fd")",
+ "buffer hole, dropping packets (%"PRId64")",
p_buffer->start_date - prev_date );
b_drop_buffers = 1;
break;
else break;
}
if ( p_buffer == NULL ) break;
+
+ p_buffer = p_fifo->p_first;
+ if ( !AOUT_FMT_NON_LINEAR( &p_aout->mixer.mixer ) )
+ {
+ /* Additionally check that p_first_byte_to_mix is well
+ * located. */
+ mtime_t i_nb_bytes = (start_date - p_buffer->start_date)
+ * p_aout->mixer.mixer.i_bytes_per_frame
+ * p_aout->mixer.mixer.i_rate
+ / p_aout->mixer.mixer.i_frame_length
+ / 1000000;
+ ptrdiff_t mixer_nb_bytes;
+
+ if ( p_input->p_first_byte_to_mix == NULL )
+ {
+ p_input->p_first_byte_to_mix = p_buffer->p_buffer;
+ }
+ mixer_nb_bytes = p_input->p_first_byte_to_mix - p_buffer->p_buffer;
+
+ if ( !((i_nb_bytes + p_aout->mixer.mixer.i_bytes_per_frame
+ > mixer_nb_bytes) &&
+ (i_nb_bytes < p_aout->mixer.mixer.i_bytes_per_frame
+ + mixer_nb_bytes)) )
+ {
+ msg_Warn( p_aout, "mixer start isn't output start (%"PRId64")",
+ i_nb_bytes - mixer_nb_bytes );
+
+ /* Round to the nearest multiple */
+ i_nb_bytes /= p_aout->mixer.mixer.i_bytes_per_frame;
+ i_nb_bytes *= p_aout->mixer.mixer.i_bytes_per_frame;
+ if( i_nb_bytes < 0 )
+ {
+ /* Is it really the best way to do it ? */
+ aout_lock_output_fifo( p_aout );
+ aout_FifoSet( p_aout, &p_aout->output.fifo, 0 );
+ date_Set( &exact_start_date, 0 );
+ aout_unlock_output_fifo( p_aout );
+ break;
+ }
+
+ p_input->p_first_byte_to_mix = p_buffer->p_buffer + i_nb_bytes;
+ }
+ }
}
if ( i < p_aout->i_nb_inputs || i_first_input == p_aout->i_nb_inputs )
{
/* Interrupted before the end... We can't run. */
- vlc_mutex_unlock( &p_aout->input_fifos_lock );
+ aout_unlock_input_fifos( p_aout );
return -1;
}
p_output_buffer );
if ( p_output_buffer == NULL )
{
- msg_Err( p_aout, "out of memory" );
- vlc_mutex_unlock( &p_aout->input_fifos_lock );
+ aout_unlock_input_fifos( p_aout );
return -1;
}
/* This is again a bit kludgy - for the S/PDIF mixer. */
p_aout->mixer.pf_do_work( p_aout, p_output_buffer );
- vlc_mutex_unlock( &p_aout->input_fifos_lock );
+ aout_unlock_input_fifos( p_aout );
aout_OutputPlay( p_aout, p_output_buffer );
int aout_MixerMultiplierSet( aout_instance_t * p_aout, float f_multiplier )
{
float f_old = p_aout->mixer.f_multiplier;
- vlc_bool_t b_new_mixer = 0;
+ bool b_new_mixer = 0;
if ( !p_aout->mixer.b_error )
{
projects / vlc / blobdiff