X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Faudio_output%2Faudio_output.c;h=de60d0348bba8bd9054f7eee3920383b2aa97534;hb=0a4aeaa67cae0699195b135dcc65ce5b0ee5fdc4;hp=655b4c36361ead08677146bd9290e9b52b34dac5;hpb=9629dd8a75ee68238354df36422dcf877bdda104;p=vlc diff --git a/src/audio_output/audio_output.c b/src/audio_output/audio_output.c index 655b4c3636..de60d0348b 100644 --- a/src/audio_output/audio_output.c +++ b/src/audio_output/audio_output.c @@ -1,7 +1,25 @@ -/****************************************************************************** +/***************************************************************************** * audio_output.c : audio output thread - * (c)1999 VideoLAN - ******************************************************************************/ + ***************************************************************************** + * Copyright (C) 1999, 2000, 2001 VideoLAN + * $Id: audio_output.c,v 1.57 2001/04/28 03:36:25 sam Exp $ + * + * Authors: Michel Kaempf + * + * 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: * @@ -15,55 +33,47 @@ * */ -/****************************************************************************** +/***************************************************************************** * Preamble - ******************************************************************************/ -#include + *****************************************************************************/ +#include "defs.h" -#include -#include /* "intf_msg.h" */ -#include /* calloc(), malloc(), free() */ +#include /* getpid() */ +#ifdef WIN32 /* getpid() for win32 is located in process.h */ +#include +#endif + +#include /* "intf_msg.h" */ +#include /* 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 "modules.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 "aout_common.h" + #include "main.h" -/****************************************************************************** +/***************************************************************************** * Local prototypes - ******************************************************************************/ - + *****************************************************************************/ static int aout_SpawnThread( aout_thread_t * p_aout ); -/* Creating as much aout_Thread functions as configurations is one solution, - * examining the different cases in the Thread loop of an unique function is - * another. I chose the first solution. */ -void aout_Thread_S8_Mono ( aout_thread_t * p_aout ); -void aout_Thread_U8_Mono ( aout_thread_t * p_aout ); -void aout_Thread_S16_Mono ( aout_thread_t * p_aout ); -void aout_Thread_U16_Mono ( aout_thread_t * p_aout ); -void aout_Thread_S8_Stereo ( aout_thread_t * p_aout ); -void aout_Thread_U8_Stereo ( aout_thread_t * p_aout ); -void aout_Thread_S16_Stereo ( 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 ); - -/****************************************************************************** +/***************************************************************************** * aout_CreateThread: initialize audio thread - ******************************************************************************/ + *****************************************************************************/ aout_thread_t *aout_CreateThread( int *pi_status ) { - aout_thread_t * p_aout; /* thread descriptor */ - int i_status; /* thread status */ - + aout_thread_t * p_aout; /* thread descriptor */ +#if 0 + int i_status; /* thread status */ +#endif + /* Allocate descriptor */ p_aout = (aout_thread_t *) malloc( sizeof(aout_thread_t) ); if( p_aout == NULL ) @@ -71,77 +81,84 @@ aout_thread_t *aout_CreateThread( int *pi_status ) 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 + /* Choose the best module */ + p_aout->p_module = module_Need( p_main->p_bank, + MODULE_CAPABILITY_AOUT, NULL ); - /* - * Initialize DSP - */ - if ( aout_dspOpen( &p_aout->dsp ) ) + if( p_aout->p_module == NULL ) { + intf_ErrMsg( "aout error: no suitable aout module" ); free( p_aout ); return( NULL ); } - if ( aout_dspReset( &p_aout->dsp ) ) - { - aout_dspClose( &p_aout->dsp ); - free( p_aout ); - return( NULL ); - } - if ( aout_dspSetFormat( &p_aout->dsp ) ) + +#define aout_functions p_aout->p_module->p_functions->aout.functions.aout + p_aout->pf_open = aout_functions.pf_open; + p_aout->pf_setformat = aout_functions.pf_setformat; + p_aout->pf_getbufinfo = aout_functions.pf_getbufinfo; + p_aout->pf_play = aout_functions.pf_play; + p_aout->pf_close = aout_functions.pf_close; +#undef aout_functions + + /* + * Initialize audio device + */ + if ( p_aout->pf_open( p_aout ) ) { - aout_dspClose( &p_aout->dsp ); - free( p_aout ); - return( NULL ); + module_Unneed( p_main->p_bank, p_aout->p_module ); + free( p_aout ); + return( NULL ); } - if ( aout_dspSetChannels( &p_aout->dsp ) ) + + if( p_aout->l_rate == 0 ) { - aout_dspClose( &p_aout->dsp ); - free( p_aout ); + intf_ErrMsg( "aout error: null sample rate" ); + p_aout->pf_close( p_aout ); + module_Unneed( p_main->p_bank, p_aout->p_module ); + free( p_aout ); return( NULL ); } - if ( aout_dspSetRate( &p_aout->dsp ) ) + + /* FIXME: only works for i_channels == 1 or 2 ?? */ + p_aout->b_stereo = ( p_aout->i_channels == 2 ) ? 1 : 0; + + if ( p_aout->pf_setformat( p_aout ) ) { - aout_dspClose( &p_aout->dsp ); - free( p_aout ); - return( NULL ); + p_aout->pf_close( p_aout ); + module_Unneed( p_main->p_bank, p_aout->p_module ); + 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 volume level */ + p_aout->vol = VOLUME_DEFAULT; + + /* 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->pf_close( p_aout ); + module_Unneed( p_main->p_bank, p_aout->p_module ); + 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; 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 ); @@ -156,671 +173,161 @@ static int aout_SpawnThread( aout_thread_t * p_aout ) /* 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_msleep = (long)( ((s64)p_aout->l_units * 1000000) / (s64)p_aout->dsp.l_rate ); + 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 AFMT_U8: - l_bytes = 1 * sizeof(u8) * p_aout->l_units; - aout_thread = (void *)aout_Thread_U8_Mono; - break; - - case AFMT_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: - 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: - l_bytes = 1 * sizeof(s16) * p_aout->l_units; - aout_thread = (void *)aout_Thread_S16_Mono; - break; + /* Audio output is mono */ + case 1: + switch ( p_aout->i_format ) + { + case AOUT_FMT_U8: + intf_WarnMsg( 2, "aout info: unsigned 8 bits mono thread" ); + l_bytes = 1 * sizeof(u8) * p_aout->l_units; + aout_thread = (void *)aout_U8MonoThread; + break; - default: - intf_ErrMsg("aout error: unknown audio output format (%i)\n", - p_aout->dsp.i_format); - return( -1 ); - } + case AOUT_FMT_S8: + intf_WarnMsg( 2, "aout info: signed 8 bits mono thread" ); + l_bytes = 1 * sizeof(s8) * p_aout->l_units; + aout_thread = (void *)aout_S8MonoThread; break; - /* Audio output is stereo */ - case 1: - switch ( p_aout->dsp.i_format ) - { - case AFMT_U8: - l_bytes = 2 * sizeof(u8) * p_aout->l_units; - aout_thread = (void *)aout_Thread_U8_Stereo; - break; - - case AFMT_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: - 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: - l_bytes = 2 * sizeof(s16) * p_aout->l_units; - aout_thread = (void *)aout_Thread_S16_Stereo; - break; + case AOUT_FMT_U16_LE: + case AOUT_FMT_U16_BE: + intf_WarnMsg( 2, "aout info: unsigned 16 bits mono thread" ); + l_bytes = 1 * sizeof(u16) * p_aout->l_units; + aout_thread = (void *)aout_U16MonoThread; + break; + + case AOUT_FMT_S16_LE: + case AOUT_FMT_S16_BE: + intf_WarnMsg( 2, "aout info: signed 16 bits mono thread" ); + l_bytes = 1 * sizeof(s16) * p_aout->l_units; + aout_thread = (void *)aout_S16MonoThread; + 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)", + p_aout->i_format ); + return( -1 ); + } + break; + + /* Audio output is stereo */ + case 2: + switch ( p_aout->i_format ) + { + case AOUT_FMT_U8: + intf_WarnMsg( 2, "aout info: unsigned 8 bits stereo thread" ); + l_bytes = 2 * sizeof(u8) * p_aout->l_units; + aout_thread = (void *)aout_U8StereoThread; + break; + + case AOUT_FMT_S8: + intf_WarnMsg( 2, "aout info: signed 8 bits stereo thread" ); + l_bytes = 2 * sizeof(s8) * p_aout->l_units; + aout_thread = (void *)aout_S8StereoThread; + break; + + case AOUT_FMT_U16_LE: + case AOUT_FMT_U16_BE: + intf_WarnMsg( 2, "aout info: unsigned 16 bits stereo thread" ); + l_bytes = 2 * sizeof(u16) * p_aout->l_units; + aout_thread = (void *)aout_U16StereoThread; + break; + + case AOUT_FMT_S16_LE: + case AOUT_FMT_S16_BE: + intf_WarnMsg( 2, "aout info: signed 16 bits stereo thread" ); + l_bytes = 2 * sizeof(s16) * p_aout->l_units; + aout_thread = (void *)aout_S16StereoThread; break; default: - intf_ErrMsg("aout error: unknown number of audio channels (%i)\n", - p_aout->dsp.b_stereo + 1); + intf_ErrMsg( "aout error: unknown audio output format %i", + p_aout->i_format ); return( -1 ); + } + break; + + default: + intf_ErrMsg( "aout error: unknown number of audio channels (%i)", + p_aout->i_channels ); + return( -1 ); } /* Allocate the memory needed by the audio output buffers, and set to zero * the s32 buffer's memory */ - if ( (p_aout->buffer = malloc(l_bytes)) == NULL ) + p_aout->buffer = malloc( l_bytes ); + if ( p_aout->buffer == NULL ) { - intf_ErrMsg("aout error: not enough memory to create the output buffer\n"); + intf_ErrMsg( "aout error: cannot create output buffer" ); return( -1 ); } - if ( (p_aout->s32_buffer = (s32 *)calloc(p_aout->l_units, sizeof(s32) << p_aout->dsp.b_stereo)) == NULL ) + + p_aout->s32_buffer = (s32 *)calloc( p_aout->l_units, + sizeof(s32) << ( p_aout->b_stereo ) ); + if ( p_aout->s32_buffer == NULL ) { - intf_ErrMsg("aout error: not enough memory to create the s32 output buffer\n"); + intf_ErrMsg( "aout error: cannot create the s32 output buffer" ); free( p_aout->buffer ); return( -1 ); } - /* Before launching the thread, we try to predict the date of the first - * audio unit in the first output buffer */ + /* Rough estimate of the playing date */ p_aout->date = mdate(); /* Launch the thread */ - if ( vlc_thread_create( &p_aout->thread_id, "audio output", (vlc_thread_func_t)aout_thread, p_aout ) ) + if ( vlc_thread_create( &p_aout->thread_id, "audio output", + (vlc_thread_func_t)aout_thread, p_aout ) ) { - intf_ErrMsg("aout error: can't spawn audio output thread (%p)\n", p_aout); + intf_ErrMsg( "aout error: cannot spawn audio output thread" ); free( p_aout->buffer ); free( p_aout->s32_buffer ); return( -1 ); } - intf_DbgMsg("aout debug: audio output thread (%p) spawned\n", p_aout); + intf_WarnMsg( 2, "aout info: audio output thread %i spawned", getpid() ); 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! - intf_DbgMsg("aout debug: requesting termination of audio output thread (%p)\n", p_aout); + int i_fifo; + + /* FIXME: pi_status is not handled correctly: check vout how to do!?? */ /* 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); - free( p_aout ); -} - -/****************************************************************************** - * aout_CreateFifo - ******************************************************************************/ -aout_fifo_t * aout_CreateFifo( aout_thread_t * p_aout, aout_fifo_t * p_fifo ) -{ - int i_fifo; - - /* Take the fifos lock */ - vlc_mutex_lock( &p_aout->fifos_lock ); - - /* Looking for a free fifo structure */ + /* Destroy the condition and mutex locks */ for ( i_fifo = 0; i_fifo < AOUT_MAX_FIFOS; i_fifo++ ) { - 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->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].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].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 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; + vlc_mutex_destroy( &p_aout->fifo[i_fifo].data_lock ); + vlc_cond_destroy( &p_aout->fifo[i_fifo].data_wait ); } + vlc_mutex_destroy( &p_aout->fifos_lock ); + + /* Free the plugin */ + p_aout->pf_close( p_aout ); - 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; - 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; - } + /* Release the aout module */ + module_Unneed( p_main->p_bank, p_aout->p_module ); - if ( p_fifo->l_start_frame == p_fifo->l_end_frame ) - { - vlc_mutex_unlock( &p_fifo->data_lock ); - return( -1 ); - } - } - - /* We are looking for the next dated frame */ - /* FIXME : is the output fifo full ? */ - while ( !p_fifo->b_next_frame ) - { - while ( p_fifo->l_next_frame != p_fifo->l_end_frame ) - { - if ( p_fifo->date[p_fifo->l_next_frame] != LAST_MDATE ) - { - p_fifo->b_next_frame = 1; - break; - } - p_fifo->l_next_frame = (p_fifo->l_next_frame + 1) & AOUT_FIFO_SIZE; - } - - while ( p_fifo->l_next_frame == p_fifo->l_end_frame ) - { - 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 ); - } - } - } - - 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 = p_fifo->l_rate + ((aout_date - p_fifo->date[p_fifo->l_start_frame]) / 256); - fprintf( stderr, "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 ); - - 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_buffer, l_buffer_limit; - long l_units, l_bytes; - - 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: - 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->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: - 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->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] = (s16)( p_aout->s32_buffer[l_buffer] / AOUT_MAX_FIFOS ); - p_aout->s32_buffer[l_buffer] = 0; - } - - aout_dspGetBufInfo( &p_aout->dsp ); - l_bytes = (p_aout->dsp.buf_info.fragstotal * p_aout->dsp.buf_info.fragsize) - p_aout->dsp.buf_info.bytes; - p_aout->date = mdate() + ((((mtime_t)(l_bytes / 4)) * 1000000) / ((mtime_t)p_aout->dsp.l_rate)); /* sizeof(s16) << p_aout->dsp.b_stereo == 4 */ - aout_dspPlaySamples( &p_aout->dsp, (byte_t *)p_aout->buffer, l_buffer_limit * sizeof(s16) ); - if ( l_bytes > (l_buffer_limit * sizeof(s16)) ) - { - 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_U16_Mono( aout_thread_t * p_aout ) -{ + /* Free structure */ + free( p_aout ); } -void aout_Thread_U16_Stereo( aout_thread_t * p_aout ) -{ -}