/*****************************************************************************
- * portaudio.c : portaudio audio output plugin
+ * portaudio.c : portaudio (v19) audio output plugin
*****************************************************************************
- * Copyright (C) 2002 VideoLAN
+ * Copyright (C) 2002, 2006 the VideoLAN team
* $Id$
*
* Authors: Frederic Ruget <frederic.ruget@free.fr>
+ * Gildas Bazin <gbazin@videolan.org>
*
* 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
*
* 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 <string.h>
-#include <stdlib.h>
-#include <vlc/vlc.h>
-#include <vlc/aout.h>
-#include <portaudio.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-#include "aout_internal.h"
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_aout.h>
+
+
+#include <portaudio.h>
#define FRAME_SIZE 1024 /* The size is in samples, not in bytes */
-#define FRAMES_NUM 8
+
+#ifdef WIN32
+# define PORTAUDIO_IS_SERIOUSLY_BROKEN 1
+#endif
/*****************************************************************************
* aout_sys_t: portaudio audio output method descriptor
*****************************************************************************/
+typedef struct pa_thread_t
+{
+ VLC_COMMON_MEMBERS
+ aout_instance_t *p_aout;
+
+ vlc_cond_t wait;
+ vlc_mutex_t lock_wait;
+ bool b_wait;
+ vlc_cond_t signal;
+ vlc_mutex_t lock_signal;
+ bool b_signal;
+ bool b_error;
+
+} pa_thread_t;
+
struct aout_sys_t
{
aout_instance_t *p_aout;
- PortAudioStream *p_stream;
- int i_numDevices;
- int i_nbChannels;
- PaSampleFormat sampleFormat;
- int i_sampleSize;
- PaDeviceID i_deviceId;
- PaDeviceInfo deviceInfo;
+ PaStream *p_stream;
+
+ PaDeviceIndex i_devices;
+ 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 bool b_init = 0;
+static pa_thread_t *pa_thread;
+static void* PORTAUDIOThread( vlc_object_t * );
+#endif
+
/*****************************************************************************
* Local prototypes.
*****************************************************************************/
static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
static void Play ( aout_instance_t * );
-static int i_once = 0;
+
+static int PAOpenDevice( aout_instance_t * );
+static int PAOpenStream( aout_instance_t * );
/*****************************************************************************
* Module descriptor
#define DEVICE_TEXT N_("Output device")
#define DEVICE_LONGTEXT N_("Portaudio identifier for the output device")
-vlc_module_begin();
- set_description( N_("PORTAUDIO audio output") );
- add_integer( "portaudio-device", 0, NULL,
- DEVICE_TEXT, DEVICE_LONGTEXT, VLC_FALSE );
- set_capability( "audio output", 40 );
- set_callbacks( Open, Close );
-vlc_module_end();
+vlc_module_begin ()
+ set_shortname( "PortAudio" )
+ set_description( N_("PORTAUDIO audio output") )
+ 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 ()
/* This routine will be called by the PortAudio engine when audio is needed.
-** It may called at interrupt level on some machines so don't do anything
-** that could mess up the system like calling malloc() or free().
-*/
-static int paCallback( void *inputBuffer, void *outputBuffer,
+ * It may called at interrupt level on some machines so don't do anything
+ * that could mess up the system like calling malloc() or free().
+ */
+static int paCallback( const void *inputBuffer, void *outputBuffer,
unsigned long framesPerBuffer,
- PaTimestamp outTime, void *p_cookie )
+ const PaStreamCallbackTimeInfo *paDate,
+ PaStreamCallbackFlags statusFlags, void *p_cookie )
{
- struct aout_sys_t* p_sys = (struct aout_sys_t*) p_cookie;
- aout_instance_t * p_aout = p_sys->p_aout;
- aout_buffer_t * p_buffer;
+ VLC_UNUSED( inputBuffer ); VLC_UNUSED( statusFlags );
- vlc_mutex_lock( &p_aout->output_fifo_lock );
- p_buffer = aout_FifoPop( p_aout, &p_aout->output.fifo );
- vlc_mutex_unlock( &p_aout->output_fifo_lock );
+ struct aout_sys_t *p_sys = (struct aout_sys_t*) p_cookie;
+ aout_instance_t *p_aout = p_sys->p_aout;
+ aout_buffer_t *p_buffer;
+ mtime_t out_date;
+
+ out_date = mdate() + (mtime_t) ( 1000000 *
+ ( paDate->outputBufferDacTime - paDate->currentTime ) );
+ 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_sampleSize );
+ if( p_sys->b_chan_reorder )
+ {
+ /* Do the channel reordering here */
+ aout_ChannelReorder( p_buffer->p_buffer, p_buffer->i_buffer,
+ 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
+ * in a second fifo (in aout_OutputNextBuffer too) and to
+ * wait until we are in Play to do the actual free.
+ */
aout_BufferFree( p_buffer );
}
else
+ /* Audio output buffer shortage -> stop the fill process and wait */
{
- p_aout->p_vlc->pf_memset( outputBuffer, 0,
- framesPerBuffer * p_sys->i_sampleSize );
+ vlc_memset( outputBuffer, 0, framesPerBuffer * p_sys->i_sample_size );
}
return 0;
}
/*****************************************************************************
* Open: open the audio device
*****************************************************************************/
-static int Open ( vlc_object_t * p_this )
+static int Open( vlc_object_t * p_this )
{
aout_instance_t *p_aout = (aout_instance_t *)p_this;
struct aout_sys_t * p_sys;
- PortAudioStream *p_stream;
- vlc_value_t val;
- PaError i_err;
- int i_nb_channels;
- const PaDeviceInfo *p_pdi;
- int i, j;
- msg_Dbg( p_aout, "Entering Open()");
+ msg_Dbg( p_aout, "entering Open()");
/* Allocate p_sys structure */
- p_sys = (struct aout_sys_t*) malloc( sizeof( aout_sys_t ) );
+ p_sys = 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;
- /* Output device id */
- var_Create( p_this, "portaudio-device",
- VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
- var_Get( p_this, "portaudio-device", &val );
- p_sys->i_deviceId = val.i_int;
+ /* Retrieve output device id from config */
+ p_sys->i_device_id = var_CreateGetInteger( p_aout, "portaudio-audio-device" );
- if (! i_once)
+#ifdef PORTAUDIO_IS_SERIOUSLY_BROKEN
+ if( !b_init )
{
- i_once = 1;
- i_err = Pa_Initialize();
- if ( i_err != paNoError )
+ int i_err;
+
+ /* Test device */
+ if( PAOpenDevice( p_aout ) != VLC_SUCCESS )
+ {
+ msg_Err( p_aout, "cannot open portaudio device" );
+ free( p_sys );
+ return VLC_EGENERIC;
+ }
+
+ /* Close device for now. We'll re-open it later on */
+ if( ( i_err = Pa_Terminate() ) != paNoError )
+ {
+ msg_Err( p_aout, "closing the device returned %d", i_err );
+ }
+
+ 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 = 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 ) )
{
- msg_Err( p_aout, "Pa_Initialize returned %d : %s", i_err, Pa_GetErrorText( i_err ));
+ msg_Err( p_aout, "cannot create PORTAUDIO thread" );
return VLC_EGENERIC;
}
}
- p_sys->i_numDevices = Pa_CountDevices();
- if( p_sys->i_numDevices < 0 )
+ else
+ {
+ pa_thread->p_aout = p_aout;
+ 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 = true;
+ vlc_cond_signal( &pa_thread->signal );
+ vlc_mutex_unlock( &pa_thread->lock_signal );
+
+ /* Wait until thread is ready */
+ vlc_mutex_lock( &pa_thread->lock_wait );
+ 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 = false;
+
+ if( pa_thread->b_error )
{
- i_err = p_sys->i_numDevices;
- msg_Err( p_aout, "Pa_CountDevices returned %d : %s", i_err, Pa_GetErrorText( i_err ));
- (void) Pa_Terminate();
+ msg_Err( p_aout, "PORTAUDIO thread failed" );
+ Close( p_this );
return VLC_EGENERIC;
}
- msg_Info( p_aout, "Number of devices = %d", p_sys->i_numDevices );
- if ( p_sys->i_deviceId >= p_sys->i_numDevices )
+
+ return VLC_SUCCESS;
+
+#else
+
+ if( PAOpenDevice( p_aout ) != VLC_SUCCESS )
{
- msg_Err( p_aout, "Device %d does not exist", p_sys->i_deviceId );
- (void) Pa_Terminate();
+ msg_Err( p_aout, "cannot open portaudio device" );
+ free( p_sys );
return VLC_EGENERIC;
}
- for( i = 0; i < p_sys->i_numDevices; i++ )
+
+ if( PAOpenStream( p_aout ) != VLC_SUCCESS )
{
- p_pdi = Pa_GetDeviceInfo( i );
- if ( i == p_sys->i_deviceId )
- {
- p_sys->deviceInfo = *p_pdi;
- }
- msg_Info( p_aout, "---------------------------------------------- #%d", i );
- msg_Info( p_aout, "Name = %s", p_pdi->name );
- msg_Info( p_aout, "Max Inputs = %d, Max Outputs = %d",
- p_pdi->maxInputChannels, p_pdi->maxOutputChannels );
- if( p_pdi->numSampleRates == -1 )
- {
- msg_Info( p_aout, "Sample Rate Range = %f to %f", p_pdi->sampleRates[0], p_pdi->sampleRates[1] );
- }
- else
- {
- msg_Info( p_aout, "Sample Rates =");
- for( j = 0; j < p_pdi->numSampleRates; j++ )
- {
- msg_Info( p_aout, " %8.2f,", p_pdi->sampleRates[j] );
- }
- }
- msg_Info( p_aout, "Native Sample Formats = ");
- if( p_pdi->nativeSampleFormats & paInt8 ) msg_Info( p_aout, "paInt8");
- if( p_pdi->nativeSampleFormats & paUInt8 ) msg_Info( p_aout, "paUInt8");
- if( p_pdi->nativeSampleFormats & paInt16 ) msg_Info( p_aout, "paInt16");
- if( p_pdi->nativeSampleFormats & paInt32 ) msg_Info( p_aout, "paInt32");
- if( p_pdi->nativeSampleFormats & paFloat32 ) msg_Info( p_aout, "paFloat32");
- if( p_pdi->nativeSampleFormats & paInt24 ) msg_Info( p_aout, "paInt24");
- if( p_pdi->nativeSampleFormats & paPackedInt24 ) msg_Info( p_aout, "paPackedInt24");
+ msg_Err( p_aout, "cannot open portaudio device" );
}
- msg_Info( p_aout, "----------------------------------------------");
-
-
- /*
-portaudio warning: Number of devices = 3
-portaudio warning: ---------------------------------------------- #0 DefaultInput DefaultOutput
-portaudio warning: Name = PORTAUDIO DirectX Full Duplex Driver
-portaudio warning: Max Inputs = 2, Max Outputs = 2
-portaudio warning: Sample Rates =
-portaudio warning: 11025.00,
-portaudio warning: 22050.00,
-portaudio warning: 32000.00,
-portaudio warning: 44100.00,
-portaudio warning: 48000.00,
-portaudio warning: 88200.00,
-portaudio warning: 96000.00,
-portaudio warning: Native Sample Formats =
-portaudio warning: paInt16
-portaudio warning: ---------------------------------------------- #1
-portaudio warning: Name = PORTAUDIO Multimedia Driver
-portaudio warning: Max Inputs = 2, Max Outputs = 2
-portaudio warning: Sample Rates =
-portaudio warning: 11025.00,
-portaudio warning: 22050.00,
-portaudio warning: 32000.00,
-portaudio warning: 44100.00,
-portaudio warning: 48000.00,
-portaudio warning: 88200.00,
-portaudio warning: 96000.00,
-portaudio warning: Native Sample Formats =
-portaudio warning: paInt16
-portaudio warning: ---------------------------------------------- #2
-portaudio warning: Name = E-MU PORTAUDIO
-portaudio warning: Max Inputs = 0, Max Outputs = 4
-portaudio warning: Sample Rates =
-portaudio warning: 44100.00,
-portaudio warning: 48000.00,
-portaudio warning: 96000.00,
-portaudio warning: Native Sample Formats =
-portaudio warning: paInt16
-portaudio warning: ----------------------------------------------
- */
+ return VLC_SUCCESS;
- p_aout->output.pf_play = Play;
- aout_VolumeSoftInit( p_aout );
+#endif
+}
- /* select audio format */
- if( p_sys->deviceInfo.nativeSampleFormats & paFloat32 )
+/*****************************************************************************
+ * Close: close the audio device
+ *****************************************************************************/
+static void Close ( vlc_object_t *p_this )
+{
+ aout_instance_t *p_aout = (aout_instance_t *)p_this;
+ aout_sys_t *p_sys = p_aout->output.p_sys;
+
+ msg_Dbg( p_aout, "closing portaudio");
+
+#ifdef PORTAUDIO_IS_SERIOUSLY_BROKEN
+
+ /* Signal end of stream */
+ vlc_mutex_lock( &pa_thread->lock_signal );
+ pa_thread->b_signal = true;
+ vlc_cond_signal( &pa_thread->signal );
+ vlc_mutex_unlock( &pa_thread->lock_signal );
+
+ /* Wait until thread is ready */
+ vlc_mutex_lock( &pa_thread->lock_wait );
+ 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 = false;
+
+#else
+
+ int i_err = Pa_StopStream( p_sys->p_stream );
+ if( i_err != paNoError )
{
- p_sys->sampleFormat = paFloat32;
- p_aout->output.output.i_format = VLC_FOURCC('f','l','3','2');
- p_sys->i_sampleSize = 4;
+ msg_Err( p_aout, "Pa_StopStream: %d (%s)", i_err,
+ Pa_GetErrorText( i_err ) );
}
- else if( p_sys->deviceInfo.nativeSampleFormats & paInt16 )
+ i_err = Pa_CloseStream( p_sys->p_stream );
+ if( i_err != paNoError )
{
- p_sys->sampleFormat = paInt16;
- p_aout->output.output.i_format = AOUT_FMT_S16_NE;
- p_sys->i_sampleSize = 2;
+ msg_Err( p_aout, "Pa_CloseStream: %d (%s)", i_err,
+ Pa_GetErrorText( i_err ) );
}
- else
+
+ i_err = Pa_Terminate();
+ if( i_err != paNoError )
+ {
+ msg_Err( p_aout, "Pa_Terminate: %d (%s)", i_err,
+ Pa_GetErrorText( i_err ) );
+ }
+
+#endif
+
+ msg_Dbg( p_aout, "portaudio closed");
+ free( p_sys );
+}
+
+static int PAOpenDevice( aout_instance_t *p_aout )
+{
+ aout_sys_t *p_sys = p_aout->output.p_sys;
+ const PaDeviceInfo *p_pdi;
+ PaError i_err;
+ vlc_value_t val, text;
+ int i;
+
+ /* Initialize portaudio */
+ i_err = Pa_Initialize();
+ if( i_err != paNoError )
{
- msg_Err( p_aout, "Audio format not supported" );
- (void) Pa_Terminate();
+ msg_Err( p_aout, "Pa_Initialize returned %d : %s",
+ i_err, Pa_GetErrorText( i_err ) );
+
return VLC_EGENERIC;
}
- i_nb_channels = aout_FormatNbChannels( &p_aout->output.output );
- msg_Info( p_aout, "nb_channels = %d", i_nb_channels );
- if ( i_nb_channels > p_sys->deviceInfo.maxOutputChannels )
+ p_sys->i_devices = Pa_GetDeviceCount();
+ if( p_sys->i_devices < 0 )
+ {
+ i_err = p_sys->i_devices;
+ msg_Err( p_aout, "Pa_GetDeviceCount returned %d : %s", i_err,
+ Pa_GetErrorText( i_err ) );
+
+ goto error;
+ }
+
+ /* Display all devices info */
+ msg_Dbg( p_aout, "number of devices = %d", p_sys->i_devices );
+ for( i = 0; i < p_sys->i_devices; i++ )
+ {
+ p_pdi = Pa_GetDeviceInfo( i );
+ msg_Dbg( p_aout, "------------------------------------- #%d", i );
+ msg_Dbg( p_aout, "Name = %s", p_pdi->name );
+ msg_Dbg( p_aout, "Max Inputs = %d, Max Outputs = %d",
+ p_pdi->maxInputChannels, p_pdi->maxOutputChannels );
+ }
+ msg_Dbg( p_aout, "-------------------------------------" );
+
+ msg_Dbg( p_aout, "requested device is #%d", p_sys->i_device_id );
+ if( p_sys->i_device_id >= p_sys->i_devices )
{
- if ( p_sys->deviceInfo.maxOutputChannels < 1 )
+ msg_Err( p_aout, "device %d does not exist", p_sys->i_device_id );
+ goto error;
+ }
+ p_sys->deviceInfo = Pa_GetDeviceInfo( p_sys->i_device_id );
+
+ if( p_sys->deviceInfo->maxOutputChannels < 1 )
+ {
+ msg_Err( p_aout, "no channel available" );
+ goto error;
+ }
+
+ if( var_Type( p_aout, "audio-device" ) == 0 )
+ {
+ var_Create( p_aout, "audio-device", VLC_VAR_INTEGER|VLC_VAR_HASCHOICE);
+ text.psz_string = _("Audio Device");
+ var_Change( p_aout, "audio-device", VLC_VAR_SETTEXT, &text, NULL );
+
+ if( p_sys->deviceInfo->maxOutputChannels >= 1 )
{
- msg_Err( p_aout, "No channel available" );
- (void) Pa_Terminate();
- return VLC_EGENERIC;
+ val.i_int = AOUT_VAR_MONO;
+ text.psz_string = _("Mono");
+ var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE,
+ &val, &text );
+ msg_Dbg( p_aout, "device supports 1 channel" );
}
- else if ( p_sys->deviceInfo.maxOutputChannels < 2 )
+ if( p_sys->deviceInfo->maxOutputChannels >= 2 )
{
- p_sys->i_nbChannels = 1;
- p_aout->output.output.i_physical_channels
- = AOUT_CHAN_CENTER;
+ val.i_int = AOUT_VAR_STEREO;
+ text.psz_string = _("Stereo");
+ var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE,
+ &val, &text );
+ var_Change( p_aout, "audio-device", VLC_VAR_SETDEFAULT,
+ &val, NULL );
+ var_Set( p_aout, "audio-device", val );
+ msg_Dbg( p_aout, "device supports 2 channels" );
}
- else if ( p_sys->deviceInfo.maxOutputChannels < 4 )
+ if( p_sys->deviceInfo->maxOutputChannels >= 4 )
{
- p_sys->i_nbChannels = 2;
- p_aout->output.output.i_physical_channels
- = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT;
+ val.i_int = AOUT_VAR_2F2R;
+ text.psz_string = _("2 Front 2 Rear");
+ var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE,
+ &val, &text );
+ msg_Dbg( p_aout, "device supports 4 channels" );
}
- else if ( p_sys->deviceInfo.maxOutputChannels < 6 )
+ if( p_sys->deviceInfo->maxOutputChannels >= 5 )
{
- p_sys->i_nbChannels = 4;
- p_aout->output.output.i_physical_channels
- = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
- | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT;
+ val.i_int = AOUT_VAR_3F2R;
+ text.psz_string = _("3 Front 2 Rear");
+ var_Change( p_aout, "audio-device",
+ VLC_VAR_ADDCHOICE, &val, &text );
+ msg_Dbg( p_aout, "device supports 5 channels" );
}
- else
+ if( p_sys->deviceInfo->maxOutputChannels >= 6 )
{
- p_sys->i_nbChannels = 6;
- p_aout->output.output.i_physical_channels
- = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
- | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT
- | AOUT_CHAN_LFE;
+ val.i_int = AOUT_VAR_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" );
}
+
+ var_AddCallback( p_aout, "audio-device", aout_ChannelsRestart, NULL );
+ var_SetBool( p_aout, "intf-change", true );
+ }
+
+ /* Audio format is paFloat32 (always supported by portaudio v19) */
+ p_aout->output.output.i_format = VLC_CODEC_FL32;
+
+ return VLC_SUCCESS;
+
+ error:
+ if( ( i_err = Pa_Terminate() ) != paNoError )
+ {
+ msg_Err( p_aout, "Pa_Terminate returned %d", i_err );
}
- p_sys->i_sampleSize *= p_sys->i_nbChannels;
+ return VLC_EGENERIC;
+}
+
+static int PAOpenStream( aout_instance_t *p_aout )
+{
+ aout_sys_t *p_sys = p_aout->output.p_sys;
+ const PaHostErrorInfo* paLastHostErrorInfo = Pa_GetLastHostErrorInfo();
+ PaStreamParameters paStreamParameters;
+ vlc_value_t val;
+ int i_channels, i_err;
+ uint32_t i_channel_mask;
- /* Open portaudio stream */
+ if( var_Get( p_aout, "audio-device", &val ) < 0 )
+ {
+ return VLC_EGENERIC;
+ }
+
+ if( val.i_int == AOUT_VAR_5_1 )
+ {
+ p_aout->output.output.i_physical_channels
+ = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
+ | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT
+ | AOUT_CHAN_LFE;
+ }
+ else if( val.i_int == AOUT_VAR_3F2R )
+ {
+ p_aout->output.output.i_physical_channels
+ = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
+ | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT;
+ }
+ else if( val.i_int == AOUT_VAR_2F2R )
+ {
+ p_aout->output.output.i_physical_channels
+ = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
+ | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT;
+ }
+ else if( val.i_int == AOUT_VAR_MONO )
+ {
+ p_aout->output.output.i_physical_channels = AOUT_CHAN_CENTER;
+ }
+ else
+ {
+ p_aout->output.output.i_physical_channels
+ = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT;
+ }
+
+ 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;
p_aout->output.i_nb_samples = FRAME_SIZE;
- msg_Info( p_aout, "rate = %d", p_aout->output.output.i_rate );
- msg_Info( p_aout, "samples = %d", p_aout->output.i_nb_samples );
-
- i_err = Pa_OpenStream(
- &p_stream,
- paNoDevice, 0, 0, 0, /* no input device */
- p_sys->i_deviceId, /* output device */
- p_sys->i_nbChannels,
- p_sys->sampleFormat,
- NULL,
- (double) p_aout->output.output.i_rate,
- (unsigned long) p_aout->output.i_nb_samples, /* FRAMES_PER_BUFFER */
- FRAMES_NUM, /* number of buffers, if zero then use default minimum */
- paClipOff, /* we won't output out of range samples so don't bother clipping them */
- paCallback, p_sys );
+ 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;
+ paStreamParameters.suggestedLatency =
+ p_sys->deviceInfo->defaultLowOutputLatency;
+ paStreamParameters.hostApiSpecificStreamInfo = NULL;
+
+ i_err = Pa_OpenStream( &p_sys->p_stream, NULL /* no input */,
+ &paStreamParameters, (double)p_aout->output.output.i_rate,
+ FRAME_SIZE, paClipOff, paCallback, p_sys );
if( i_err != paNoError )
{
msg_Err( p_aout, "Pa_OpenStream returns %d : %s", i_err,
Pa_GetErrorText( i_err ) );
- (void) Pa_Terminate();
+ if( i_err == paUnanticipatedHostError )
+ {
+ msg_Err( p_aout, "type %d code %ld : %s",
+ paLastHostErrorInfo->hostApiType,
+ paLastHostErrorInfo->errorCode,
+ paLastHostErrorInfo->errorText );
+ }
+ p_sys->p_stream = 0;
return VLC_EGENERIC;
}
- p_sys->p_stream = p_stream;
- i_err = Pa_StartStream( p_stream );
+ i_err = Pa_StartStream( p_sys->p_stream );
if( i_err != paNoError )
{
- (void) Pa_CloseStream( p_stream);
- (void) Pa_Terminate();
+ msg_Err( p_aout, "Pa_StartStream() failed" );
+ Pa_CloseStream( p_sys->p_stream );
return VLC_EGENERIC;
}
- msg_Dbg( p_aout, "Leaving Open()" );
return VLC_SUCCESS;
}
/*****************************************************************************
- * Close: close the audio device
+ * Play: play sound
*****************************************************************************/
-static void Close ( vlc_object_t *p_this )
+static void Play( aout_instance_t * p_aout )
{
- aout_instance_t *p_aout = (aout_instance_t *)p_this;
- struct aout_sys_t * p_sys = p_aout->output.p_sys;
- PortAudioStream *p_stream = p_sys->p_stream;
- PaError i_err;
-
- msg_Dbg( p_aout, "Entering Close()");
-
- i_err = Pa_AbortStream( p_stream );
- if ( i_err != paNoError )
- {
- msg_Err( p_aout, "Pa_AbortStream: %d (%s)", i_err, Pa_GetErrorText( i_err ) );
- }
- i_err = Pa_CloseStream( p_stream );
- if ( i_err != paNoError )
- {
- msg_Err( p_aout, "Pa_CloseStream: %d (%s)", i_err, Pa_GetErrorText( i_err ) );
- }
- i_err = Pa_Terminate();
- if ( i_err != paNoError )
- {
- msg_Err( p_aout, "Pa_Terminate: %d (%s)", i_err, Pa_GetErrorText( i_err ) );
- }
- msg_Dbg( p_aout, "Leaving Close()");
+ VLC_UNUSED( p_aout );
}
+#ifdef PORTAUDIO_IS_SERIOUSLY_BROKEN
/*****************************************************************************
- * Play: play sound
+ * PORTAUDIOThread: all interactions with libportaudio.a are handled
+ * in this single thread. Otherwise libportaudio.a is _not_ happy :-(
*****************************************************************************/
-static void Play( aout_instance_t * p_aout )
+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( 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 = false;
+
+ p_aout = pa_thread->p_aout;
+ p_sys = p_aout->output.p_sys;
+
+ if( PAOpenDevice( p_aout ) != VLC_SUCCESS )
+ {
+ msg_Err( p_aout, "cannot open portaudio device" );
+ 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 = true;
+
+ i_err = Pa_Terminate();
+ if( i_err != paNoError )
+ {
+ msg_Err( p_aout, "Pa_Terminate: %d (%s)", i_err,
+ Pa_GetErrorText( i_err ) );
+ }
+ }
+
+ /* Tell the main thread that we are ready */
+ vlc_mutex_lock( &pa_thread->lock_wait );
+ pa_thread->b_wait = true;
+ vlc_cond_signal( &pa_thread->wait );
+ vlc_mutex_unlock( &pa_thread->lock_wait );
+
+ /* Wait for end 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 = false;
+
+ if( pa_thread->b_error ) continue;
+
+ i_err = Pa_StopStream( p_sys->p_stream );
+ if( i_err != paNoError )
+ {
+ msg_Err( p_aout, "Pa_StopStream: %d (%s)", i_err,
+ Pa_GetErrorText( i_err ) );
+ }
+ i_err = Pa_CloseStream( p_sys->p_stream );
+ if( i_err != paNoError )
+ {
+ msg_Err( p_aout, "Pa_CloseStream: %d (%s)", i_err,
+ Pa_GetErrorText( i_err ) );
+ }
+ i_err = Pa_Terminate();
+ if( i_err != paNoError )
+ {
+ msg_Err( p_aout, "Pa_Terminate: %d (%s)", i_err,
+ Pa_GetErrorText( i_err ) );
+ }
+
+ /* Tell the main thread that we are ready */
+ vlc_mutex_lock( &pa_thread->lock_wait );
+ pa_thread->b_wait = true;
+ vlc_cond_signal( &pa_thread->wait );
+ vlc_mutex_unlock( &pa_thread->lock_wait );
+ }
+ vlc_restorecancel (canc);
+ return NULL;
}
+#endif
projects / vlc / blobdiff