X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_output%2Fportaudio.c;h=6256e7532507b15891b07e2743945732d366e947;hb=c46360714d1a1b8eccb765a19a73700f20e68eb6;hp=b96e69843b58fde8900fff667092b7db996a0629;hpb=9a89727415147bf6533c4bad52f27679b0f0f97d;p=vlc diff --git a/modules/audio_output/portaudio.c b/modules/audio_output/portaudio.c index b96e69843b..6256e75325 100644 --- a/modules/audio_output/portaudio.c +++ b/modules/audio_output/portaudio.c @@ -1,7 +1,7 @@ /***************************************************************************** * portaudio.c : portaudio (v19) audio output plugin ***************************************************************************** - * Copyright (C) 2002 VideoLAN + * Copyright (C) 2002, 2006 the VideoLAN team * $Id$ * * Authors: Frederic Ruget @@ -11,7 +11,7 @@ * 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 @@ -19,20 +19,23 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include "aout_internal.h" +#include +#include +#include + + +#include #define FRAME_SIZE 1024 /* The size is in samples, not in bytes */ @@ -50,10 +53,10 @@ typedef struct pa_thread_t vlc_cond_t wait; vlc_mutex_t lock_wait; - vlc_bool_t b_wait; + bool b_wait; vlc_cond_t signal; vlc_mutex_t lock_signal; - vlc_bool_t b_signal; + bool b_signal; } pa_thread_t; @@ -66,12 +69,24 @@ struct aout_sys_t int i_sample_size; PaDeviceIndex i_device_id; const PaDeviceInfo *deviceInfo; + + bool b_chan_reorder; /* do we need channel reordering */ + int pi_chan_table[AOUT_CHAN_MAX]; + uint32_t i_channel_mask; + uint32_t i_bits_per_sample; + uint32_t i_channels; }; +static const uint32_t pi_channels_out[] = + { AOUT_CHAN_LEFT, AOUT_CHAN_RIGHT, + AOUT_CHAN_CENTER, AOUT_CHAN_LFE, + AOUT_CHAN_REARLEFT, AOUT_CHAN_REARRIGHT, AOUT_CHAN_REARCENTER, + AOUT_CHAN_MIDDLELEFT, AOUT_CHAN_MIDDLERIGHT, 0 }; + #ifdef PORTAUDIO_IS_SERIOUSLY_BROKEN -static vlc_bool_t b_init = 0; +static bool b_init = 0; static pa_thread_t *pa_thread; -static void PORTAUDIOThread( pa_thread_t * ); +static void* PORTAUDIOThread( vlc_object_t * ); #endif /***************************************************************************** @@ -91,9 +106,13 @@ static int PAOpenStream( aout_instance_t * ); #define DEVICE_LONGTEXT N_("Portaudio identifier for the output device") vlc_module_begin(); + set_shortname( "PortAudio" ); set_description( N_("PORTAUDIO audio output") ); - add_integer( "portaudio-device", 0, NULL, - DEVICE_TEXT, DEVICE_LONGTEXT, VLC_FALSE ); + set_category( CAT_AUDIO ); + set_subcategory( SUBCAT_AUDIO_AOUT ); + add_integer( "portaudio-audio-device", 0, NULL, + DEVICE_TEXT, DEVICE_LONGTEXT, false ); + add_deprecated_alias( "portaudio-device" ); /* deprecated since 0.9.3 */ set_capability( "audio output", 0 ); set_callbacks( Open, Close ); vlc_module_end(); @@ -114,12 +133,19 @@ static int paCallback( const void *inputBuffer, void *outputBuffer, out_date = mdate() + (mtime_t) ( 1000000 * ( paDate->outputBufferDacTime - paDate->currentTime ) ); - p_buffer = aout_OutputNextBuffer( p_aout, out_date, VLC_TRUE ); + p_buffer = aout_OutputNextBuffer( p_aout, out_date, true ); if ( p_buffer != NULL ) { - p_aout->p_vlc->pf_memcpy( outputBuffer, p_buffer->p_buffer, - framesPerBuffer * p_sys->i_sample_size ); + if( p_sys->b_chan_reorder ) + { + /* Do the channel reordering here */ + aout_ChannelReorder( p_buffer->p_buffer, p_buffer->i_nb_bytes, + p_sys->i_channels, p_sys->pi_chan_table, + p_sys->i_bits_per_sample ); + } + vlc_memcpy( outputBuffer, p_buffer->p_buffer, + framesPerBuffer * p_sys->i_sample_size ); /* aout_BufferFree may be dangereous here, but then so is * aout_OutputNextBuffer (calls aout_BufferFree internally). * one solution would be to link the no longer useful buffers @@ -131,8 +157,7 @@ static int paCallback( const void *inputBuffer, void *outputBuffer, else /* Audio output buffer shortage -> stop the fill process and wait */ { - p_aout->p_vlc->pf_memset( outputBuffer, 0, - framesPerBuffer * p_sys->i_sample_size ); + vlc_memset( outputBuffer, 0, framesPerBuffer * p_sys->i_sample_size ); } return 0; } @@ -147,23 +172,20 @@ static int Open( vlc_object_t * p_this ) vlc_value_t val; int i_err; - msg_Dbg( p_aout, "Entering Open()"); + msg_Dbg( p_aout, "entering Open()"); /* Allocate p_sys structure */ p_sys = (aout_sys_t *)malloc( sizeof(aout_sys_t) ); if( p_sys == NULL ) - { - msg_Err( p_aout, "out of memory" ); return VLC_ENOMEM; - } p_sys->p_aout = p_aout; p_sys->p_stream = 0; p_aout->output.p_sys = p_sys; p_aout->output.pf_play = Play; /* Retrieve output device id from config */ - var_Create( p_aout, "portaudio-device", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT); - var_Get( p_aout, "portaudio-device", &val ); + var_Create( p_aout, "portaudio-audio-device", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT); + var_Get( p_aout, "portaudio-audio-device", &val ); p_sys->i_device_id = val.i_int; #ifdef PORTAUDIO_IS_SERIOUSLY_BROKEN @@ -180,25 +202,25 @@ static int Open( vlc_object_t * p_this ) /* Close device for now. We'll re-open it later on */ if( ( i_err = Pa_Terminate() ) != paNoError ) { - msg_Err( p_aout, "Pa_Terminate returned %d", i_err ); + msg_Err( p_aout, "closing the device returned %d", i_err ); } - b_init = VLC_TRUE; + b_init = true; /* Now we need to setup our DirectSound play notification structure */ pa_thread = vlc_object_create( p_aout, sizeof(pa_thread_t) ); pa_thread->p_aout = p_aout; - pa_thread->b_error = VLC_FALSE; - vlc_mutex_init( p_aout, &pa_thread->lock_wait ); - vlc_cond_init( p_aout, &pa_thread->wait ); - pa_thread->b_wait = VLC_FALSE; - vlc_mutex_init( p_aout, &pa_thread->lock_signal ); - vlc_cond_init( p_aout, &pa_thread->signal ); - pa_thread->b_signal = VLC_FALSE; + pa_thread->b_error = false; + vlc_mutex_init( &pa_thread->lock_wait ); + vlc_cond_init( &pa_thread->wait ); + pa_thread->b_wait = false; + vlc_mutex_init( &pa_thread->lock_signal ); + vlc_cond_init( &pa_thread->signal ); + pa_thread->b_signal = false; /* Create PORTAUDIOThread */ if( vlc_thread_create( pa_thread, "aout", PORTAUDIOThread, - VLC_THREAD_PRIORITY_OUTPUT, VLC_FALSE ) ) + VLC_THREAD_PRIORITY_OUTPUT, false ) ) { msg_Err( p_aout, "cannot create PORTAUDIO thread" ); return VLC_EGENERIC; @@ -207,14 +229,14 @@ static int Open( vlc_object_t * p_this ) else { pa_thread->p_aout = p_aout; - pa_thread->b_wait = VLC_FALSE; - pa_thread->b_signal = VLC_FALSE; - pa_thread->b_error = VLC_FALSE; + pa_thread->b_wait = false; + pa_thread->b_signal = false; + pa_thread->b_error = false; } /* Signal start of stream */ vlc_mutex_lock( &pa_thread->lock_signal ); - pa_thread->b_signal = VLC_TRUE; + pa_thread->b_signal = true; vlc_cond_signal( &pa_thread->signal ); vlc_mutex_unlock( &pa_thread->lock_signal ); @@ -223,7 +245,7 @@ static int Open( vlc_object_t * p_this ) if( !pa_thread->b_wait ) vlc_cond_wait( &pa_thread->wait, &pa_thread->lock_wait ); vlc_mutex_unlock( &pa_thread->lock_wait ); - pa_thread->b_wait = VLC_FALSE; + pa_thread->b_wait = false; if( pa_thread->b_error ) { @@ -268,7 +290,7 @@ static void Close ( vlc_object_t *p_this ) /* Signal end of stream */ vlc_mutex_lock( &pa_thread->lock_signal ); - pa_thread->b_signal = VLC_TRUE; + pa_thread->b_signal = true; vlc_cond_signal( &pa_thread->signal ); vlc_mutex_unlock( &pa_thread->lock_signal ); @@ -277,7 +299,7 @@ static void Close ( vlc_object_t *p_this ) if( !pa_thread->b_wait ) vlc_cond_wait( &pa_thread->wait, &pa_thread->lock_wait ); vlc_mutex_unlock( &pa_thread->lock_wait ); - pa_thread->b_wait = VLC_FALSE; + pa_thread->b_wait = false; #else @@ -405,7 +427,7 @@ static int PAOpenDevice( aout_instance_t *p_aout ) if( p_sys->deviceInfo->maxOutputChannels >= 6 ) { val.i_int = AOUT_VAR_5_1; - text.psz_string = N_("5.1"); + text.psz_string = "5.1"; var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val, &text ); msg_Dbg( p_aout, "device supports 5.1 channels" ); @@ -413,7 +435,7 @@ static int PAOpenDevice( aout_instance_t *p_aout ) var_AddCallback( p_aout, "audio-device", aout_ChannelsRestart, NULL ); - val.b_bool = VLC_TRUE; + val.b_bool = true; var_Set( p_aout, "intf-change", val ); } @@ -437,6 +459,7 @@ static int PAOpenStream( aout_instance_t *p_aout ) PaStreamParameters paStreamParameters; vlc_value_t val; int i_channels, i_err; + uint32_t i_channel_mask; if( var_Get( p_aout, "audio-device", &val ) < 0 ) { @@ -474,6 +497,7 @@ static int PAOpenStream( aout_instance_t *p_aout ) i_channels = aout_FormatNbChannels( &p_aout->output.output ); msg_Dbg( p_aout, "nb_channels requested = %d", i_channels ); + i_channel_mask = p_aout->output.output.i_physical_channels; /* Calculate the frame size in bytes */ p_sys->i_sample_size = 4 * i_channels; @@ -481,6 +505,21 @@ static int PAOpenStream( aout_instance_t *p_aout ) aout_FormatPrepare( &p_aout->output.output ); aout_VolumeSoftInit( p_aout ); + /* Check for channel reordering */ + p_aout->output.p_sys->i_channel_mask = i_channel_mask; + p_aout->output.p_sys->i_bits_per_sample = 32; /* forced to paFloat32 */ + p_aout->output.p_sys->i_channels = i_channels; + + p_aout->output.p_sys->b_chan_reorder = + aout_CheckChannelReorder( NULL, pi_channels_out, + i_channel_mask, i_channels, + p_aout->output.p_sys->pi_chan_table ); + + if( p_aout->output.p_sys->b_chan_reorder ) + { + msg_Dbg( p_aout, "channel reordering needed" ); + } + paStreamParameters.device = p_sys->i_device_id; paStreamParameters.channelCount = i_channels; paStreamParameters.sampleFormat = paFloat32; @@ -529,20 +568,22 @@ static void Play( aout_instance_t * p_aout ) * PORTAUDIOThread: all interactions with libportaudio.a are handled * in this single thread. Otherwise libportaudio.a is _not_ happy :-( *****************************************************************************/ -static void PORTAUDIOThread( pa_thread_t *pa_thread ) +static void* PORTAUDIOThread( vlc_object_t *p_this ) { + pa_thread_t *pa_thread = (pa_thread_t*)p_this; aout_instance_t *p_aout; aout_sys_t *p_sys; int i_err; + int canc = vlc_savecancel (); - while( !pa_thread->b_die ) + while( vlc_object_alive (pa_thread) ) { /* Wait for start of stream */ vlc_mutex_lock( &pa_thread->lock_signal ); if( !pa_thread->b_signal ) vlc_cond_wait( &pa_thread->signal, &pa_thread->lock_signal ); vlc_mutex_unlock( &pa_thread->lock_signal ); - pa_thread->b_signal = VLC_FALSE; + pa_thread->b_signal = false; p_aout = pa_thread->p_aout; p_sys = p_aout->output.p_sys; @@ -550,13 +591,13 @@ static void PORTAUDIOThread( pa_thread_t *pa_thread ) if( PAOpenDevice( p_aout ) != VLC_SUCCESS ) { msg_Err( p_aout, "cannot open portaudio device" ); - pa_thread->b_error = VLC_TRUE; + pa_thread->b_error = true; } if( !pa_thread->b_error && PAOpenStream( p_aout ) != VLC_SUCCESS ) { msg_Err( p_aout, "cannot open portaudio device" ); - pa_thread->b_error = VLC_TRUE; + pa_thread->b_error = true; i_err = Pa_Terminate(); if( i_err != paNoError ) @@ -568,7 +609,7 @@ static void PORTAUDIOThread( pa_thread_t *pa_thread ) /* Tell the main thread that we are ready */ vlc_mutex_lock( &pa_thread->lock_wait ); - pa_thread->b_wait = VLC_TRUE; + pa_thread->b_wait = true; vlc_cond_signal( &pa_thread->wait ); vlc_mutex_unlock( &pa_thread->lock_wait ); @@ -577,7 +618,7 @@ static void PORTAUDIOThread( pa_thread_t *pa_thread ) if( !pa_thread->b_signal ) vlc_cond_wait( &pa_thread->signal, &pa_thread->lock_signal ); vlc_mutex_unlock( &pa_thread->lock_signal ); - pa_thread->b_signal = VLC_FALSE; + pa_thread->b_signal = false; if( pa_thread->b_error ) continue; @@ -602,9 +643,11 @@ static void PORTAUDIOThread( pa_thread_t *pa_thread ) /* Tell the main thread that we are ready */ vlc_mutex_lock( &pa_thread->lock_wait ); - pa_thread->b_wait = VLC_TRUE; + pa_thread->b_wait = true; vlc_cond_signal( &pa_thread->wait ); vlc_mutex_unlock( &pa_thread->lock_wait ); } + vlc_restorecancel (canc); + return NULL; } #endif