-/******************************************************************************
+/*****************************************************************************
* audio_output.c : audio output thread
- * (c)1999 VideoLAN
- ******************************************************************************/
+ *****************************************************************************
+ * Copyright (C) 1999, 2000 VideoLAN
+ *
+ * Authors:
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * 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.
+ *****************************************************************************/
/* TODO:
*
* à chaque boucle
* = Utiliser des tables pour les gros calculs
* - Faire une structure différente pour intf/adec fifo
- * - Rajouter des vlc_cond_signal ?
*
*/
-/******************************************************************************
+/*****************************************************************************
* Preamble
- ******************************************************************************/
-#include <unistd.h>
+ *****************************************************************************/
+#include "defs.h"
-#include <sys/soundcard.h>
-#include <stdio.h> /* "intf_msg.h" */
-#include <stdlib.h> /* calloc(), malloc(), free() */
+#include <unistd.h> /* getpid() */
+
+#include <stdio.h> /* "intf_msg.h" */
+#include <stdlib.h> /* calloc(), malloc(), free() */
-#include "common.h"
#include "config.h"
-#include "mtime.h" /* mtime_t, mdate(), msleep() */
-#include "vlc_thread.h"
+#include "common.h"
+#include "threads.h"
+#include "mtime.h" /* mtime_t, mdate(), msleep() */
+#include "plugins.h"
-#include "intf_msg.h" /* intf_DbgMsg(), intf_ErrMsg() */
+#include "intf_msg.h" /* intf_DbgMsg(), intf_ErrMsg() */
#include "audio_output.h"
-#include "audio_dsp.h"
#include "main.h"
-/******************************************************************************
+/*****************************************************************************
* Local prototypes
- ******************************************************************************/
-
+ *****************************************************************************/
static int aout_SpawnThread( aout_thread_t * p_aout );
void aout_Thread_U16_Stereo ( aout_thread_t * p_aout );
static __inline__ void InitializeIncrement( aout_increment_t * p_increment, long l_numerator, long l_denominator );
-static __inline__ int NextFrame( aout_thread_t * p_aout, aout_fifo_t * p_fifo/*, mtime_t aout_date*/ );
+static __inline__ int NextFrame( aout_thread_t * p_aout, aout_fifo_t * p_fifo, mtime_t aout_date );
-/******************************************************************************
+/*****************************************************************************
* aout_CreateThread: initialize audio thread
- ******************************************************************************/
+ *****************************************************************************/
aout_thread_t *aout_CreateThread( int *pi_status )
{
- aout_thread_t * p_aout; /* thread descriptor */
+ aout_thread_t * p_aout; /* thread descriptor */
+ char * psz_method;
+#if 0
int i_status; /* thread status */
-
+#endif
+
/* Allocate descriptor */
p_aout = (aout_thread_t *) malloc( sizeof(aout_thread_t) );
if( p_aout == NULL )
return( NULL );
}
- //???? kludge to initialize some audio parameters - place this section somewhere
- //???? else
- p_aout->dsp.i_format = AOUT_DEFAULT_FORMAT;
- p_aout->dsp.psz_device = main_GetPszVariable( AOUT_DSP_VAR, AOUT_DSP_DEFAULT );
- p_aout->dsp.b_stereo = main_GetIntVariable( AOUT_STEREO_VAR, AOUT_STEREO_DEFAULT );
- p_aout->dsp.l_rate = main_GetIntVariable( AOUT_RATE_VAR, AOUT_RATE_DEFAULT );
- // ???? end of kludge
+ /* Request an interface plugin */
+ psz_method = main_GetPszVariable( AOUT_METHOD_VAR, AOUT_DEFAULT_METHOD );
+
+ if( RequestPlugin( &p_aout->aout_plugin, psz_method ) )
+ {
+ intf_ErrMsg( "error: could not open audio plugin %s.so\n", psz_method );
+ free( p_aout );
+ return( NULL );
+ }
- /*
- * Initialize DSP
+ /* Get plugins */
+ p_aout->p_sys_open = GetPluginFunction( p_aout->aout_plugin, "aout_SysOpen" );
+ p_aout->p_sys_reset = GetPluginFunction( p_aout->aout_plugin, "aout_SysReset" );
+ p_aout->p_sys_setformat = GetPluginFunction( p_aout->aout_plugin, "aout_SysSetFormat" );
+ p_aout->p_sys_setchannels = GetPluginFunction( p_aout->aout_plugin, "aout_SysSetChannels" );
+ p_aout->p_sys_setrate = GetPluginFunction( p_aout->aout_plugin, "aout_SysSetRate" );
+ p_aout->p_sys_getbufinfo = GetPluginFunction( p_aout->aout_plugin, "aout_SysGetBufInfo" );
+ p_aout->p_sys_playsamples = GetPluginFunction( p_aout->aout_plugin, "aout_SysPlaySamples" );
+ p_aout->p_sys_close = GetPluginFunction( p_aout->aout_plugin, "aout_SysClose" );
+
+ /*
+ * Initialize audio device
*/
- if ( aout_dspOpen( &p_aout->dsp ) )
+ if ( p_aout->p_sys_open( p_aout ) )
{
+ TrashPlugin( p_aout->aout_plugin );
free( p_aout );
return( NULL );
}
- if ( aout_dspReset( &p_aout->dsp ) )
+
+ p_aout->b_stereo = ( p_aout->i_channels == 2 ) ? 1 : 0; /* FIXME: only works
+ for i_channels == 1 or 2 ??*/
+
+ if ( p_aout->p_sys_reset( p_aout ) )
{
- aout_dspClose( &p_aout->dsp );
- free( p_aout );
- return( NULL );
+ p_aout->p_sys_close( p_aout );
+ TrashPlugin( p_aout->aout_plugin );
+ free( p_aout );
+ return( NULL );
}
- if ( aout_dspSetFormat( &p_aout->dsp ) )
+ if ( p_aout->p_sys_setformat( p_aout ) )
{
- aout_dspClose( &p_aout->dsp );
- free( p_aout );
- return( NULL );
+ p_aout->p_sys_close( p_aout );
+ TrashPlugin( p_aout->aout_plugin );
+ free( p_aout );
+ return( NULL );
}
- if ( aout_dspSetChannels( &p_aout->dsp ) )
+ if ( p_aout->p_sys_setchannels( p_aout ) )
{
- aout_dspClose( &p_aout->dsp );
- free( p_aout );
+ p_aout->p_sys_close( p_aout );
+ TrashPlugin( p_aout->aout_plugin );
+ free( p_aout );
return( NULL );
}
- if ( aout_dspSetRate( &p_aout->dsp ) )
+ if ( p_aout->p_sys_setrate( p_aout ) )
{
- aout_dspClose( &p_aout->dsp );
- free( p_aout );
- return( NULL );
+ p_aout->p_sys_close( p_aout );
+ TrashPlugin( p_aout->aout_plugin );
+ free( p_aout );
+ return( NULL );
}
- intf_DbgMsg("aout debug: audio device (%s) opened (format=%i, stereo=%i, rate=%li)\n",
- p_aout->dsp.psz_device,
- p_aout->dsp.i_format,
- p_aout->dsp.b_stereo, p_aout->dsp.l_rate);
-
- //?? maybe it would be cleaner to change SpawnThread prototype
- //?? see vout to handle status correctly - however, it is not critical since
- //?? this thread is only called in main is all calls are blocking
+
+ /* Initialize the vomue level */
+ p_aout->vol = VOL;
+
+ /* FIXME: maybe it would be cleaner to change SpawnThread prototype
+ * see vout to handle status correctly ?? however, it is not critical since
+ * this thread is only called in main and all calls are blocking */
if( aout_SpawnThread( p_aout ) )
{
- aout_dspClose( &p_aout->dsp );
- free( p_aout );
- return( NULL );
+ p_aout->p_sys_close( p_aout );
+ TrashPlugin( p_aout->aout_plugin );
+ free( p_aout );
+ return( NULL );
}
return( p_aout );
}
-/******************************************************************************
+/*****************************************************************************
* aout_SpawnThread
- ******************************************************************************/
+ *****************************************************************************/
static int aout_SpawnThread( aout_thread_t * p_aout )
{
int i_fifo;
long l_bytes;
- s64 s64_numerator, s64_denominator;
void * aout_thread = NULL;
intf_DbgMsg("aout debug: spawning audio output thread (%p)\n", p_aout);
/* We want the audio output thread to live */
p_aout->b_die = 0;
+ p_aout->b_active = 1;
/* Initialize the fifos lock */
vlc_mutex_init( &p_aout->fifos_lock );
/* Compute the size (in audio units) of the audio output buffer. Although
* AOUT_BUFFER_DURATION is given in microseconds, the output rate is given
* in Hz, that's why we need to divide by 10^6 microseconds (1 second) */
- p_aout->l_units = (long)( ((s64)p_aout->dsp.l_rate * AOUT_BUFFER_DURATION) / 1000000 );
+ p_aout->l_units = (long)( ((s64)p_aout->l_rate * AOUT_BUFFER_DURATION) / 1000000 );
+ p_aout->l_msleep = (long)( ((s64)p_aout->l_units * 1000000) / (s64)p_aout->l_rate );
/* Make aout_thread point to the right thread function, and compute the
* byte size of the audio output buffer */
- switch ( p_aout->dsp.b_stereo )
+ switch ( p_aout->i_channels )
{
/* Audio output is mono */
- case 0:
- switch ( p_aout->dsp.i_format )
+ case 1:
+ switch ( p_aout->i_format )
{
- case AFMT_U8:
+ case AOUT_FMT_U8:
l_bytes = 1 * sizeof(u8) * p_aout->l_units;
aout_thread = (void *)aout_Thread_U8_Mono;
break;
- case AFMT_S8:
+ case AOUT_FMT_S8:
l_bytes = 1 * sizeof(s8) * p_aout->l_units;
aout_thread = (void *)aout_Thread_S8_Mono;
break;
- case AFMT_U16_LE:
- case AFMT_U16_BE:
+ case AOUT_FMT_U16_LE:
+ case AOUT_FMT_U16_BE:
l_bytes = 1 * sizeof(u16) * p_aout->l_units;
aout_thread = (void *)aout_Thread_U16_Mono;
break;
- case AFMT_S16_LE:
- case AFMT_S16_BE:
+ case AOUT_FMT_S16_LE:
+ case AOUT_FMT_S16_BE:
l_bytes = 1 * sizeof(s16) * p_aout->l_units;
aout_thread = (void *)aout_Thread_S16_Mono;
break;
default:
- intf_ErrMsg("aout error: unknown audio output format (%i)\n",
- p_aout->dsp.i_format);
- return( -1 );
+ intf_ErrMsg( "aout error: unknown audio output format (%i)\n",
+ p_aout->i_format );
+ return( -1 );
}
break;
/* Audio output is stereo */
- case 1:
- switch ( p_aout->dsp.i_format )
+ case 2:
+ switch ( p_aout->i_format )
{
- case AFMT_U8:
+ case AOUT_FMT_U8:
l_bytes = 2 * sizeof(u8) * p_aout->l_units;
aout_thread = (void *)aout_Thread_U8_Stereo;
break;
- case AFMT_S8:
+ case AOUT_FMT_S8:
l_bytes = 2 * sizeof(s8) * p_aout->l_units;
aout_thread = (void *)aout_Thread_S8_Stereo;
break;
- case AFMT_U16_LE:
- case AFMT_U16_BE:
+ case AOUT_FMT_U16_LE:
+ case AOUT_FMT_U16_BE:
l_bytes = 2 * sizeof(u16) * p_aout->l_units;
aout_thread = (void *)aout_Thread_U16_Stereo;
break;
- case AFMT_S16_LE:
- case AFMT_S16_BE:
+ case AOUT_FMT_S16_LE:
+ case AOUT_FMT_S16_BE:
l_bytes = 2 * sizeof(s16) * p_aout->l_units;
aout_thread = (void *)aout_Thread_S16_Stereo;
break;
default:
intf_ErrMsg("aout error: unknown audio output format (%i)\n",
- p_aout->dsp.i_format);
+ p_aout->i_format);
return( -1 );
}
break;
default:
intf_ErrMsg("aout error: unknown number of audio channels (%i)\n",
- p_aout->dsp.b_stereo + 1);
+ p_aout->i_channels );
return( -1 );
}
intf_ErrMsg("aout error: not enough memory to create the output buffer\n");
return( -1 );
}
- if ( (p_aout->s32_buffer = (s32 *)calloc(p_aout->l_units, sizeof(s32) << p_aout->dsp.b_stereo)) == NULL )
+ if ( (p_aout->s32_buffer = (s32 *)calloc(p_aout->l_units, sizeof(s32) << ( p_aout->b_stereo))) == NULL )
{
intf_ErrMsg("aout error: not enough memory to create the s32 output buffer\n");
free( p_aout->buffer );
return( -1 );
}
- /* Initialize the incremental structure that is used to work out the date
- * of the first audio unit in the output buffer */
- s64_numerator = (s64)p_aout->l_units * 1000000;
- s64_denominator = (s64)p_aout->dsp.l_rate;
-
- p_aout->date_increment.l_remainder = -(long)s64_denominator;
-
- p_aout->date_increment.l_euclidean_integer = 0;
- while ( s64_numerator >= s64_denominator )
- {
- p_aout->date_increment.l_euclidean_integer++;
- s64_numerator -= s64_denominator;
- }
-
- p_aout->date_increment.l_euclidean_remainder = (long)s64_numerator;
-
- p_aout->date_increment.l_euclidean_denominator = (long)s64_denominator;
-
/* Before launching the thread, we try to predict the date of the first
* audio unit in the first output buffer */
- p_aout->date = mdate();
+ p_aout->date = mdate() - 1000000;
/* Launch the thread */
if ( vlc_thread_create( &p_aout->thread_id, "audio output", (vlc_thread_func_t)aout_thread, p_aout ) )
return( 0 );
}
-/******************************************************************************
+/*****************************************************************************
* aout_DestroyThread
- ******************************************************************************/
+ *****************************************************************************/
void aout_DestroyThread( aout_thread_t * p_aout, int *pi_status )
{
- //???? pi_status is not handled correctly: check vout how to do!
+ /* FIXME: pi_status is not handled correctly: check vout how to do!?? */
intf_DbgMsg("aout debug: requesting termination of audio output thread (%p)\n", p_aout);
/* Ask thread to kill itself and wait until it's done */
p_aout->b_die = 1;
- vlc_thread_join( p_aout->thread_id ); // only if pi_status is NULL
+ vlc_thread_join( p_aout->thread_id ); /* only if pi_status is NULL */
/* Free the allocated memory */
free( p_aout->buffer );
free( p_aout->s32_buffer );
/* Free the structure */
- aout_dspClose( &p_aout->dsp );
- intf_DbgMsg("aout debug: audio device (%s) closed\n", p_aout->dsp.psz_device);
+ p_aout->p_sys_close( p_aout );
+ intf_DbgMsg("aout debug: audio device (%s) closed\n", p_aout->psz_device);
+
+ /* Close plugin */
+ TrashPlugin( p_aout->aout_plugin );
+
+ /* Free structure */
free( p_aout );
}
-/******************************************************************************
+/*****************************************************************************
* aout_CreateFifo
- ******************************************************************************/
+ *****************************************************************************/
aout_fifo_t * aout_CreateFifo( aout_thread_t * p_aout, aout_fifo_t * p_fifo )
{
int i_fifo;
for ( i_fifo = 0; i_fifo < AOUT_MAX_FIFOS; i_fifo++ )
{
if ( p_aout->fifo[i_fifo].i_type == AOUT_EMPTY_FIFO)
- {
+ {
break;
}
}
{
case AOUT_INTF_MONO_FIFO:
case AOUT_INTF_STEREO_FIFO:
- p_aout->fifo[i_fifo].b_die = 0;
+ p_aout->fifo[i_fifo].b_die = 0;
- p_aout->fifo[i_fifo].b_stereo = p_fifo->b_stereo;
- p_aout->fifo[i_fifo].l_rate = p_fifo->l_rate;
+ p_aout->fifo[i_fifo].i_channels = p_fifo->i_channels;
+ p_aout->fifo[i_fifo].b_stereo = p_fifo->b_stereo;
+ p_aout->fifo[i_fifo].l_rate = p_fifo->l_rate;
p_aout->fifo[i_fifo].buffer = p_fifo->buffer;
p_aout->fifo[i_fifo].l_unit = 0;
- InitializeIncrement( &p_aout->fifo[i_fifo].unit_increment, p_fifo->l_rate, p_aout->dsp.l_rate );
+ InitializeIncrement( &p_aout->fifo[i_fifo].unit_increment, p_fifo->l_rate, p_aout->l_rate );
p_aout->fifo[i_fifo].l_units = p_fifo->l_units;
break;
case AOUT_ADEC_MONO_FIFO:
case AOUT_ADEC_STEREO_FIFO:
- p_aout->b_die = 0;
+ p_aout->fifo[i_fifo].b_die = 0;
+ p_aout->fifo[i_fifo].i_channels = p_fifo->i_channels;
p_aout->fifo[i_fifo].b_stereo = p_fifo->b_stereo;
p_aout->fifo[i_fifo].l_rate = p_fifo->l_rate;
- p_aout->fifo[i_fifo].l_frame_size = p_fifo->l_frame_size;
+ p_aout->fifo[i_fifo].l_frame_size = p_fifo->l_frame_size;
/* Allocate the memory needed to store the audio frames. As the
* fifo is a rotative fifo, we must be able to find out whether the
* fifo is full or empty, that's why we must in fact allocate memory
* for (AOUT_FIFO_SIZE+1) audio frames. */
- if ( (p_aout->fifo[i_fifo].buffer = malloc( sizeof(s16)*(AOUT_FIFO_SIZE+1)*p_fifo->l_frame_size )) == NULL )
- {
+ if ( (p_aout->fifo[i_fifo].buffer = malloc( sizeof(s16)*(AOUT_FIFO_SIZE+1)*p_fifo->l_frame_size )) == NULL )
+ {
intf_ErrMsg("aout error: not enough memory to create the frames buffer\n");
p_aout->fifo[i_fifo].i_type = AOUT_EMPTY_FIFO;
- vlc_mutex_unlock( &p_aout->fifos_lock );
- return( NULL );
- }
+ vlc_mutex_unlock( &p_aout->fifos_lock );
+ return( NULL );
+ }
/* Allocate the memory needed to store the dates of the frames */
if ( (p_aout->fifo[i_fifo].date = (mtime_t *)malloc( sizeof(mtime_t)*(AOUT_FIFO_SIZE+1) )) == NULL )
* out the fifo's current rate (as soon as the decoder has decoded
* enough frames, the members of the fifo structure that are not
* initialized now will be calculated) */
- p_aout->fifo[i_fifo].l_unit = 0; /* !! */
p_aout->fifo[i_fifo].b_start_frame = 0;
p_aout->fifo[i_fifo].b_next_frame = 0;
break;
return( &p_aout->fifo[i_fifo] );
}
-/******************************************************************************
+/*****************************************************************************
* aout_DestroyFifo
- ******************************************************************************/
+ *****************************************************************************/
void aout_DestroyFifo( aout_fifo_t * p_fifo )
{
intf_DbgMsg("aout debug: requesting destruction of audio output fifo (%p)\n", p_fifo);
/* Here are the local macros */
-#define S32_TO_S16( sample ) \
- (s16)( (sample) )
-
#define UPDATE_INCREMENT( increment, integer ) \
- if ( ((increment).l_remainder += (increment).l_euclidean_remainder) >= 0 ) \
+ if ( ((increment).l_remainder += (increment).l_euclidean_remainder) >= 0 )\
{ \
(integer) += (increment).l_euclidean_integer + 1; \
(increment).l_remainder -= (increment).l_euclidean_denominator; \
/* Following functions are local */
-/******************************************************************************
+/*****************************************************************************
* InitializeIncrement
- ******************************************************************************/
+ *****************************************************************************/
static __inline__ void InitializeIncrement( aout_increment_t * p_increment, long l_numerator, long l_denominator )
{
p_increment->l_remainder = -l_denominator;
p_increment->l_euclidean_denominator = l_denominator;
}
-/******************************************************************************
+/*****************************************************************************
* NextFrame
- ******************************************************************************/
-static __inline__ int NextFrame( aout_thread_t * p_aout, aout_fifo_t * p_fifo/*, mtime_t aout_date*/ )
+ *****************************************************************************/
+static __inline__ int NextFrame( aout_thread_t * p_aout, aout_fifo_t * p_fifo, mtime_t aout_date )
{
long l_units, l_rate;
{
p_fifo->b_start_frame = 1;
p_fifo->l_next_frame = (p_fifo->l_start_frame + 1) & AOUT_FIFO_SIZE;
+ p_fifo->l_unit = p_fifo->l_start_frame * (p_fifo->l_frame_size >> (p_fifo->b_stereo));
break;
}
p_fifo->l_start_frame = (p_fifo->l_start_frame + 1) & AOUT_FIFO_SIZE;
}
+
if ( p_fifo->l_start_frame == p_fifo->l_end_frame )
{
vlc_mutex_unlock( &p_fifo->data_lock );
return( -1 );
}
}
-/*
- if ( aout_date < p_fifo->date[p_fifo->l_start_frame] )
- {
- fprintf(stderr, "+");
- vlc_mutex_unlock( &p_fifo->data_lock );
- return( -1 );
- }
-*/
+
/* We are looking for the next dated frame */
- while ( p_fifo->l_next_frame != p_fifo->l_end_frame )
+ /* FIXME : is the output fifo full ?? */
+ while ( !p_fifo->b_next_frame )
{
- if ( p_fifo->date[p_fifo->l_next_frame] != LAST_MDATE )
+ while ( p_fifo->l_next_frame != p_fifo->l_end_frame )
{
-/*
- if ( aout_date < p_fifo->date[p_fifo->l_next_frame] )
- {
-*/
-/*
- if ( (p_fifo->date[p_fifo->l_next_frame] - p_fifo->date[p_fifo->l_start_frame] > 1000000) || (p_fifo->date[p_fifo->l_next_frame] <= p_fifo->date[p_fifo->l_start_frame]) )
+ if ( p_fifo->date[p_fifo->l_next_frame] != LAST_MDATE )
{
- fprintf( stderr, "aout debug: p_fifo->l_rate == %li\n", p_fifo->l_rate );
- p_fifo->date[p_fifo->l_start_frame] = p_fifo->date[p_fifo->l_next_frame] - ((1000000 * ((mtime_t)(p_fifo->l_frame_size * ((p_fifo->l_next_frame - p_fifo->l_start_frame) & AOUT_FIFO_SIZE))) >> p_fifo->b_stereo) / ((mtime_t)p_fifo->l_rate));
- }
-*/
- p_fifo->b_next_frame = 1;
- break;
-/*
- }
- else
- {
- fprintf(stderr, "-");
- p_fifo->l_start_frame = p_fifo->l_next_frame;
+ p_fifo->b_next_frame = 1;
+ break;
}
-*/
+ p_fifo->l_next_frame = (p_fifo->l_next_frame + 1) & AOUT_FIFO_SIZE;
}
- p_fifo->l_next_frame = (p_fifo->l_next_frame + 1) & AOUT_FIFO_SIZE;
- }
- if ( p_fifo->l_next_frame == p_fifo->l_end_frame )
- {
- if ( (((p_fifo->l_end_frame + 1) - p_fifo->l_start_frame) & AOUT_FIFO_SIZE) == 0 )
+
+ while ( p_fifo->l_next_frame == p_fifo->l_end_frame )
{
- p_fifo->l_start_frame = 0;
- p_fifo->b_start_frame = 0;
- /* p_fifo->l_next_frame = 0; */
- /* p_fifo->b_next_frame = 0; */
- p_fifo->l_end_frame = 0;
+ vlc_cond_wait( &p_fifo->data_wait, &p_fifo->data_lock );
+ if ( p_fifo->b_die )
+ {
+ vlc_mutex_unlock( &p_fifo->data_lock );
+ return( -1 );
+ }
}
- vlc_mutex_unlock( &p_fifo->data_lock );
- return( -1 );
}
- l_units = ((p_fifo->l_next_frame - p_fifo->l_start_frame) & AOUT_FIFO_SIZE) * (p_fifo->l_frame_size >> p_fifo->b_stereo);
+ l_units = ((p_fifo->l_next_frame - p_fifo->l_start_frame) & AOUT_FIFO_SIZE) * (p_fifo->l_frame_size >> (p_fifo->b_stereo));
- l_rate = (long)( ((mtime_t)l_units * 1000000)
- / (p_fifo->date[p_fifo->l_next_frame] - p_fifo->date[p_fifo->l_start_frame]) );
-// fprintf( stderr, "aout debug: l_rate == %li\n", l_rate );
+ l_rate = p_fifo->l_rate + ((aout_date - p_fifo->date[p_fifo->l_start_frame]) / 256);
+// intf_DbgMsg( "aout debug: %lli (%li);\n", aout_date - p_fifo->date[p_fifo->l_start_frame], l_rate );
- InitializeIncrement( &p_fifo->unit_increment, l_rate, p_aout->dsp.l_rate );
+ InitializeIncrement( &p_fifo->unit_increment, l_rate, p_aout->l_rate );
p_fifo->l_units = (((l_units - (p_fifo->l_unit -
- (p_fifo->l_start_frame * (p_fifo->l_frame_size >> p_fifo->b_stereo))))
- * p_aout->dsp.l_rate) / l_rate) + 1;
+ (p_fifo->l_start_frame * (p_fifo->l_frame_size >> (p_fifo->b_stereo)))))
+ * p_aout->l_rate) / l_rate) + 1;
/* We release the lock before leaving */
vlc_mutex_unlock( &p_fifo->data_lock );
}
void aout_Thread_U8_Mono( aout_thread_t * p_aout )
-{
-}
-
-void aout_Thread_U8_Stereo( aout_thread_t * p_aout )
-{
-}
-
-void aout_Thread_S16_Mono( aout_thread_t * p_aout )
-{
-}
-
-void aout_Thread_S16_Stereo( aout_thread_t * p_aout )
{
int i_fifo;
- long l_units;
long l_buffer, l_buffer_limit;
+ long l_units, l_bytes;
+ intf_DbgMsg("adec debug: ********aout_Thread_U8_Mono********\n");
intf_DbgMsg("adec debug: running audio output thread (%p) (pid == %i)\n", p_aout, getpid());
/* As the s32_buffer was created with calloc(), we don't have to set this
{
vlc_mutex_lock( &p_aout->fifos_lock );
for ( i_fifo = 0; i_fifo < AOUT_MAX_FIFOS; i_fifo++ )
- {
+ {
switch ( p_aout->fifo[i_fifo].i_type )
- {
+ {
case AOUT_EMPTY_FIFO:
break;
case AOUT_INTF_MONO_FIFO:
if ( p_aout->fifo[i_fifo].l_units > p_aout->l_units )
- {
+ {
l_buffer = 0;
- while ( l_buffer < (p_aout->l_units << 1) ) /* p_aout->dsp.b_stereo == 1 */
- {
+ while ( l_buffer < (p_aout->l_units /*<< 1*/) ) /* p_aout->b_stereo == 1 */
+ {
p_aout->s32_buffer[l_buffer++] +=
(s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[p_aout->fifo[i_fifo].l_unit] );
p_aout->s32_buffer[l_buffer++] +=
p_aout->fifo[i_fifo].l_units -= p_aout->l_units;
}
else
- {
+ {
l_buffer = 0;
- while ( l_buffer < (p_aout->fifo[i_fifo].l_units << 1) ) /* p_aout->dsp.b_stereo == 1 */
- {
+ while ( l_buffer < (p_aout->fifo[i_fifo].l_units /*<< 1*/) ) /* p_aout->b_stereo == 1 */
+ {
p_aout->s32_buffer[l_buffer++] +=
(s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[p_aout->fifo[i_fifo].l_unit] );
p_aout->s32_buffer[l_buffer++] +=
case AOUT_INTF_STEREO_FIFO:
if ( p_aout->fifo[i_fifo].l_units > p_aout->l_units )
- {
+ {
l_buffer = 0;
- while ( l_buffer < (p_aout->l_units << 1) ) /* p_aout->dsp.b_stereo == 1 */
- {
+ while ( l_buffer < (p_aout->l_units /*<< 1*/) ) /* p_aout->b_stereo == 1 */
+ {
p_aout->s32_buffer[l_buffer++] +=
(s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[2*p_aout->fifo[i_fifo].l_unit] );
p_aout->s32_buffer[l_buffer++] +=
p_aout->fifo[i_fifo].l_units -= p_aout->l_units;
}
else
- {
+ {
l_buffer = 0;
- while ( l_buffer < (p_aout->fifo[i_fifo].l_units << 1) ) /* p_aout->dsp.b_stereo */
- {
+ while ( l_buffer < (p_aout->fifo[i_fifo].l_units /*<< 1*/) ) /* p_aout->b_stereo == 1 */
+ {
p_aout->s32_buffer[l_buffer++] +=
(s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[2*p_aout->fifo[i_fifo].l_unit] );
p_aout->s32_buffer[l_buffer++] +=
break;
case AOUT_ADEC_MONO_FIFO:
+ if ( p_aout->fifo[i_fifo].b_die )
+ {
+ free( p_aout->fifo[i_fifo].buffer );
+ free( p_aout->fifo[i_fifo].date );
+ p_aout->fifo[i_fifo].i_type = AOUT_EMPTY_FIFO; /* !! */
+ intf_DbgMsg("aout debug: audio output fifo (%p) destroyed\n", &p_aout->fifo[i_fifo]);
+ continue;
+ }
+
l_units = p_aout->l_units;
l_buffer = 0;
while ( l_units > 0 )
{
if ( !p_aout->fifo[i_fifo].b_next_frame )
{
- if ( NextFrame(p_aout, &p_aout->fifo[i_fifo]/*, p_aout->date + (mtime_t)((l_buffer >> p_aout->dsp.b_stereo) / p_aout->dsp.l_rate)*/) )
+ if ( NextFrame(p_aout, &p_aout->fifo[i_fifo], p_aout->date + ((((mtime_t)(l_buffer >> 1)) * 1000000) / ((mtime_t)p_aout->l_rate))) )
{
break;
}
if ( p_aout->fifo[i_fifo].l_units > l_units )
{
- l_buffer_limit = p_aout->l_units << 1; /* p_aout->dsp.b_stereo == 1 */
+ l_buffer_limit = p_aout->l_units /*<< 1*/; /* p_aout->b_stereo == 1 */
while ( l_buffer < l_buffer_limit )
{
p_aout->s32_buffer[l_buffer++] +=
else
{
l_buffer_limit = l_buffer + (p_aout->fifo[i_fifo].l_units << 1);
- /* p_aout->dsp.b_stereo == 1 */
+ /* p_aout->b_stereo == 1 */
while ( l_buffer < l_buffer_limit )
{
p_aout->s32_buffer[l_buffer++] +=
break;
case AOUT_ADEC_STEREO_FIFO:
+ if ( p_aout->fifo[i_fifo].b_die )
+ {
+ free( p_aout->fifo[i_fifo].buffer );
+ free( p_aout->fifo[i_fifo].date );
+ p_aout->fifo[i_fifo].i_type = AOUT_EMPTY_FIFO; /* !! */
+ intf_DbgMsg("aout debug: audio output fifo (%p) destroyed\n", &p_aout->fifo[i_fifo]);
+ continue;
+ }
+
l_units = p_aout->l_units;
l_buffer = 0;
while ( l_units > 0 )
{
if ( !p_aout->fifo[i_fifo].b_next_frame )
{
- if ( NextFrame(p_aout, &p_aout->fifo[i_fifo]/*, p_aout->date + (mtime_t)((l_buffer >> p_aout->dsp.b_stereo) / p_aout->dsp.l_rate)*/) )
+ if ( NextFrame(p_aout, &p_aout->fifo[i_fifo], p_aout->date + ((((mtime_t)(l_buffer >> 1)) * 1000000) / ((mtime_t)p_aout->l_rate))) )
{
break;
}
}
-
+#define SOUND 1
+#define DEBUG 0
+#define COEFF 2
if ( p_aout->fifo[i_fifo].l_units > l_units )
{
- l_buffer_limit = p_aout->l_units << 1; /* p_aout->dsp.b_stereo == 1 */
+ l_buffer_limit = p_aout->l_units /*<< 1*/; /* p_aout->b_stereo == 1 */
+//intf_DbgMsg( "l_buffer_limit:%d\n",l_buffer_limit );
while ( l_buffer < l_buffer_limit )
{
+#if SOUND
+
p_aout->s32_buffer[l_buffer++] +=
- (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[2*p_aout->fifo[i_fifo].l_unit] );
+ (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[COEFF*p_aout->fifo[i_fifo].l_unit] );
p_aout->s32_buffer[l_buffer++] +=
- (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[2*p_aout->fifo[i_fifo].l_unit+1] );
+ (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[COEFF*p_aout->fifo[i_fifo].l_unit+1] );
+
+/*
+//intf_DbgMsg( "1deb " );
+l_buffer++;
+p_aout->s32_buffer[l_buffer] += (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[COEFF*p_aout->fifo[i_fifo].l_unit] ) / 2;
+p_aout->s32_buffer[l_buffer] += (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[COEFF*p_aout->fifo[i_fifo].l_unit+1] ) / 2;
+l_buffer++;
+//intf_DbgMsg( "1fin" );
+*/
+#endif
+
+#if DEBUG
+//intf_DbgMsg( "p_aout->s32_buffer[l_buffer] 11 : %x (%d)",p_aout->s32_buffer[l_buffer-1],p_aout->s32_buffer[l_buffer-1] );
+intf_DbgMsg( "p_aout->fifo %ld\n",COEFF*p_aout->fifo[i_fifo].l_unit );
+intf_DbgMsg( "%d - p_aout->s32b %ld\n", l_buffer, (s32) ( ((s16 *)p_aout->fifo[i_fifo].buffer)[COEFF*p_aout->fifo[i_fifo].l_unit] ) );
+//intf_DbgMsg( "p_aout->s32_buffer[l_buffer] 12 : %x (%d)\n",p_aout->s32_buffer[l_buffer-1],p_aout->s32_buffer[l_buffer-1] );
+#endif
UPDATE_INCREMENT( p_aout->fifo[i_fifo].unit_increment, p_aout->fifo[i_fifo].l_unit )
if ( p_aout->fifo[i_fifo].l_unit >= /* p_aout->fifo[i_fifo].b_stereo == 1 */
- ((AOUT_FIFO_SIZE + 1) * (p_aout->fifo[i_fifo].l_frame_size >> 1)) )
+ ((AOUT_FIFO_SIZE + 1) * (p_aout->fifo[i_fifo].l_frame_size >> 2/*1*/)) )
{
p_aout->fifo[i_fifo].l_unit -= /* p_aout->fifo[i_fifo].b_stereo == 1 */
- ((AOUT_FIFO_SIZE + 1) * (p_aout->fifo[i_fifo].l_frame_size >> 1));
+ ((AOUT_FIFO_SIZE + 1) * (p_aout->fifo[i_fifo].l_frame_size >> 2/*1*/));
}
}
p_aout->fifo[i_fifo].l_units -= l_units;
}
else
{
- l_buffer_limit = l_buffer + (p_aout->fifo[i_fifo].l_units << 1);
- /* p_aout->dsp.b_stereo == 1 */
+//#if 0
+ l_buffer_limit = l_buffer + (p_aout->fifo[i_fifo].l_units /*<< 1*/);
+//intf_DbgMsg( "l_buffer_limit:%d\n",l_buffer_limit );
+ /* p_aout->b_stereo == 1 */
while ( l_buffer < l_buffer_limit )
{
+#if SOUND
+
p_aout->s32_buffer[l_buffer++] +=
- (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[2*p_aout->fifo[i_fifo].l_unit] );
+ (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[COEFF*p_aout->fifo[i_fifo].l_unit] );
p_aout->s32_buffer[l_buffer++] +=
- (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[2*p_aout->fifo[i_fifo].l_unit+1] );
+ (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[COEFF*p_aout->fifo[i_fifo].l_unit+1] );
+
+/*
+//intf_DbgMsg( "2deb " );
+l_buffer++;
+//intf_DbgMsg( "793 ");
+// !!!!!! Seg Fault !!!!!!!
+//intf_DbgMsg( "\n p->aout_buffer : %d\t%d\n",p_aout->s32_buffer[l_buffer],COEFF*p_aout->fifo[i_fifo].l_unit );
+if( COEFF*p_aout->fifo[i_fifo].l_unit < 60000 )
+{
+ p_aout->s32_buffer[l_buffer] += (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[COEFF*p_aout->fifo[i_fifo].l_unit] ) / 2;
+// intf_DbgMsg( "795 ");
+ p_aout->s32_buffer[l_buffer] += (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[COEFF*p_aout->fifo[i_fifo].l_unit+1] ) / 2;
+//intf_DbgMsg( "797 ");
+ l_buffer++;
+}
+//intf_DbgMsg( "2fin " );
+*/
+#endif
+
+#if DEBUG
+//intf_DbgMsg( "p_aout->s32_buffer[l_buffer] 21 : %x (%d)",p_aout->s32_buffer[l_buffer-1],p_aout->s32_buffer[l_buffer-1] );
+intf_DbgMsg( "p_aout->fifo %ld\n",COEFF*p_aout->fifo[i_fifo].l_unit );
+intf_DbgMsg( "%d - p_aout->s32b %ld\n", l_buffer, (s32) ( ((s16 *)p_aout->fifo[i_fifo].buffer)[COEFF*p_aout->fifo[i_fifo].l_unit] ) );
+//intf_DbgMsg( "p_aout->s32_buffer[l_buffer] 22 : %x (%d)\n",p_aout->s32_buffer[l_buffer-1],p_aout->s32_buffer[l_buffer-1] );
+#endif
UPDATE_INCREMENT( p_aout->fifo[i_fifo].unit_increment, p_aout->fifo[i_fifo].l_unit )
+//intf_DbgMsg( "807 ");
if ( p_aout->fifo[i_fifo].l_unit >= /* p_aout->fifo[i_fifo].b_stereo == 1 */
- ((AOUT_FIFO_SIZE + 1) * (p_aout->fifo[i_fifo].l_frame_size >> 1)) )
+ ((AOUT_FIFO_SIZE + 1) * (p_aout->fifo[i_fifo].l_frame_size >> 2/*1*/)) )
{
+//intf_DbgMsg( "811 ");
p_aout->fifo[i_fifo].l_unit -= /* p_aout->fifo[i_fifo].b_stereo == 1 */
- ((AOUT_FIFO_SIZE + 1) * (p_aout->fifo[i_fifo].l_frame_size >> 1));
+ ((AOUT_FIFO_SIZE + 1) * (p_aout->fifo[i_fifo].l_frame_size >> 2/*1*/));
}
}
+//intf_DbgMsg( "816 ");
l_units -= p_aout->fifo[i_fifo].l_units;
-
+//intf_DbgMsg( "818 ");
vlc_mutex_lock( &p_aout->fifo[i_fifo].data_lock );
+//intf_DbgMsg( "820 ");
p_aout->fifo[i_fifo].l_start_frame = p_aout->fifo[i_fifo].l_next_frame;
+//intf_DbgMsg( "822 ");
vlc_cond_signal( &p_aout->fifo[i_fifo].data_wait );
+//intf_DbgMsg( "824 ");
vlc_mutex_unlock( &p_aout->fifo[i_fifo].data_lock );
-
+//intf_DbgMsg( "826 ");
/* p_aout->fifo[i_fifo].b_start_frame = 1; */
p_aout->fifo[i_fifo].l_next_frame += 1;
+//intf_DbgMsg( "829 ");
p_aout->fifo[i_fifo].l_next_frame &= AOUT_FIFO_SIZE;
+//intf_DbgMsg( "831 ");
p_aout->fifo[i_fifo].b_next_frame = 0;
+//#endif
+//intf_DbgMsg( "837 ");
}
+//intf_DbgMsg( "838 ");
+/* !!!!!!!!!!!!! Seg Fault !!!!!!!!!!!!!!!!! */
}
+//intf_DbgMsg( "839 ");
break;
default:
+//intf_DbgMsg( "841 ");
intf_DbgMsg("aout debug: unknown fifo type (%i)\n", p_aout->fifo[i_fifo].i_type);
+//intf_DbgMsg( "842 ");
break;
}
}
+//intf_DbgMsg( "843 ");
vlc_mutex_unlock( &p_aout->fifos_lock );
-
- l_buffer_limit = p_aout->l_units << 1; /* p_aout->dsp.b_stereo == 1 */
-
+//intf_DbgMsg( "845 ");
+ l_buffer_limit = p_aout->l_units /*<< 1*/ ; /* p_aout->b_stereo == 1 */
+//intf_DbgMsg( "\nici commence l'envoi sur sb\n" );
for ( l_buffer = 0; l_buffer < l_buffer_limit; l_buffer++ )
- {
- ((s16 *)p_aout->buffer)[l_buffer] = S32_TO_S16( p_aout->s32_buffer[l_buffer] / AOUT_MAX_FIFOS );
- p_aout->s32_buffer[l_buffer] = 0;
+ {
+//intf_DbgMsg( "3deb ");
+//intf_DbgMsg( "p_aout->s_32_buffer[l_buffer] : %x (%d)\n",p_aout->s32_buffer[l_buffer],p_aout->s32_buffer[l_buffer] );
+ ((u8 *)p_aout->buffer)[l_buffer] = (u8)( (p_aout->s32_buffer[/*2 **/ l_buffer] / 256) + 128 );
+//intf_DbgMsg( "p_aout->buffer[l_buffer] : %x (%d)\n", ((u8 *)p_aout->buffer)[l_buffer], ((u8 *)p_aout->buffer)[l_buffer] );
+ p_aout->s32_buffer[/*2 **/ l_buffer] = 0;
+// p_aout->s32_buffer[2 * l_buffer + 1] = 0;
+//intf_DbgMsg( "3fin ");
}
-
- aout_dspGetBufInfo( &p_aout->dsp );
- if ( p_aout->dsp.buf_info.fragments == p_aout->dsp.buf_info.fragstotal ) /* ?? */
- {
- aout_dspPlaySamples( &p_aout->dsp, (byte_t *)p_aout->buffer, sizeof(s16) * l_buffer_limit );
- p_aout->date = mdate();
+ l_bytes = p_aout->p_sys_getbufinfo( p_aout, l_buffer_limit );
+ p_aout->date = mdate() + ((((mtime_t)(l_bytes / 2 )) * 1000000) / ((mtime_t)p_aout->l_rate)); /* sizeof(u8) << (p_aout->b_stereo) == 2 */
+ p_aout->p_sys_playsamples( p_aout, (byte_t *)p_aout->buffer, l_buffer_limit * sizeof(u8) );
+ if ( l_bytes > (l_buffer_limit * sizeof(u8)) )
+ {
+ msleep( p_aout->l_msleep );
}
- else if ( p_aout->dsp.buf_info.bytes >=
- ((p_aout->dsp.buf_info.fragsize * p_aout->dsp.buf_info.fragstotal) -
- (sizeof(s16) * l_buffer_limit)) )
- {
- aout_dspPlaySamples( &p_aout->dsp, (byte_t *)p_aout->buffer, sizeof(s16) * l_buffer_limit );
+ }
+
+ vlc_mutex_lock( &p_aout->fifos_lock );
+ for ( i_fifo = 0; i_fifo < AOUT_MAX_FIFOS; i_fifo++ )
+ {
+ switch ( p_aout->fifo[i_fifo].i_type )
+ {
+ case AOUT_EMPTY_FIFO:
+ break;
+
+ case AOUT_INTF_MONO_FIFO:
+ case AOUT_INTF_STEREO_FIFO:
+ free( p_aout->fifo[i_fifo].buffer ); /* !! */
+ p_aout->fifo[i_fifo].i_type = AOUT_EMPTY_FIFO; /* !! */
+ intf_DbgMsg("aout debug: audio output fifo (%p) destroyed\n", &p_aout->fifo[i_fifo]);
+ break;
+
+ case AOUT_ADEC_MONO_FIFO:
+ case AOUT_ADEC_STEREO_FIFO:
+ free( p_aout->fifo[i_fifo].buffer );
+ free( p_aout->fifo[i_fifo].date );
+ p_aout->fifo[i_fifo].i_type = AOUT_EMPTY_FIFO; /* !! */
+ intf_DbgMsg("aout debug: audio output fifo (%p) destroyed\n", &p_aout->fifo[i_fifo]);
+ break;
+
+ default:
+ break;
}
- else
- {
- aout_dspPlaySamples( &p_aout->dsp, (byte_t *)p_aout->buffer, sizeof(s16) * l_buffer_limit );
- msleep( p_aout->date_increment.l_euclidean_integer );
+ }
+ vlc_mutex_unlock( &p_aout->fifos_lock );
+
+}
+
+void aout_Thread_U8_Stereo( aout_thread_t * p_aout )
+{
+ int i_fifo;
+ long l_buffer, l_buffer_limit;
+ long l_units, l_bytes;
+
+ intf_DbgMsg("adec debug: ********aout_Thread_U8_Stereo********\n");
+ intf_DbgMsg("adec debug: running audio output thread (%p) (pid == %i)\n", p_aout, getpid());
+
+ /* As the s32_buffer was created with calloc(), we don't have to set this
+ * memory to zero and we can immediately jump into the thread's loop */
+ while ( !p_aout->b_die )
+ {
+ vlc_mutex_lock( &p_aout->fifos_lock );
+ for ( i_fifo = 0; i_fifo < AOUT_MAX_FIFOS; i_fifo++ )
+ {
+ switch ( p_aout->fifo[i_fifo].i_type )
+ {
+ case AOUT_EMPTY_FIFO:
+ break;
+
+ case AOUT_INTF_MONO_FIFO:
+ if ( p_aout->fifo[i_fifo].l_units > p_aout->l_units )
+ {
+ l_buffer = 0;
+ while ( l_buffer < (p_aout->l_units << 1) ) /* p_aout->b_stereo == 1 */
+ {
+ p_aout->s32_buffer[l_buffer++] +=
+ (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[p_aout->fifo[i_fifo].l_unit] );
+ p_aout->s32_buffer[l_buffer++] +=
+ (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[p_aout->fifo[i_fifo].l_unit] );
+ UPDATE_INCREMENT( p_aout->fifo[i_fifo].unit_increment, p_aout->fifo[i_fifo].l_unit )
+ }
+ p_aout->fifo[i_fifo].l_units -= p_aout->l_units;
+ }
+ else
+ {
+ l_buffer = 0;
+ while ( l_buffer < (p_aout->fifo[i_fifo].l_units << 1) ) /* p_aout->b_stereo == 1 */
+ {
+ p_aout->s32_buffer[l_buffer++] +=
+ (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[p_aout->fifo[i_fifo].l_unit] );
+ p_aout->s32_buffer[l_buffer++] +=
+ (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[p_aout->fifo[i_fifo].l_unit] );
+ UPDATE_INCREMENT( p_aout->fifo[i_fifo].unit_increment, p_aout->fifo[i_fifo].l_unit )
+ }
+ free( p_aout->fifo[i_fifo].buffer ); /* !! */
+ p_aout->fifo[i_fifo].i_type = AOUT_EMPTY_FIFO; /* !! */
+ intf_DbgMsg("aout debug: audio output fifo (%p) destroyed\n", &p_aout->fifo[i_fifo]); /* !! */
+ }
+ break;
+
+ case AOUT_INTF_STEREO_FIFO:
+ if ( p_aout->fifo[i_fifo].l_units > p_aout->l_units )
+ {
+ l_buffer = 0;
+ while ( l_buffer < (p_aout->l_units << 1) ) /* p_aout->b_stereo == 1 */
+ {
+ p_aout->s32_buffer[l_buffer++] +=
+ (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[2*p_aout->fifo[i_fifo].l_unit] );
+ p_aout->s32_buffer[l_buffer++] +=
+ (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[2*p_aout->fifo[i_fifo].l_unit+1] );
+ UPDATE_INCREMENT( p_aout->fifo[i_fifo].unit_increment, p_aout->fifo[i_fifo].l_unit )
+ }
+ p_aout->fifo[i_fifo].l_units -= p_aout->l_units;
+ }
+ else
+ {
+ l_buffer = 0;
+ while ( l_buffer < (p_aout->fifo[i_fifo].l_units << 1) ) /* p_aout->b_stereo == 1 */
+ {
+ p_aout->s32_buffer[l_buffer++] +=
+ (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[2*p_aout->fifo[i_fifo].l_unit] );
+ p_aout->s32_buffer[l_buffer++] +=
+ (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[2*p_aout->fifo[i_fifo].l_unit+1] );
+ UPDATE_INCREMENT( p_aout->fifo[i_fifo].unit_increment, p_aout->fifo[i_fifo].l_unit )
+ }
+ free( p_aout->fifo[i_fifo].buffer ); /* !! */
+ p_aout->fifo[i_fifo].i_type = AOUT_EMPTY_FIFO; /* !! */
+ intf_DbgMsg("aout debug: audio output fifo (%p) destroyed\n", &p_aout->fifo[i_fifo]); /* !! */
+ }
+ break;
+
+ case AOUT_ADEC_MONO_FIFO:
+ if ( p_aout->fifo[i_fifo].b_die )
+ {
+ free( p_aout->fifo[i_fifo].buffer );
+ free( p_aout->fifo[i_fifo].date );
+ p_aout->fifo[i_fifo].i_type = AOUT_EMPTY_FIFO; /* !! */
+ intf_DbgMsg("aout debug: audio output fifo (%p) destroyed\n", &p_aout->fifo[i_fifo]);
+ continue;
+ }
+
+ l_units = p_aout->l_units;
+ l_buffer = 0;
+ while ( l_units > 0 )
+ {
+ if ( !p_aout->fifo[i_fifo].b_next_frame )
+ {
+ if ( NextFrame(p_aout, &p_aout->fifo[i_fifo], p_aout->date + ((((mtime_t)(l_buffer >> 1)) * 1000000) / ((mtime_t)p_aout->l_rate))) )
+ {
+ break;
+ }
+ }
+
+ if ( p_aout->fifo[i_fifo].l_units > l_units )
+ {
+ l_buffer_limit = p_aout->l_units << 1; /* p_aout->b_stereo == 1 */
+ while ( l_buffer < l_buffer_limit )
+ {
+ p_aout->s32_buffer[l_buffer++] +=
+ (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[p_aout->fifo[i_fifo].l_unit] );
+ p_aout->s32_buffer[l_buffer++] +=
+ (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[p_aout->fifo[i_fifo].l_unit] );
+
+ UPDATE_INCREMENT( p_aout->fifo[i_fifo].unit_increment, p_aout->fifo[i_fifo].l_unit )
+ if ( p_aout->fifo[i_fifo].l_unit >= /* p_aout->fifo[i_fifo].b_stereo == 0 */
+ ((AOUT_FIFO_SIZE + 1) * (p_aout->fifo[i_fifo].l_frame_size >> 0)) )
+ {
+ p_aout->fifo[i_fifo].l_unit -= /* p_aout->fifo[i_fifo].b_stereo == 0 */
+ ((AOUT_FIFO_SIZE + 1) * (p_aout->fifo[i_fifo].l_frame_size >> 0));
+ }
+ }
+ p_aout->fifo[i_fifo].l_units -= l_units;
+ break;
+ }
+ else
+ {
+ l_buffer_limit = l_buffer + (p_aout->fifo[i_fifo].l_units << 1);
+ /* p_aout->b_stereo == 1 */
+ while ( l_buffer < l_buffer_limit )
+ {
+ p_aout->s32_buffer[l_buffer++] +=
+ (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[p_aout->fifo[i_fifo].l_unit] );
+ p_aout->s32_buffer[l_buffer++] +=
+ (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[p_aout->fifo[i_fifo].l_unit] );
+
+ UPDATE_INCREMENT( p_aout->fifo[i_fifo].unit_increment, p_aout->fifo[i_fifo].l_unit )
+ if ( p_aout->fifo[i_fifo].l_unit >= /* p_aout->fifo[i_fifo].b_stereo == 0 */
+ ((AOUT_FIFO_SIZE + 1) * (p_aout->fifo[i_fifo].l_frame_size >> 0)) )
+ {
+ p_aout->fifo[i_fifo].l_unit -= /* p_aout->fifo[i_fifo].b_stereo == 0 */
+ ((AOUT_FIFO_SIZE + 1) * (p_aout->fifo[i_fifo].l_frame_size >> 0));
+ }
+ }
+ l_units -= p_aout->fifo[i_fifo].l_units;
+
+ vlc_mutex_lock( &p_aout->fifo[i_fifo].data_lock );
+ p_aout->fifo[i_fifo].l_start_frame = p_aout->fifo[i_fifo].l_next_frame;
+ vlc_cond_signal( &p_aout->fifo[i_fifo].data_wait );
+ vlc_mutex_unlock( &p_aout->fifo[i_fifo].data_lock );
+
+ /* p_aout->fifo[i_fifo].b_start_frame = 1; */
+ p_aout->fifo[i_fifo].l_next_frame += 1;
+ p_aout->fifo[i_fifo].l_next_frame &= AOUT_FIFO_SIZE;
+ p_aout->fifo[i_fifo].b_next_frame = 0;
+ }
+ }
+ break;
+
+ case AOUT_ADEC_STEREO_FIFO:
+ if ( p_aout->fifo[i_fifo].b_die )
+ {
+ free( p_aout->fifo[i_fifo].buffer );
+ free( p_aout->fifo[i_fifo].date );
+ p_aout->fifo[i_fifo].i_type = AOUT_EMPTY_FIFO; /* !! */
+ intf_DbgMsg("aout debug: audio output fifo (%p) destroyed\n", &p_aout->fifo[i_fifo]);
+ continue;
+ }
+
+ l_units = p_aout->l_units;
+ l_buffer = 0;
+ while ( l_units > 0 )
+ {
+ if ( !p_aout->fifo[i_fifo].b_next_frame )
+ {
+ if ( NextFrame(p_aout, &p_aout->fifo[i_fifo], p_aout->date + ((((mtime_t)(l_buffer >> 1)) * 1000000) / ((mtime_t)p_aout->l_rate))) )
+ {
+ break;
+ }
+ }
+
+ if ( p_aout->fifo[i_fifo].l_units > l_units )
+ {
+ l_buffer_limit = p_aout->l_units << 1; /* p_aout->b_stereo == 1 */
+ while ( l_buffer < l_buffer_limit )
+ {
+ p_aout->s32_buffer[l_buffer++] +=
+ (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[2*p_aout->fifo[i_fifo].l_unit] );
+ p_aout->s32_buffer[l_buffer++] +=
+ (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[2*p_aout->fifo[i_fifo].l_unit+1] );
+
+ UPDATE_INCREMENT( p_aout->fifo[i_fifo].unit_increment, p_aout->fifo[i_fifo].l_unit )
+ if ( p_aout->fifo[i_fifo].l_unit >= /* p_aout->fifo[i_fifo].b_stereo == 1 */
+ ((AOUT_FIFO_SIZE + 1) * (p_aout->fifo[i_fifo].l_frame_size >> 1)) )
+ {
+ p_aout->fifo[i_fifo].l_unit -= /* p_aout->fifo[i_fifo].b_stereo == 1 */
+ ((AOUT_FIFO_SIZE + 1) * (p_aout->fifo[i_fifo].l_frame_size >> 1));
+ }
+ }
+ p_aout->fifo[i_fifo].l_units -= l_units;
+ break;
+ }
+ else
+ {
+ l_buffer_limit = l_buffer + (p_aout->fifo[i_fifo].l_units << 1);
+ /* p_aout->b_stereo == 1 */
+ while ( l_buffer < l_buffer_limit )
+ {
+ p_aout->s32_buffer[l_buffer++] +=
+ (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[2*p_aout->fifo[i_fifo].l_unit] );
+ p_aout->s32_buffer[l_buffer++] +=
+ (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[2*p_aout->fifo[i_fifo].l_unit+1] );
+
+ UPDATE_INCREMENT( p_aout->fifo[i_fifo].unit_increment, p_aout->fifo[i_fifo].l_unit )
+ if ( p_aout->fifo[i_fifo].l_unit >= /* p_aout->fifo[i_fifo].b_stereo == 1 */
+ ((AOUT_FIFO_SIZE + 1) * (p_aout->fifo[i_fifo].l_frame_size >> 1)) )
+ {
+ p_aout->fifo[i_fifo].l_unit -= /* p_aout->fifo[i_fifo].b_stereo == 1 */
+ ((AOUT_FIFO_SIZE + 1) * (p_aout->fifo[i_fifo].l_frame_size >> 1));
+ }
+ }
+ l_units -= p_aout->fifo[i_fifo].l_units;
+
+ vlc_mutex_lock( &p_aout->fifo[i_fifo].data_lock );
+ p_aout->fifo[i_fifo].l_start_frame = p_aout->fifo[i_fifo].l_next_frame;
+ vlc_cond_signal( &p_aout->fifo[i_fifo].data_wait );
+ vlc_mutex_unlock( &p_aout->fifo[i_fifo].data_lock );
+
+ /* p_aout->fifo[i_fifo].b_start_frame = 1; */
+ p_aout->fifo[i_fifo].l_next_frame += 1;
+ p_aout->fifo[i_fifo].l_next_frame &= AOUT_FIFO_SIZE;
+ p_aout->fifo[i_fifo].b_next_frame = 0;
+ }
+ }
+ break;
+
+ default:
+ intf_DbgMsg("aout debug: unknown fifo type (%i)\n", p_aout->fifo[i_fifo].i_type);
+ break;
+ }
+ }
+ vlc_mutex_unlock( &p_aout->fifos_lock );
+
+ l_buffer_limit = p_aout->l_units << 1 ; /* p_aout->b_stereo == 1 */
+
+ for ( l_buffer = 0; l_buffer < l_buffer_limit; l_buffer++ )
+ {
+ ((u8 *)p_aout->buffer)[l_buffer] = (u8)( ( (p_aout->s32_buffer[l_buffer] / 256) + 128 ) * \
+ ((float) p_aout->vol / 100 ) );
+ p_aout->s32_buffer[l_buffer] = 0;
+ }
+ l_bytes = p_aout->p_sys_getbufinfo( p_aout, l_buffer_limit );
+ p_aout->date = mdate() + ((((mtime_t)(l_bytes / 2 )) * 1000000) / ((mtime_t)p_aout->l_rate)); /* sizeof(u8) << (p_aout->b_stereo) == 2 */
+ p_aout->p_sys_playsamples( p_aout, (byte_t *)p_aout->buffer, l_buffer_limit * sizeof(u8) );
+ if ( l_bytes > (l_buffer_limit * sizeof(u8)) )
+ {
+ msleep( p_aout->l_msleep );
+ }
+ }
+
+ vlc_mutex_lock( &p_aout->fifos_lock );
+ for ( i_fifo = 0; i_fifo < AOUT_MAX_FIFOS; i_fifo++ )
+ {
+ switch ( p_aout->fifo[i_fifo].i_type )
+ {
+ case AOUT_EMPTY_FIFO:
+ break;
+
+ case AOUT_INTF_MONO_FIFO:
+ case AOUT_INTF_STEREO_FIFO:
+ free( p_aout->fifo[i_fifo].buffer ); /* !! */
+ p_aout->fifo[i_fifo].i_type = AOUT_EMPTY_FIFO; /* !! */
+ intf_DbgMsg("aout debug: audio output fifo (%p) destroyed\n", &p_aout->fifo[i_fifo]);
+ break;
+
+ case AOUT_ADEC_MONO_FIFO:
+ case AOUT_ADEC_STEREO_FIFO:
+ free( p_aout->fifo[i_fifo].buffer );
+ free( p_aout->fifo[i_fifo].date );
+ p_aout->fifo[i_fifo].i_type = AOUT_EMPTY_FIFO; /* !! */
+ intf_DbgMsg("aout debug: audio output fifo (%p) destroyed\n", &p_aout->fifo[i_fifo]);
+ break;
+
+ default:
+ break;
+ }
+ }
+ vlc_mutex_unlock( &p_aout->fifos_lock );
+
+}
+
+void aout_Thread_S16_Mono( aout_thread_t * p_aout )
+{
+}
+
+void aout_Thread_S16_Stereo( aout_thread_t * p_aout )
+{
+ int i_fifo;
+ long l_buffer, l_buffer_limit;
+ long l_units, l_bytes;
+
+ intf_DbgMsg("adec debug: ********aout_Thread_S16_Stereo********\n");
+ intf_DbgMsg("adec debug: running audio output thread (%p) (pid == %i)\n", p_aout, getpid());
+
+ /* As the s32_buffer was created with calloc(), we don't have to set this
+ * memory to zero and we can immediately jump into the thread's loop */
+ while ( !p_aout->b_die )
+ {
+ vlc_mutex_lock( &p_aout->fifos_lock );
+ for ( i_fifo = 0; i_fifo < AOUT_MAX_FIFOS; i_fifo++ )
+ {
+ switch ( p_aout->fifo[i_fifo].i_type )
+ {
+ case AOUT_EMPTY_FIFO:
+ break;
+
+ case AOUT_INTF_MONO_FIFO:
+ if ( p_aout->fifo[i_fifo].l_units > p_aout->l_units )
+ {
+ l_buffer = 0;
+ while ( l_buffer < (p_aout->l_units << 1) ) /* p_aout->b_stereo == 1 */
+ {
+ p_aout->s32_buffer[l_buffer++] +=
+ (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[p_aout->fifo[i_fifo].l_unit] );
+ p_aout->s32_buffer[l_buffer++] +=
+ (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[p_aout->fifo[i_fifo].l_unit] );
+ UPDATE_INCREMENT( p_aout->fifo[i_fifo].unit_increment, p_aout->fifo[i_fifo].l_unit )
+ }
+ p_aout->fifo[i_fifo].l_units -= p_aout->l_units;
+ }
+ else
+ {
+ l_buffer = 0;
+ while ( l_buffer < (p_aout->fifo[i_fifo].l_units << 1) ) /* p_aout->b_stereo == 1 */
+ {
+ p_aout->s32_buffer[l_buffer++] +=
+ (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[p_aout->fifo[i_fifo].l_unit] );
+ p_aout->s32_buffer[l_buffer++] +=
+ (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[p_aout->fifo[i_fifo].l_unit] );
+ UPDATE_INCREMENT( p_aout->fifo[i_fifo].unit_increment, p_aout->fifo[i_fifo].l_unit )
+ }
+ free( p_aout->fifo[i_fifo].buffer ); /* !! */
+ p_aout->fifo[i_fifo].i_type = AOUT_EMPTY_FIFO; /* !! */
+ intf_DbgMsg("aout debug: audio output fifo (%p) destroyed\n", &p_aout->fifo[i_fifo]); /* !! */
+ }
+ break;
+
+ case AOUT_INTF_STEREO_FIFO:
+ if ( p_aout->fifo[i_fifo].l_units > p_aout->l_units )
+ {
+ l_buffer = 0;
+ while ( l_buffer < (p_aout->l_units << 1) ) /* p_aout->b_stereo == 1 */
+ {
+ p_aout->s32_buffer[l_buffer++] +=
+ (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[2*p_aout->fifo[i_fifo].l_unit] );
+ p_aout->s32_buffer[l_buffer++] +=
+ (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[2*p_aout->fifo[i_fifo].l_unit+1] );
+ UPDATE_INCREMENT( p_aout->fifo[i_fifo].unit_increment, p_aout->fifo[i_fifo].l_unit )
+ }
+ p_aout->fifo[i_fifo].l_units -= p_aout->l_units;
+ }
+ else
+ {
+ l_buffer = 0;
+ while ( l_buffer < (p_aout->fifo[i_fifo].l_units << 1) ) /* p_aout->b_stereo == 1 */
+ {
+ p_aout->s32_buffer[l_buffer++] +=
+ (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[2*p_aout->fifo[i_fifo].l_unit] );
+ p_aout->s32_buffer[l_buffer++] +=
+ (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[2*p_aout->fifo[i_fifo].l_unit+1] );
+ UPDATE_INCREMENT( p_aout->fifo[i_fifo].unit_increment, p_aout->fifo[i_fifo].l_unit )
+ }
+ free( p_aout->fifo[i_fifo].buffer ); /* !! */
+ p_aout->fifo[i_fifo].i_type = AOUT_EMPTY_FIFO; /* !! */
+ intf_DbgMsg("aout debug: audio output fifo (%p) destroyed\n", &p_aout->fifo[i_fifo]); /* !! */
+ }
+ break;
+
+ case AOUT_ADEC_MONO_FIFO:
+ if ( p_aout->fifo[i_fifo].b_die )
+ {
+ free( p_aout->fifo[i_fifo].buffer );
+ free( p_aout->fifo[i_fifo].date );
+ p_aout->fifo[i_fifo].i_type = AOUT_EMPTY_FIFO; /* !! */
+ intf_DbgMsg("aout debug: audio output fifo (%p) destroyed\n", &p_aout->fifo[i_fifo]);
+ continue;
+ }
+
+ l_units = p_aout->l_units;
+ l_buffer = 0;
+ while ( l_units > 0 )
+ {
+ if ( !p_aout->fifo[i_fifo].b_next_frame )
+ {
+ if ( NextFrame(p_aout, &p_aout->fifo[i_fifo], p_aout->date + ((((mtime_t)(l_buffer >> 1)) * 1000000) / ((mtime_t)p_aout->l_rate))) )
+ {
+ break;
+ }
+ }
+
+ if ( p_aout->fifo[i_fifo].l_units > l_units )
+ {
+ l_buffer_limit = p_aout->l_units << 1; /* p_aout->b_stereo == 1 */
+ while ( l_buffer < l_buffer_limit )
+ {
+ p_aout->s32_buffer[l_buffer++] +=
+ (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[p_aout->fifo[i_fifo].l_unit] );
+ p_aout->s32_buffer[l_buffer++] +=
+ (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[p_aout->fifo[i_fifo].l_unit] );
+
+ UPDATE_INCREMENT( p_aout->fifo[i_fifo].unit_increment, p_aout->fifo[i_fifo].l_unit )
+ if ( p_aout->fifo[i_fifo].l_unit >= /* p_aout->fifo[i_fifo].b_stereo == 0 */
+ ((AOUT_FIFO_SIZE + 1) * (p_aout->fifo[i_fifo].l_frame_size >> 0)) )
+ {
+ p_aout->fifo[i_fifo].l_unit -= /* p_aout->fifo[i_fifo].b_stereo == 0 */
+ ((AOUT_FIFO_SIZE + 1) * (p_aout->fifo[i_fifo].l_frame_size >> 0));
+ }
+ }
+ p_aout->fifo[i_fifo].l_units -= l_units;
+ break;
+ }
+ else
+ {
+ l_buffer_limit = l_buffer + (p_aout->fifo[i_fifo].l_units << 1);
+ /* p_aout->b_stereo == 1 */
+ while ( l_buffer < l_buffer_limit )
+ {
+ p_aout->s32_buffer[l_buffer++] +=
+ (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[p_aout->fifo[i_fifo].l_unit] );
+ p_aout->s32_buffer[l_buffer++] +=
+ (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[p_aout->fifo[i_fifo].l_unit] );
+
+ UPDATE_INCREMENT( p_aout->fifo[i_fifo].unit_increment, p_aout->fifo[i_fifo].l_unit )
+ if ( p_aout->fifo[i_fifo].l_unit >= /* p_aout->fifo[i_fifo].b_stereo == 0 */
+ ((AOUT_FIFO_SIZE + 1) * (p_aout->fifo[i_fifo].l_frame_size >> 0)) )
+ {
+ p_aout->fifo[i_fifo].l_unit -= /* p_aout->fifo[i_fifo].b_stereo == 0 */
+ ((AOUT_FIFO_SIZE + 1) * (p_aout->fifo[i_fifo].l_frame_size >> 0));
+ }
+ }
+ l_units -= p_aout->fifo[i_fifo].l_units;
+
+ vlc_mutex_lock( &p_aout->fifo[i_fifo].data_lock );
+ p_aout->fifo[i_fifo].l_start_frame = p_aout->fifo[i_fifo].l_next_frame;
+ vlc_cond_signal( &p_aout->fifo[i_fifo].data_wait );
+ vlc_mutex_unlock( &p_aout->fifo[i_fifo].data_lock );
+
+ /* p_aout->fifo[i_fifo].b_start_frame = 1; */
+ p_aout->fifo[i_fifo].l_next_frame += 1;
+ p_aout->fifo[i_fifo].l_next_frame &= AOUT_FIFO_SIZE;
+ p_aout->fifo[i_fifo].b_next_frame = 0;
+ }
+ }
+ break;
+
+ case AOUT_ADEC_STEREO_FIFO:
+ if ( p_aout->fifo[i_fifo].b_die )
+ {
+ free( p_aout->fifo[i_fifo].buffer );
+ free( p_aout->fifo[i_fifo].date );
+ p_aout->fifo[i_fifo].i_type = AOUT_EMPTY_FIFO; /* !! */
+ intf_DbgMsg("aout debug: audio output fifo (%p) destroyed\n", &p_aout->fifo[i_fifo]);
+ continue;
+ }
+
+ l_units = p_aout->l_units;
+ l_buffer = 0;
+ while ( l_units > 0 )
+ {
+ if ( !p_aout->fifo[i_fifo].b_next_frame )
+ {
+ if ( NextFrame(p_aout, &p_aout->fifo[i_fifo], p_aout->date + ((((mtime_t)(l_buffer >> 1)) * 1000000) / ((mtime_t)p_aout->l_rate))) )
+ {
+ break;
+ }
+ }
+
+ if ( p_aout->fifo[i_fifo].l_units > l_units )
+ {
+ l_buffer_limit = p_aout->l_units << 1; /* p_aout->b_stereo == 1 */
+ while ( l_buffer < l_buffer_limit )
+ {
+ p_aout->s32_buffer[l_buffer++] +=
+ (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[2*p_aout->fifo[i_fifo].l_unit] );
+ p_aout->s32_buffer[l_buffer++] +=
+ (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[2*p_aout->fifo[i_fifo].l_unit+1] );
+
+ UPDATE_INCREMENT( p_aout->fifo[i_fifo].unit_increment, p_aout->fifo[i_fifo].l_unit )
+ if ( p_aout->fifo[i_fifo].l_unit >= /* p_aout->fifo[i_fifo].b_stereo == 1 */
+ ((AOUT_FIFO_SIZE + 1) * (p_aout->fifo[i_fifo].l_frame_size >> 1)) )
+ {
+ p_aout->fifo[i_fifo].l_unit -= /* p_aout->fifo[i_fifo].b_stereo == 1 */
+ ((AOUT_FIFO_SIZE + 1) * (p_aout->fifo[i_fifo].l_frame_size >> 1));
+ }
+ }
+ p_aout->fifo[i_fifo].l_units -= l_units;
+ break;
+ }
+ else
+ {
+ l_buffer_limit = l_buffer + (p_aout->fifo[i_fifo].l_units << 1);
+ /* p_aout->b_stereo == 1 */
+ while ( l_buffer < l_buffer_limit )
+ {
+ p_aout->s32_buffer[l_buffer++] +=
+ (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[2*p_aout->fifo[i_fifo].l_unit] );
+ p_aout->s32_buffer[l_buffer++] +=
+ (s32)( ((s16 *)p_aout->fifo[i_fifo].buffer)[2*p_aout->fifo[i_fifo].l_unit+1] );
+
+ UPDATE_INCREMENT( p_aout->fifo[i_fifo].unit_increment, p_aout->fifo[i_fifo].l_unit )
+ if ( p_aout->fifo[i_fifo].l_unit >= /* p_aout->fifo[i_fifo].b_stereo == 1 */
+ ((AOUT_FIFO_SIZE + 1) * (p_aout->fifo[i_fifo].l_frame_size >> 1)) )
+ {
+ p_aout->fifo[i_fifo].l_unit -= /* p_aout->fifo[i_fifo].b_stereo == 1 */
+ ((AOUT_FIFO_SIZE + 1) * (p_aout->fifo[i_fifo].l_frame_size >> 1));
+ }
+ }
+ l_units -= p_aout->fifo[i_fifo].l_units;
+
+ vlc_mutex_lock( &p_aout->fifo[i_fifo].data_lock );
+ p_aout->fifo[i_fifo].l_start_frame = p_aout->fifo[i_fifo].l_next_frame;
+ vlc_cond_signal( &p_aout->fifo[i_fifo].data_wait );
+ vlc_mutex_unlock( &p_aout->fifo[i_fifo].data_lock );
+
+ /* p_aout->fifo[i_fifo].b_start_frame = 1; */
+ p_aout->fifo[i_fifo].l_next_frame += 1;
+ p_aout->fifo[i_fifo].l_next_frame &= AOUT_FIFO_SIZE;
+ p_aout->fifo[i_fifo].b_next_frame = 0;
+ }
+ }
+ break;
+
+ default:
+ intf_DbgMsg("aout debug: unknown fifo type (%i)\n", p_aout->fifo[i_fifo].i_type);
+ break;
+ }
+ }
+ vlc_mutex_unlock( &p_aout->fifos_lock );
+
+ l_buffer_limit = p_aout->l_units << 1; /* p_aout->b_stereo == 1 */
+
+ for ( l_buffer = 0; l_buffer < l_buffer_limit; l_buffer++ )
+ {
+ ((s16 *)p_aout->buffer)[l_buffer] = (s16)( ( p_aout->s32_buffer[l_buffer] / AOUT_MAX_FIFOS ) * \
+ ((float) p_aout->vol / 100 ) ) ;
+ p_aout->s32_buffer[l_buffer] = 0;
+ }
+
+ l_bytes = p_aout->p_sys_getbufinfo( p_aout, l_buffer_limit );
+ p_aout->date = mdate() + ((((mtime_t)(l_bytes / 4)) * 1000000) / ((mtime_t)p_aout->l_rate)); /* sizeof(s16) << (p_aout->b_stereo) == 4 */
+ p_aout->p_sys_playsamples( p_aout, (byte_t *)p_aout->buffer, l_buffer_limit * sizeof(s16) );
+ if ( l_bytes > (l_buffer_limit * sizeof(s16)) )
+ {
+ msleep( p_aout->l_msleep );
}
- UPDATE_INCREMENT( p_aout->date_increment, p_aout->date )
}
vlc_mutex_lock( &p_aout->fifos_lock );
projects / vlc / blobdiff