/*****************************************************************************
* mixer.c : audio output mixing operations
*****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: mixer.c,v 1.28 2003/11/24 21:47:33 gbazin 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, 0 );
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;
/* 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 );
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 );
+ if( p_input->p_input_thread )
+ {
+// stats_UpdateInteger( p_input->p_input_thread,
+// "lost_abuffers", 1 );
+ }
p_buffer = p_fifo->p_first;
p_input->p_first_byte_to_mix = NULL;
}
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 )
{
/* We authorize a +-1 because rounding errors get compensated
* regularly. */
aout_buffer_t * p_next = p_buffer->p_next;
- msg_Warn( p_aout, "the mixer got a packet in the past ("I64Fd")",
+ msg_Warn( p_aout, "the mixer got a packet in the past (%"PRId64")",
start_date - p_buffer->end_date );
aout_BufferFree( p_buffer );
+ if( p_input->p_input_thread )
+ {
+// stats_UpdateInteger( p_input->p_input_thread,
+// "lost_abuffers", 1 );
+ }
p_fifo->p_first = p_buffer = p_next;
p_input->p_first_byte_to_mix = NULL;
}
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;
{
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;
+ 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")",
+ 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;
- p_input->p_first_byte_to_mix = p_buffer->p_buffer
- + i_nb_bytes;
+ if( i_nb_bytes < 0 )
+ {
+ /* Is it really the best way to do it ? */
+ aout_FifoSet( p_aout, &p_aout->output.fifo, 0 );
+ aout_DateSet( &exact_start_date, 0 );
+ break;
+ }
+
+ p_input->p_first_byte_to_mix = p_buffer->p_buffer + i_nb_bytes;
}
}
}
p_output_buffer );
if ( p_output_buffer == NULL )
{
- msg_Err( p_aout, "out of memory" );
vlc_mutex_unlock( &p_aout->input_fifos_lock );
return -1;
}
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