/*****************************************************************************
* 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:
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <unistd.h>
+#include "defs.h"
+
+#include <unistd.h> /* getpid() */
#include <stdio.h> /* "intf_msg.h" */
#include <stdlib.h> /* calloc(), malloc(), free() */
-#include <dlfcn.h> /* plugins */
-
-#include "common.h"
#include "config.h"
+#include "common.h"
+#include "threads.h"
#include "mtime.h" /* mtime_t, mdate(), msleep() */
-#include "vlc_thread.h"
+#include "plugins.h"
#include "intf_msg.h" /* intf_DbgMsg(), intf_ErrMsg() */
{
aout_thread_t * p_aout; /* thread descriptor */
char * psz_method;
- char * psz_plugin;
#if 0
int i_status; /* thread status */
#endif
return( NULL );
}
- /* Initialize method-dependent functions */
+ /* Request an interface plugin */
psz_method = main_GetPszVariable( AOUT_METHOD_VAR, AOUT_DEFAULT_METHOD );
-
- psz_plugin = malloc( sizeof("./audio_output/aout_.so") + strlen(psz_method) );
- sprintf( psz_plugin, "./audio_output/aout_%s.so", psz_method );
-
- p_aout->p_aout_plugin = dlopen( psz_plugin, RTLD_NOW | RTLD_GLOBAL );
-
- if( p_aout->p_aout_plugin == NULL )
+
+ if( RequestPlugin( &p_aout->aout_plugin, psz_method ) )
{
- intf_ErrMsg( "error: could not open audio plugin %s\n", psz_plugin );
- free( psz_plugin );
+ intf_ErrMsg( "error: could not open audio plugin %s.so\n", psz_method );
free( p_aout );
return( NULL );
}
- free( psz_plugin );
/* Get plugins */
- p_aout->p_sys_open = dlsym(p_aout->p_aout_plugin, "aout_SysOpen");
- p_aout->p_sys_reset = dlsym(p_aout->p_aout_plugin, "aout_SysReset");
- p_aout->p_sys_setformat = dlsym(p_aout->p_aout_plugin, "aout_SysSetFormat");
- p_aout->p_sys_setchannels = dlsym(p_aout->p_aout_plugin, "aout_SysSetChannels");
- p_aout->p_sys_setrate = dlsym(p_aout->p_aout_plugin, "aout_SysSetRate");
- p_aout->p_sys_getbufinfo = dlsym(p_aout->p_aout_plugin, "aout_SysGetBufInfo");
- p_aout->p_sys_playsamples = dlsym(p_aout->p_aout_plugin, "aout_SysPlaySamples");
- p_aout->p_sys_close = dlsym(p_aout->p_aout_plugin, "aout_SysClose");
+ 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 ( p_aout->p_sys_open( p_aout ) )
{
- dlclose( p_aout->p_aout_plugin );
+ TrashPlugin( p_aout->aout_plugin );
free( p_aout );
return( NULL );
}
if ( p_aout->p_sys_reset( p_aout ) )
{
p_aout->p_sys_close( p_aout );
- dlclose( p_aout->p_aout_plugin );
+ TrashPlugin( p_aout->aout_plugin );
free( p_aout );
return( NULL );
}
if ( p_aout->p_sys_setformat( p_aout ) )
{
p_aout->p_sys_close( p_aout );
- dlclose( p_aout->p_aout_plugin );
+ TrashPlugin( p_aout->aout_plugin );
free( p_aout );
return( NULL );
}
if ( p_aout->p_sys_setchannels( p_aout ) )
{
p_aout->p_sys_close( p_aout );
- dlclose( p_aout->p_aout_plugin );
+ TrashPlugin( p_aout->aout_plugin );
free( p_aout );
return( NULL );
}
if ( p_aout->p_sys_setrate( p_aout ) )
{
p_aout->p_sys_close( p_aout );
- dlclose( p_aout->p_aout_plugin );
+ TrashPlugin( p_aout->aout_plugin );
free( p_aout );
return( NULL );
}
+ /* 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 ) )
{
p_aout->p_sys_close( p_aout );
- dlclose( p_aout->p_aout_plugin );
+ TrashPlugin( p_aout->aout_plugin );
free( p_aout );
return( NULL );
}
/* 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 );
intf_DbgMsg("aout debug: audio device (%s) closed\n", p_aout->psz_device);
/* Close plugin */
- dlclose( p_aout->p_aout_plugin );
+ TrashPlugin( p_aout->aout_plugin );
/* Free structure */
free( p_aout );
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 );
+// 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->l_rate );
void aout_Thread_U8_Mono( 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_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
+ * 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;
+ }
+ }
+#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->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)[COEFF*p_aout->fifo[i_fifo].l_unit] );
+ p_aout->s32_buffer[l_buffer++] +=
+ (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 >> 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 >> 2/*1*/));
+ }
+ }
+ p_aout->fifo[i_fifo].l_units -= l_units;
+ break;
+ }
+ else
+ {
+//#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)[COEFF*p_aout->fifo[i_fifo].l_unit] );
+ p_aout->s32_buffer[l_buffer++] +=
+ (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 >> 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 >> 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 );
+//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++ )
+ {
+//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 ");
+ }
+ 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_U8_Stereo( aout_thread_t * p_aout )
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 );
+ ((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 );
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 );
+ ((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 = -1000000 + mdate() + ((((mtime_t)(l_bytes / 4)) * 1000000) / ((mtime_t)p_aout->l_rate)); /* sizeof(s16) << (p_aout->b_stereo) == 4 */
+ 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)) )
{
projects / vlc / blobdiff