- if ( p_aout->fifo[i_fifo].i_type == AOUT_EMPTY_FIFO)
- {
- break;
- }
- }
- if ( i_fifo == AOUT_MAX_FIFOS )
- {
- intf_ErrMsg("aout error: no empty fifo available\n");
- vlc_mutex_unlock( &p_aout->fifos_lock );
- return( NULL );
- }
-
- /* Initialize the new fifo structure */
- switch ( p_aout->fifo[i_fifo].i_type = p_fifo->i_type )
- {
- case AOUT_INTF_MONO_FIFO:
- case AOUT_INTF_STEREO_FIFO:
- 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].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 );
- 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_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;
- /* 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 )
- {
- 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 );
- }
-
- /* 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 )
- {
- intf_ErrMsg("aout error: not enough memory to create the dates buffer\n");
- free( p_aout->fifo[i_fifo].buffer );
- p_aout->fifo[i_fifo].i_type = AOUT_EMPTY_FIFO;
- vlc_mutex_unlock( &p_aout->fifos_lock );
- return( NULL );
- }
-
- /* Set the fifo's buffer as empty (the first frame that is to be
- * played is also the first frame that is not to be played) */
- p_aout->fifo[i_fifo].l_start_frame = 0;
- /* p_aout->fifo[i_fifo].l_next_frame = 0; */
- p_aout->fifo[i_fifo].l_end_frame = 0;
-
- /* Waiting for the audio decoder to compute enough frames to work
- * 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;
-
- default:
- intf_ErrMsg("aout error: unknown fifo type (%i)\n", p_aout->fifo[i_fifo].i_type);
- p_aout->fifo[i_fifo].i_type = AOUT_EMPTY_FIFO;
- vlc_mutex_unlock( &p_aout->fifos_lock );
- return( NULL );
- }
-
- /* Release the fifos lock */
- vlc_mutex_unlock( &p_aout->fifos_lock );
-
- /* Return the pointer to the fifo structure */
- intf_DbgMsg("aout debug: audio output fifo (%p) allocated\n", &p_aout->fifo[i_fifo]);
- 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);
- p_fifo->b_die = 1;
-}
-
-/* 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 ) \
- { \
- (integer) += (increment).l_euclidean_integer + 1; \
- (increment).l_remainder -= (increment).l_euclidean_denominator; \
- } \
- else \
- { \
- (integer) += (increment).l_euclidean_integer; \
- }
-
-/* 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_integer = 0;
- while ( l_numerator >= l_denominator )
- {
- p_increment->l_euclidean_integer++;
- l_numerator -= l_denominator;
- }
-
- p_increment->l_euclidean_remainder = l_numerator;
-
- 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*/ )
-{
- long l_units, l_rate;
-
- /* We take the lock */
- vlc_mutex_lock( &p_fifo->data_lock );
-
- /* Are we looking for a dated start frame ? */
- if ( !p_fifo->b_start_frame )
- {
- while ( p_fifo->l_start_frame != p_fifo->l_end_frame )
- {
- if ( p_fifo->date[p_fifo->l_start_frame] != LAST_MDATE )
- {
- p_fifo->b_start_frame = 1;
- p_fifo->l_next_frame = (p_fifo->l_start_frame + 1) & AOUT_FIFO_SIZE;
- 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 )
- {
- if ( p_fifo->date[p_fifo->l_next_frame] != LAST_MDATE )
- {
-/*
- 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]) )
- {
- 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->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 )
- {
- 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_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_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 );
-
- InitializeIncrement( &p_fifo->unit_increment, l_rate, p_aout->dsp.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;
-
- /* We release the lock before leaving */
- vlc_mutex_unlock( &p_fifo->data_lock );
- return( 0 );
-}
-
-void aout_Thread_S8_Mono( aout_thread_t * p_aout )
-{
-}
-
-void aout_Thread_S8_Stereo( aout_thread_t * p_aout )
-{
-}
-
-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;
-
- 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->dsp.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->dsp.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->dsp.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->dsp.b_stereo */
- {
- 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:
- 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)*/) )
- {
- 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 */
- 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->dsp.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:
- 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)*/) )
- {
- 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 */
- 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->dsp.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->dsp.b_stereo == 1 */
-
- 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;
- }
-
- 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();
- }
- 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 );
- }
- else
- {
- aout_dspPlaySamples( &p_aout->dsp, (byte_t *)p_aout->buffer, sizeof(s16) * l_buffer_limit );
- msleep( p_aout->date_increment.l_euclidean_integer );
- }
- UPDATE_INCREMENT( p_aout->date_increment, p_aout->date )