/*****************************************************************************
* audio_output.c : audio output thread
*****************************************************************************
- * Copyright (C) 1999, 2000, 2001 VideoLAN
+ * Copyright (C) 1999-2001 VideoLAN
+ * $Id: audio_output.c,v 1.88 2002/08/04 17:23:44 sam Exp $
*
* Authors: Michel Kaempf <maxx@via.ecp.fr>
+ * Cyril Deguet <asmax@via.ecp.fr>
*
* 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
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
-/* TODO:
- *
- * - Passer un certain nombre de "fonctions" (genre add_samples) en macro ou
- * inline
- * - Faire les optimisations dans les fonctions threads :
- * = Stocker les "petits calculs" dans des variables au lieu de les refaire
- * à chaque boucle
- * = Utiliser des tables pour les gros calculs
- * - Faire une structure différente pour intf/adec fifo
- *
- */
-
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include "defs.h"
-
-#include <unistd.h> /* getpid() */
-
-#include <stdio.h> /* "intf_msg.h" */
#include <stdlib.h> /* calloc(), malloc(), free() */
+#include <string.h>
+
+#include <vlc/vlc.h>
-#include "config.h"
-#include "common.h"
-#include "threads.h"
-#include "mtime.h" /* mtime_t, mdate(), msleep() */
-#include "modules.h"
+#ifdef HAVE_UNISTD_H
+# include <unistd.h> /* getpid() */
+#endif
-#include "intf_msg.h" /* intf_DbgMsg(), intf_ErrMsg() */
+#ifdef WIN32 /* getpid() for win32 is located in process.h */
+# include <process.h>
+#endif
#include "audio_output.h"
-#include "aout_common.h"
-#include "main.h"
+#include "aout_pcm.h"
+#include "aout_spdif.h"
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-static int aout_SpawnThread( aout_thread_t * p_aout );
+static int aout_SpawnThread ( aout_thread_t * p_aout );
/*****************************************************************************
* aout_CreateThread: initialize audio thread
*****************************************************************************/
-aout_thread_t *aout_CreateThread( int *pi_status )
+aout_thread_t *aout_CreateThread( vlc_object_t *p_parent,
+ int i_channels, int i_rate )
{
aout_thread_t * p_aout; /* thread descriptor */
-#if 0
- int i_status; /* thread status */
-#endif
+ char * psz_name;
+ int i_format;
/* Allocate descriptor */
- p_aout = (aout_thread_t *) malloc( sizeof(aout_thread_t) );
+ p_aout = vlc_object_create( p_parent, VLC_OBJECT_AOUT );
if( p_aout == NULL )
{
- return( NULL );
+ return NULL;
}
- /* Choose the best module */
- p_aout->p_module = module_Need( p_main->p_bank,
- MODULE_CAPABILITY_AOUT, NULL );
+ p_aout->i_latency = 0;
+ p_aout->i_rate = config_GetInt( p_aout, "rate" );
+ p_aout->i_channels = config_GetInt( p_aout, "mono" ) ? 1 : 2;
- if( p_aout->p_module == NULL )
+ i_format = config_GetInt( p_aout, "audio-format" );
+ if( ( !i_format ) || ( i_format > 8 ) )
{
- intf_ErrMsg( "aout error: no suitable aout module" );
- free( p_aout );
- return( NULL );
+ p_aout->i_format = AOUT_FMT_S16_NE;
}
-
-#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 ) )
+ else
{
- module_Unneed( p_main->p_bank, p_aout->p_module );
- free( p_aout );
- return( NULL );
+ p_aout->i_format = 1 << ( i_format + 2 );
}
- if( p_aout->l_rate == 0 )
+ if( p_aout->i_rate == 0 )
{
- 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 );
+ msg_Err( p_aout, "null sample rate" );
+ vlc_object_destroy( p_aout );
+ return NULL;
}
- p_aout->b_stereo = ( p_aout->i_channels == 2 ) ? 1 : 0; /* FIXME: only works
- for i_channels == 1 or 2 ??*/
+ /* Choose the best module */
+ psz_name = config_GetPsz( p_aout, "aout" );
+ p_aout->p_module = module_Need( p_aout, "audio output", psz_name );
+ if( psz_name ) free( psz_name );
+ if( p_aout->p_module == NULL )
+ {
+ msg_Err( p_aout, "no suitable aout module" );
+ vlc_object_destroy( p_aout );
+ return NULL;
+ }
+ /*
+ * Initialize audio device
+ */
if ( p_aout->pf_setformat( p_aout ) )
{
- p_aout->pf_close( p_aout );
- module_Unneed( p_main->p_bank, p_aout->p_module );
- free( p_aout );
- return( NULL );
+ module_Unneed( p_aout, p_aout->p_module );
+ vlc_object_destroy( p_aout );
+ return NULL;
}
/* Initialize the volume level */
- p_aout->vol = VOLUME_DEFAULT;
+ p_aout->i_volume = config_GetInt( p_aout, "volume" );
+ p_aout->i_savedvolume = 0;
/* 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 ) )
{
- p_aout->pf_close( p_aout );
- module_Unneed( p_main->p_bank, p_aout->p_module );
- free( p_aout );
- return( NULL );
+ module_Unneed( p_aout, p_aout->p_module );
+ vlc_object_destroy( p_aout );
+ return NULL;
}
- return( p_aout );
+ vlc_object_attach( p_aout, p_parent->p_vlc );
+
+ return p_aout;
}
/*****************************************************************************
*****************************************************************************/
static int aout_SpawnThread( aout_thread_t * p_aout )
{
- int i_fifo;
- long l_bytes;
- void * aout_thread = NULL;
-
- /* We want the audio output thread to live */
- p_aout->b_die = 0;
- p_aout->b_active = 1;
+ int i_index, i_bytes;
+ void (* pf_aout_thread)( aout_thread_t * ) = NULL;
+ char *psz_format;
/* Initialize the fifos lock */
- vlc_mutex_init( &p_aout->fifos_lock );
+ vlc_mutex_init( p_aout, &p_aout->fifos_lock );
+
/* Initialize audio fifos : set all fifos as empty and initialize locks */
- for ( i_fifo = 0; i_fifo < AOUT_MAX_FIFOS; i_fifo++ )
+ for ( i_index = 0; i_index < AOUT_MAX_FIFOS; i_index++ )
{
- p_aout->fifo[i_fifo].i_type = AOUT_EMPTY_FIFO;
- vlc_mutex_init( &p_aout->fifo[i_fifo].data_lock );
- vlc_cond_init( &p_aout->fifo[i_fifo].data_wait );
+ p_aout->fifo[i_index].i_format = AOUT_FIFO_NONE;
+ vlc_mutex_init( p_aout, &p_aout->fifo[i_index].data_lock );
+ vlc_cond_init( p_aout, &p_aout->fifo[i_index].data_wait );
}
/* 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->l_rate * AOUT_BUFFER_DURATION) / 1000000 );
- p_aout->l_msleep = (long)( ((s64)p_aout->l_units * 1000000) / (s64)p_aout->l_rate );
+ p_aout->i_units = (s64)p_aout->i_rate * AOUT_BUFFER_DURATION / 1000000;
- /* Make aout_thread point to the right thread function, and compute the
+ /* Make pf_aout_thread point to the right thread function, and compute the
* byte size of the audio output buffer */
- switch ( p_aout->i_channels )
+ switch ( p_aout->i_format )
{
- /* 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;
+ pf_aout_thread = aout_PCMThread;
+ psz_format = "unsigned 8 bits";
+ i_bytes = p_aout->i_units * p_aout->i_channels;
break;
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;
+ pf_aout_thread = aout_PCMThread;
+ psz_format = "signed 8 bits";
+ i_bytes = p_aout->i_units * p_aout->i_channels;
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;
+ pf_aout_thread = aout_PCMThread;
+ psz_format = "unsigned 16 bits";
+ i_bytes = 2 * p_aout->i_units * p_aout->i_channels;
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)",
- 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;
+ pf_aout_thread = aout_PCMThread;
+ psz_format = "signed 16 bits";
+ i_bytes = 2 * p_aout->i_units * p_aout->i_channels;
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;
+ case AOUT_FMT_A52:
+ pf_aout_thread = aout_SpdifThread;
+ psz_format = "A52 pass-through";
+ i_bytes = SPDIF_FRAME_SIZE;
break;
default:
- intf_ErrMsg( "aout error: unknown audio output format %i",
- p_aout->i_format );
+ msg_Err( p_aout, "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 */
- p_aout->buffer = malloc( l_bytes );
+ p_aout->buffer = malloc( i_bytes );
if ( p_aout->buffer == NULL )
{
- intf_ErrMsg( "aout error: cannot create output buffer" );
+ msg_Err( p_aout, "out of memory" );
return( -1 );
}
- p_aout->s32_buffer = (s32 *)calloc( p_aout->l_units,
- sizeof(s32) << ( p_aout->b_stereo ) );
+ p_aout->s32_buffer = (s32 *)calloc( p_aout->i_units,
+ sizeof(s32) * p_aout->i_channels );
if ( p_aout->s32_buffer == NULL )
{
- intf_ErrMsg( "aout error: cannot create the s32 output buffer" );
+ msg_Err( p_aout, "out of memory" );
free( p_aout->buffer );
return( -1 );
}
/* Rough estimate of the playing date */
- p_aout->date = mdate();
+ p_aout->date = mdate() + p_aout->p_vlc->i_desync;
/* 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, "audio output", pf_aout_thread, 0 ) )
{
- intf_ErrMsg( "aout error: cannot spawn audio output thread" );
+ msg_Err( p_aout, "cannot spawn audio output thread" );
free( p_aout->buffer );
free( p_aout->s32_buffer );
return( -1 );
}
- intf_WarnMsg( 2, "aout info: audio output thread %i spawned", getpid() );
+ msg_Dbg( p_aout, "%s thread spawned, %i channels, rate %i",
+ psz_format, p_aout->i_channels, p_aout->i_rate );
return( 0 );
}
/*****************************************************************************
* aout_DestroyThread
*****************************************************************************/
-void aout_DestroyThread( aout_thread_t * p_aout, int *pi_status )
+void aout_DestroyThread( aout_thread_t * p_aout )
{
-
- int i_fifo;
+ int i_index;
- /* 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 );
/* Free the allocated memory */
free( p_aout->buffer );
free( p_aout->s32_buffer );
/* Destroy the condition and mutex locks */
- for ( i_fifo = 0; i_fifo < AOUT_MAX_FIFOS; i_fifo++ )
+ for ( i_index = 0; i_index < AOUT_MAX_FIFOS; i_index++ )
{
- 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->fifo[i_index].data_lock );
+ vlc_cond_destroy( &p_aout->fifo[i_index].data_wait );
}
vlc_mutex_destroy( &p_aout->fifos_lock );
- /* Free the plugin */
- p_aout->pf_close( p_aout );
-
/* Release the aout module */
- module_Unneed( p_main->p_bank, p_aout->p_module );
+ module_Unneed( p_aout, p_aout->p_module );
/* Free structure */
- free( p_aout );
+ vlc_object_destroy( p_aout );
}
projects / vlc / blobdiff