/*****************************************************************************
* 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-1307, USA.
*****************************************************************************/
/* TODO:
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <unistd.h>
+#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 "threads.h"
+#include "plugins.h"
#include "intf_msg.h" /* intf_DbgMsg(), intf_ErrMsg() */
#include "audio_output.h"
-#include "audio_sys.h"
#include "main.h"
/*****************************************************************************
{
aout_thread_t * p_aout; /* thread descriptor */
char * psz_method;
-// int i_status; /* thread status */
+#if 0
+ int i_status; /* thread status */
+#endif
/* Allocate descriptor */
p_aout = (aout_thread_t *) malloc( sizeof(aout_thread_t) );
return( NULL );
}
- /* initialize method-dependent functions */
+ /* Request an interface plugin */
psz_method = main_GetPszVariable( AOUT_METHOD_VAR, AOUT_DEFAULT_METHOD );
+ p_aout->p_aout_plugin = RequestPlugin( "aout", psz_method );
- if( !strcmp(psz_method, "dummy") )
- {
- p_aout->p_sys_open = aout_DummySysOpen;
- p_aout->p_sys_reset = aout_DummySysReset;
- p_aout->p_sys_setformat = aout_DummySysSetFormat;
- p_aout->p_sys_setchannels = aout_DummySysSetChannels;
- p_aout->p_sys_setrate = aout_DummySysSetRate;
- p_aout->p_sys_getbufinfo = aout_DummySysGetBufInfo;
- p_aout->p_sys_playsamples = aout_DummySysPlaySamples;
- p_aout->p_sys_close = aout_DummySysClose;
- }
-#ifdef AUDIO_DSP
- else if( !strcmp(psz_method, "dsp") )
+ if( !p_aout->p_aout_plugin )
{
- p_aout->p_sys_open = aout_DspSysOpen;
- p_aout->p_sys_reset = aout_DspSysReset;
- p_aout->p_sys_setformat = aout_DspSysSetFormat;
- p_aout->p_sys_setchannels = aout_DspSysSetChannels;
- p_aout->p_sys_setrate = aout_DspSysSetRate;
- p_aout->p_sys_getbufinfo = aout_DspSysGetBufInfo;
- p_aout->p_sys_playsamples = aout_DspSysPlaySamples;
- p_aout->p_sys_close = aout_DspSysClose;
- }
-#endif
- else
- {
- intf_ErrMsg( "error: requested audio output method not available\n" );
+ intf_ErrMsg( "error: could not open audio plugin aout_%s.so\n", psz_method );
free( p_aout );
return( NULL );
}
-
+
+ /* Get plugins */
+ p_aout->p_sys_open = GetPluginFunction( p_aout->p_aout_plugin, "aout_SysOpen" );
+ p_aout->p_sys_reset = GetPluginFunction( p_aout->p_aout_plugin, "aout_SysReset" );
+ p_aout->p_sys_setformat = GetPluginFunction( p_aout->p_aout_plugin, "aout_SysSetFormat" );
+ p_aout->p_sys_setchannels = GetPluginFunction( p_aout->p_aout_plugin, "aout_SysSetChannels" );
+ p_aout->p_sys_setrate = GetPluginFunction( p_aout->p_aout_plugin, "aout_SysSetRate" );
+ p_aout->p_sys_getbufinfo = GetPluginFunction( p_aout->p_aout_plugin, "aout_SysGetBufInfo" );
+ p_aout->p_sys_playsamples = GetPluginFunction( p_aout->p_aout_plugin, "aout_SysPlaySamples" );
+ p_aout->p_sys_close = GetPluginFunction( p_aout->p_aout_plugin, "aout_SysClose" );
+
/*
* Initialize audio device
*/
if ( p_aout->p_sys_open( p_aout ) )
{
+ TrashPlugin( p_aout->p_aout_plugin );
free( p_aout );
return( NULL );
}
- p_aout->b_stereo = ( p_aout->i_channels == 2 ) ? 1 : 0; /* XXX only works
- for i_channels == 1 or 2 */
-
+ 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 ) )
{
- p_aout->p_sys_close( p_aout );
- free( p_aout );
- return( NULL );
+ p_aout->p_sys_close( p_aout );
+ TrashPlugin( p_aout->p_aout_plugin );
+ free( p_aout );
+ return( NULL );
}
if ( p_aout->p_sys_setformat( p_aout ) )
{
- p_aout->p_sys_close( p_aout );
- free( p_aout );
- return( NULL );
+ p_aout->p_sys_close( p_aout );
+ TrashPlugin( p_aout->p_aout_plugin );
+ free( p_aout );
+ return( NULL );
}
if ( p_aout->p_sys_setchannels( p_aout ) )
{
- p_aout->p_sys_close( p_aout );
- free( p_aout );
+ p_aout->p_sys_close( p_aout );
+ TrashPlugin( p_aout->p_aout_plugin );
+ free( p_aout );
return( NULL );
}
if ( p_aout->p_sys_setrate( p_aout ) )
{
- p_aout->p_sys_close( p_aout );
- free( p_aout );
- return( NULL );
+ p_aout->p_sys_close( p_aout );
+ TrashPlugin( p_aout->p_aout_plugin );
+ free( p_aout );
+ return( NULL );
}
- //?? 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
+ /* 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->p_sys_close( p_aout );
- free( p_aout );
- return( NULL );
+ p_aout->p_sys_close( p_aout );
+ TrashPlugin( p_aout->p_aout_plugin );
+ free( p_aout );
+ return( NULL );
}
return( p_aout );
break;
default:
- intf_ErrMsg("aout error: unknown audio output format (%i)\n",
- p_aout->i_format);
- return( -1 );
+ intf_ErrMsg( "aout error: unknown audio output format (%i)\n",
+ p_aout->i_format );
+ return( -1 );
}
break;
/* 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 ) )
*****************************************************************************/
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 the structure */
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->p_aout_plugin );
+
+ /* Free structure */
free( p_aout );
}
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].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].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].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].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 )
{
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));
+ 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;
}
/* We are looking for the next dated frame */
- /* FIXME : is the output fifo full ? */
+ /* FIXME : is the output fifo full ?? */
while ( !p_fifo->b_next_frame )
{
while ( p_fifo->l_next_frame != p_fifo->l_end_frame )
{
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:
+ {
+ case AOUT_EMPTY_FIFO:
break;
- case AOUT_INTF_MONO_FIFO:
+ 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++] +=
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++] +=
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++] +=
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++] +=
}
break;
- default:
+ default:
intf_DbgMsg("aout debug: unknown fifo type (%i)\n", p_aout->fifo[i_fifo].i_type);
break;
}
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 );
p_aout->s32_buffer[l_buffer] = 0;
}
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());
+ 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 */
{
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:
+ {
+ case AOUT_EMPTY_FIFO:
break;
- case AOUT_INTF_MONO_FIFO:
+ 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++] +=
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++] +=
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++] +=
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++] +=
}
break;
- default:
+ default:
intf_DbgMsg("aout debug: unknown fifo type (%i)\n", p_aout->fifo[i_fifo].i_type);
break;
}
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 );
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->date = -1000000 + 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)) )
{