# include "config.h"
#endif
+#include <assert.h>
+
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_dialog.h>
#include <vlc_aout.h>
+#include <vlc_cpu.h>
/* ALSA part
Note: we use the new API which is available since 0.9.0beta10a. */
#define ALSA_PCM_NEW_HW_PARAMS_API
#define ALSA_PCM_NEW_SW_PARAMS_API
#include <alsa/asoundlib.h>
+#include <alsa/version.h>
/*#define ALSA_DEBUG*/
snd_output_t * p_snd_stderr;
#endif
- int b_playing; /* playing status */
- mtime_t start_date;
-
- vlc_mutex_t lock;
- vlc_cond_t wait ;
-
- snd_pcm_status_t *p_status;
+ mtime_t start_date;
+ vlc_thread_t thread;
+ vlc_sem_t wait;
};
#define A52_FRAME_NB 1536
static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
static void Play ( aout_instance_t * );
-static void* ALSAThread ( vlc_object_t * );
+static void* ALSAThread ( void * );
static void ALSAFill ( aout_instance_t * );
static int FindDevicesCallback( vlc_object_t *p_this, char const *psz_name,
vlc_value_t newval, vlc_value_t oldval, void *p_unused );
+static void GetDevicesForCard( vlc_object_t *, module_config_t *, int card );
+static void GetDevices( vlc_object_t *, module_config_t * );
/*****************************************************************************
* Module descriptor
/*****************************************************************************
* Probe: probe the audio device for available formats and channels
*****************************************************************************/
-static void Probe( aout_instance_t * p_aout,
- const char * psz_device, const char * psz_iec_device,
- int *pi_snd_pcm_format )
+static int Probe( aout_instance_t * p_aout,
+ const char * psz_device, const char * psz_iec_device,
+ int *pi_snd_pcm_format )
{
struct aout_sys_t * p_sys = p_aout->output.p_sys;
vlc_value_t val, text;
* the blocking mode */
/* Now test linear PCM capabilities */
- if ( !(i_ret = snd_pcm_open( &p_sys->p_snd_pcm, psz_device,
- SND_PCM_STREAM_PLAYBACK,
- SND_PCM_NONBLOCK ) ) )
+ i_ret = snd_pcm_open( &p_sys->p_snd_pcm, psz_device,
+ SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK );
+ if( i_ret == 0 )
{
int i_channels;
snd_pcm_hw_params_t * p_hw;
", disabling linear PCM audio" );
snd_pcm_close( p_sys->p_snd_pcm );
var_Destroy( p_aout, "audio-device" );
- return;
+ return VLC_EGENERIC;
}
if ( snd_pcm_hw_params_set_format( p_sys->p_snd_pcm, p_hw,
"word order, disabling linear PCM audio" );
snd_pcm_close( p_sys->p_snd_pcm );
var_Destroy( p_aout, "audio-device" );
- return;
+ return VLC_EGENERIC;
}
}
break;
case 6:
val.i_int = AOUT_VAR_5_1;
- text.psz_string = "5.1";
+ text.psz_string = (char *)"5.1";
var_Change( p_aout, "audio-device",
VLC_VAR_ADDCHOICE, &val, &text );
break;
if ( psz_iec_device )
{
/* Opening the device should be enough */
- if ( !(i_ret = snd_pcm_open( &p_sys->p_snd_pcm, psz_iec_device,
- SND_PCM_STREAM_PLAYBACK,
- SND_PCM_NONBLOCK ) ) )
+ i_ret = snd_pcm_open( &p_sys->p_snd_pcm, psz_iec_device,
+ SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK );
+ if( i_ret == 0 )
{
val.i_int = AOUT_VAR_SPDIF;
text.psz_string = (char*)N_("A/52 over S/PDIF");
var_Change( p_aout, "audio-device",
VLC_VAR_ADDCHOICE, &val, &text );
- if( config_GetInt( p_aout, "spdif" ) )
+ if( var_InheritBool( p_aout, "spdif" ) )
var_Set( p_aout, "audio-device", val );
snd_pcm_close( p_sys->p_snd_pcm );
}
var_Change( p_aout, "audio-device", VLC_VAR_CHOICESCOUNT, &val, NULL );
+#if (SND_LIB_VERSION <= 0x010015)
+# warning Please update alsa-lib to version > 1.0.21a.
+ var_Create( p_aout->p_libvlc, "alsa-working", VLC_VAR_BOOL );
+ if( val.i_int <= 0 )
+ {
+ if( var_GetBool( p_aout->p_libvlc, "alsa-working" ) )
+ dialog_Fatal( p_aout, "ALSA version problem",
+ "VLC failed to re-initialize your sound output device.\n"
+ "Please update alsa-lib to version 1.0.22 or higher "
+ "to fix this issue." );
+ }
+ else
+ var_SetBool( p_aout->p_libvlc, "alsa-working", true );
+#endif
if( val.i_int <= 0 )
{
/* Probe() has failed. */
- msg_Dbg( p_aout, "failed to find a useable alsa configuration" );
+#if (SND_LIB_VERSION <= 0x010017)
+# warning Please update alsa-lib to version > 1.0.23.
+ var_Create( p_aout->p_libvlc, "alsa-broken", VLC_VAR_BOOL );
+ if( !var_GetBool( p_aout->p_libvlc, "alsa-broken" ) )
+ {
+ var_SetBool( p_aout->p_libvlc, "alsa-broken", true );
+ dialog_Fatal( p_aout, "Potential ALSA version problem",
+ "VLC failed to initialize your sound output device (if any).\n"
+ "Please update alsa-lib to version 1.0.24 or higher "
+ "to try to fix this issue." );
+ }
+#endif
+ msg_Dbg( p_aout, "failed to find a usable ALSA configuration" );
var_Destroy( p_aout, "audio-device" );
- return;
+ GetDevices( VLC_OBJECT(p_aout), NULL );
+ return VLC_EGENERIC;
}
/* Add final settings to the variable */
var_AddCallback( p_aout, "audio-device", aout_ChannelsRestart, NULL );
var_SetBool( p_aout, "intf-change", true );
+ return VLC_SUCCESS;
}
/*****************************************************************************
static int Open( vlc_object_t *p_this )
{
aout_instance_t * p_aout = (aout_instance_t *)p_this;
- struct aout_sys_t * p_sys;
- vlc_value_t val;
-
- char psz_default_iec_device[128]; /* Buffer used to store the default
- S/PDIF device */
- char * psz_device, * psz_iec_device; /* device names for PCM and S/PDIF
- output */
-
- int i_vlc_pcm_format; /* Audio format for VLC's data */
- int i_snd_pcm_format; /* Audio format for ALSA's data */
-
- snd_pcm_uframes_t i_buffer_size = 0;
- snd_pcm_uframes_t i_period_size = 0;
- int i_channels = 0;
-
- snd_pcm_hw_params_t *p_hw;
- snd_pcm_sw_params_t *p_sw;
-
- int i_snd_rc = -1;
- unsigned int i_old_rate;
- bool b_retry = true;
/* Allocate structures */
- p_aout->output.p_sys = p_sys = malloc( sizeof( aout_sys_t ) );
+ aout_sys_t * p_sys = malloc( sizeof( aout_sys_t ) );
if( p_sys == NULL )
return VLC_ENOMEM;
- p_sys->b_playing = false;
- p_sys->start_date = 0;
- vlc_cond_init( &p_sys->wait );
- vlc_mutex_init( &p_sys->lock );
+ p_aout->output.p_sys = p_sys;
/* Get device name */
- if( (psz_device = config_GetPsz( p_aout, "alsa-audio-device" )) == NULL )
+ char *psz_device = var_InheritString( p_aout, "alsa-audio-device" );
+ if( unlikely(psz_device == NULL) )
{
- msg_Err( p_aout, "no audio device given (maybe \"default\" ?)" );
- dialog_Fatal( p_aout, _("No Audio Device"),
- _("No audio device name was given. You might want to " \
- "enter \"default\".") );
- free( p_sys );
- return VLC_EGENERIC;
+ psz_device = strdup( DEFAULT_ALSA_DEVICE );
+ if( unlikely(psz_device == NULL) )
+ {
+ free( p_sys );
+ return VLC_ENOMEM;
+ }
}
/* Choose the IEC device for S/PDIF output:
- if the device is overriden by the user then it will be the one
+ if the device is overridden by the user then it will be the one
otherwise we compute the default device based on the output format. */
- if( AOUT_FMT_NON_LINEAR( &p_aout->output.output )
- && !strcmp( psz_device, DEFAULT_ALSA_DEVICE ) )
+ char *psz_iec_device = NULL;
+ if( AOUT_FMT_NON_LINEAR( &p_aout->output.output ) )
{
- snprintf( psz_default_iec_device, sizeof(psz_default_iec_device),
- "iec958:AES0=0x%x,AES1=0x%x,AES2=0x%x,AES3=0x%x",
- IEC958_AES0_CON_EMPHASIS_NONE | IEC958_AES0_NONAUDIO,
- IEC958_AES1_CON_ORIGINAL | IEC958_AES1_CON_PCM_CODER,
- 0,
- ( p_aout->output.output.i_rate == 48000 ?
- IEC958_AES3_CON_FS_48000 :
- ( p_aout->output.output.i_rate == 44100 ?
- IEC958_AES3_CON_FS_44100 : IEC958_AES3_CON_FS_32000 ) ) );
- psz_iec_device = psz_default_iec_device;
- }
- else if( AOUT_FMT_NON_LINEAR( &p_aout->output.output ) )
- {
- psz_iec_device = psz_device;
- }
- else
- {
- psz_iec_device = NULL;
+ if( !strcmp( psz_device, DEFAULT_ALSA_DEVICE ) )
+ {
+ unsigned aes3;
+
+ switch( p_aout->output.output.i_rate )
+ {
+ case 48000:
+ aes3 = IEC958_AES3_CON_FS_48000;
+ break;
+ case 44100:
+ aes3 = IEC958_AES3_CON_FS_44100;
+ break;
+ default:
+ aes3 = IEC958_AES3_CON_FS_32000;
+ break;
+ }
+
+ if( asprintf( &psz_iec_device,
+ "iec958:AES0=0x%x,AES1=0x%x,AES2=0x%x,AES3=0x%x",
+ IEC958_AES0_CON_EMPHASIS_NONE | IEC958_AES0_NONAUDIO,
+ IEC958_AES1_CON_ORIGINAL | IEC958_AES1_CON_PCM_CODER,
+ 0, aes3 ) == -1 )
+ {
+ free( psz_device );
+ free( p_sys );
+ return VLC_ENOMEM;
+ }
+ }
+ else
+ psz_iec_device = strdup( psz_device );
}
/* Choose the linear PCM format (read the comment above about FPU
and float32) */
- if( vlc_CPU() & CPU_CAPABILITY_FPU )
- {
- i_vlc_pcm_format = VLC_CODEC_FL32;
+ int i_snd_pcm_format; /* Audio format for ALSA's data */
+ if( HAVE_FPU )
i_snd_pcm_format = SND_PCM_FORMAT_FLOAT;
- }
else
- {
- i_vlc_pcm_format = AOUT_FMT_S16_NE;
i_snd_pcm_format = SND_PCM_FORMAT_S16;
- }
/* If the variable doesn't exist then it's the first time we're called
and we have to probe the available audio formats and channels */
- if ( var_Type( p_aout, "audio-device" ) == 0 )
- {
- Probe( p_aout, psz_device, psz_iec_device, &i_snd_pcm_format );
- }
-
- if ( var_Get( p_aout, "audio-device", &val ) < 0 )
+ if( var_Type( p_aout, "audio-device" ) == 0
+ && Probe( p_aout, psz_device, psz_iec_device, &i_snd_pcm_format ) )
{
- free( p_sys );
- free( psz_device );
- return VLC_EGENERIC;
+ free( psz_iec_device );
+ free( psz_device );
+ free( p_sys );
+ return VLC_EGENERIC;
}
- p_aout->output.output.i_format = i_vlc_pcm_format;
- if ( val.i_int == AOUT_VAR_5_1 )
+ bool spdif = false;
+ switch( var_GetInteger( p_aout, "audio-device") )
{
+ case 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;
free( psz_device );
psz_device = strdup( "surround51" );
- }
- else if ( val.i_int == AOUT_VAR_2F2R )
- {
+ break;
+ case AOUT_VAR_2F2R:
p_aout->output.output.i_physical_channels
= AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT
| AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT;
free( psz_device );
psz_device = strdup( "surround40" );
- }
- else if ( val.i_int == AOUT_VAR_STEREO )
- {
+ break;
+ case AOUT_VAR_STEREO:
p_aout->output.output.i_physical_channels
= AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT;
- }
- else if ( val.i_int == AOUT_VAR_MONO )
- {
+ break;
+ case AOUT_VAR_MONO:
p_aout->output.output.i_physical_channels = AOUT_CHAN_CENTER;
- }
- else if( val.i_int != AOUT_VAR_SPDIF )
- {
+ break;
+ case AOUT_VAR_SPDIF:
+ spdif = true;
+ free( psz_device );
+ psz_device = psz_iec_device;
+ psz_iec_device = NULL;
+ break;
+ default:
/* This should not happen ! */
- msg_Err( p_aout, "internal: can't find audio-device (%i)", val.i_int );
- free( p_sys );
+ msg_Err( p_aout, "cannot find audio-device" );
+ free( psz_iec_device );
free( psz_device );
+ free( p_sys );
return VLC_EGENERIC;
}
#endif
/* Open the device */
- if ( val.i_int == AOUT_VAR_SPDIF )
+ msg_Dbg( p_aout, "opening ALSA device `%s'", psz_device );
+ for( unsigned i = 10; i; i-- )
{
- if ( ( i_snd_rc = snd_pcm_open( &p_sys->p_snd_pcm, psz_iec_device,
- SND_PCM_STREAM_PLAYBACK, 0 ) ) < 0 )
+ int val = snd_pcm_open( &p_sys->p_snd_pcm, psz_device,
+ SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK );
+ if( val == 0 )
+ break; /* success! */
+
+ if( val != -EBUSY )
{
msg_Err( p_aout, "cannot open ALSA device `%s' (%s)",
- psz_iec_device, snd_strerror( i_snd_rc ) );
+ psz_device, snd_strerror( val ) );
dialog_Fatal( p_aout, _("Audio output failed"),
- _("VLC could not open the ALSA device \"%s\" (%s)."),
- psz_iec_device, snd_strerror( i_snd_rc ) );
+ _("VLC could not open the ALSA device \"%s\" (%s)."),
+ psz_device, snd_strerror( val ) );
+ free( psz_device );
free( p_sys );
+ return VLC_EGENERIC;
+ }
+
+ /* Since it seems snd_pcm_close hasn't really released the device at
+ the time it returns, probe if the device is available in loop for 1s.
+ We cannot use blocking mode since the we would wait indefinitely when
+ switching from a dmx device to surround51. */
+ if( i == 1 )
+ {
+ msg_Err( p_aout, "audio device %s is already in use",
+ psz_device );
+ dialog_Fatal( p_aout, _("Audio output failed"),
+ _("The audio device \"%s\" is already in use."),
+ psz_device );
free( psz_device );
+ free( p_sys );
return VLC_EGENERIC;
}
+ msleep( CLOCK_FREQ / 10 );
+ }
+ free( psz_device );
+
+ /* We want blocking mode */
+ snd_pcm_nonblock( p_sys->p_snd_pcm, 0 );
+
+ snd_pcm_uframes_t i_buffer_size;
+ snd_pcm_uframes_t i_period_size;
+ int i_channels;
+
+ if( spdif )
+ {
i_buffer_size = ALSA_SPDIF_BUFFER_SIZE;
i_snd_pcm_format = SND_PCM_FORMAT_S16;
i_channels = 2;
- i_vlc_pcm_format = VLC_CODEC_SPDIFL;
p_aout->output.i_nb_samples = i_period_size = ALSA_SPDIF_PERIOD_SIZE;
p_aout->output.output.i_bytes_per_frame = AOUT_SPDIF_SIZE;
p_aout->output.output.i_frame_length = A52_FRAME_NB;
}
else
{
- int i;
-
- msg_Dbg( p_aout, "opening ALSA device `%s'", psz_device );
-
- /* Since it seems snd_pcm_close hasn't really released the device at
- the time it returns, probe if the device is available in loop for 1s.
- We cannot use blocking mode since the we would wait indefinitely when
- switching from a dmx device to surround51. */
-
- for( i = 10; i >= 0; i-- )
- {
- if ( ( i_snd_rc = snd_pcm_open( &p_sys->p_snd_pcm, psz_device,
- SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK ) ) == -EBUSY )
- {
- if( i ) msleep( 100000 /* 100ms */ );
- else
- {
- msg_Err( p_aout, "audio device: %s is already in use",
- psz_device );
- dialog_Fatal( p_aout, _("Audio output failed"),
- _("The audio device \"%s\" is already in use."),
- psz_device );
- }
- continue;
- }
- break;
- }
- if( i_snd_rc < 0 )
- {
- msg_Err( p_aout, "cannot open ALSA device `%s' (%s)",
- psz_device, snd_strerror( i_snd_rc ) );
- dialog_Fatal( p_aout, _("Audio output failed"),
- _("VLC could not open the ALSA device \"%s\" (%s)."),
- psz_device, snd_strerror( i_snd_rc ) );
- free( p_sys );
- free( psz_device );
- return VLC_EGENERIC;
- }
-
- /* We want blocking mode */
- snd_pcm_nonblock( p_sys->p_snd_pcm, 0 );
-
i_buffer_size = ALSA_DEFAULT_BUFFER_SIZE;
i_channels = aout_FormatNbChannels( &p_aout->output.output );
aout_VolumeSoftInit( p_aout );
}
- /* Free psz_device so that all the remaining data is stack-allocated */
- free( psz_device );
-
p_aout->output.pf_play = Play;
+ snd_pcm_hw_params_t *p_hw;
+ snd_pcm_sw_params_t *p_sw;
+
snd_pcm_hw_params_alloca(&p_hw);
snd_pcm_sw_params_alloca(&p_sw);
/* Due to some bugs in alsa with some drivers, we need to retry in s16l
if snd_pcm_hw_params fails in fl32 */
- while ( b_retry )
+ int val;
+retry:
+ /* Get Initial hardware parameters */
+ val = snd_pcm_hw_params_any( p_sys->p_snd_pcm, p_hw );
+ if( val < 0 )
{
- b_retry = false;
+ msg_Err( p_aout, "unable to retrieve hardware parameters (%s)",
+ snd_strerror( val ) );
+ goto error;
+ }
- /* Get Initial hardware parameters */
- if ( ( i_snd_rc = snd_pcm_hw_params_any( p_sys->p_snd_pcm, p_hw ) ) < 0 )
+ /* Set format. */
+ val = snd_pcm_hw_params_set_format( p_sys->p_snd_pcm, p_hw,
+ i_snd_pcm_format );
+ if( val < 0 )
+ {
+ if( i_snd_pcm_format != SND_PCM_FORMAT_S16 )
{
- msg_Err( p_aout, "unable to retrieve initial hardware parameters (%s)",
- snd_strerror( i_snd_rc ) );
- goto error;
+ i_snd_pcm_format = SND_PCM_FORMAT_S16;
+ val = snd_pcm_hw_params_set_format( p_sys->p_snd_pcm,
+ p_hw, i_snd_pcm_format );
}
-
- /* Set format. */
- if ( ( i_snd_rc = snd_pcm_hw_params_set_format( p_sys->p_snd_pcm, p_hw,
- i_snd_pcm_format ) ) < 0 )
+ if ( val < 0 )
{
- if( i_snd_pcm_format != SND_PCM_FORMAT_S16 )
- {
- i_snd_pcm_format = SND_PCM_FORMAT_S16;
- i_snd_rc = snd_pcm_hw_params_set_format( p_sys->p_snd_pcm,
- p_hw, i_snd_pcm_format );
- }
- if ( i_snd_rc < 0 )
- {
- msg_Err( p_aout, "unable to set stream sample size and "
- "word order (%s)", snd_strerror( i_snd_rc ) );
- goto error;
- }
+ msg_Err( p_aout, "unable to set stream sample size and "
+ "word order (%s)", snd_strerror( val ) );
+ goto error;
}
- if( i_vlc_pcm_format != VLC_CODEC_SPDIFL )
+ }
+
+ vlc_fourcc_t i_vlc_pcm_format;
+ if( spdif )
+ i_vlc_pcm_format = VLC_CODEC_SPDIFL;
+ else
switch( i_snd_pcm_format )
{
- case SND_PCM_FORMAT_FLOAT:
+ case SND_PCM_FORMAT_FLOAT:
i_vlc_pcm_format = VLC_CODEC_FL32;
break;
- case SND_PCM_FORMAT_S16:
- i_vlc_pcm_format = AOUT_FMT_S16_NE;
+ case SND_PCM_FORMAT_S16:
+ i_vlc_pcm_format = VLC_CODEC_S16N;
break;
+ default:
+ assert(0);
}
- p_aout->output.output.i_format = i_vlc_pcm_format;
+ p_aout->output.output.i_format = i_vlc_pcm_format;
- if ( ( i_snd_rc = snd_pcm_hw_params_set_access( p_sys->p_snd_pcm, p_hw,
- SND_PCM_ACCESS_RW_INTERLEAVED ) ) < 0 )
- {
- msg_Err( p_aout, "unable to set interleaved stream format (%s)",
- snd_strerror( i_snd_rc ) );
- goto error;
- }
+ val = snd_pcm_hw_params_set_access( p_sys->p_snd_pcm, p_hw,
+ SND_PCM_ACCESS_RW_INTERLEAVED );
+ if( val < 0 )
+ {
+ msg_Err( p_aout, "unable to set interleaved stream format (%s)",
+ snd_strerror( val ) );
+ goto error;
+ }
- /* Set channels. */
- if ( ( i_snd_rc = snd_pcm_hw_params_set_channels( p_sys->p_snd_pcm, p_hw,
- i_channels ) ) < 0 )
- {
- msg_Err( p_aout, "unable to set number of output channels (%s)",
- snd_strerror( i_snd_rc ) );
- goto error;
- }
+ /* Set channels. */
+ val = snd_pcm_hw_params_set_channels( p_sys->p_snd_pcm, p_hw, i_channels );
+ if( val < 0 )
+ {
+ msg_Err( p_aout, "unable to set number of output channels (%s)",
+ snd_strerror( val ) );
+ goto error;
+ }
- /* Set rate. */
- i_old_rate = p_aout->output.output.i_rate;
-#ifdef HAVE_ALSA_NEW_API
- i_snd_rc = snd_pcm_hw_params_set_rate_near( p_sys->p_snd_pcm, p_hw,
- &p_aout->output.output.i_rate,
- NULL );
-#else
- i_snd_rc = snd_pcm_hw_params_set_rate_near( p_sys->p_snd_pcm, p_hw,
- p_aout->output.output.i_rate,
- NULL );
-#endif
- if( i_snd_rc < 0 || p_aout->output.output.i_rate != i_old_rate )
- {
- msg_Warn( p_aout, "The rate %d Hz is not supported by your " \
- "hardware. Using %d Hz instead.\n", i_old_rate, \
- p_aout->output.output.i_rate );
- }
+ /* Set rate. */
+ unsigned i_old_rate = p_aout->output.output.i_rate;
+ val = snd_pcm_hw_params_set_rate_near( p_sys->p_snd_pcm, p_hw,
+ &p_aout->output.output.i_rate,
+ NULL );
+ if( val < 0 || p_aout->output.output.i_rate != i_old_rate )
+ {
+ msg_Warn( p_aout, "The rate %d Hz is not supported by your " \
+ "hardware. Using %d Hz instead.\n", i_old_rate, \
+ p_aout->output.output.i_rate );
+ }
- /* Set period size. */
-#ifdef HAVE_ALSA_NEW_API
- if ( ( i_snd_rc = snd_pcm_hw_params_set_period_size_near( p_sys->p_snd_pcm,
- p_hw, &i_period_size, NULL ) ) < 0 )
-#else
- if ( ( i_snd_rc = snd_pcm_hw_params_set_period_size_near( p_sys->p_snd_pcm,
- p_hw, i_period_size, NULL ) ) < 0 )
-#endif
- {
- msg_Err( p_aout, "unable to set period size (%s)",
- snd_strerror( i_snd_rc ) );
- goto error;
- }
- p_aout->output.i_nb_samples = i_period_size;
-
-/* Set buffer size. */
-#ifdef HAVE_ALSA_NEW_API
- if ( ( i_snd_rc = snd_pcm_hw_params_set_buffer_size_near( p_sys->p_snd_pcm,
- p_hw, &i_buffer_size ) ) < 0 )
-#else
- if ( ( i_snd_rc = snd_pcm_hw_params_set_buffer_size_near( p_sys->p_snd_pcm,
- p_hw, i_buffer_size ) ) < 0 )
-#endif
- {
- msg_Err( p_aout, "unable to set buffer size (%s)",
- snd_strerror( i_snd_rc ) );
- goto error;
- }
+ /* Set period size. */
+ val = snd_pcm_hw_params_set_period_size_near( p_sys->p_snd_pcm, p_hw,
+ &i_period_size, NULL );
+ if( val < 0 )
+ {
+ msg_Err( p_aout, "unable to set period size (%s)",
+ snd_strerror( val ) );
+ goto error;
+ }
+ p_aout->output.i_nb_samples = i_period_size;
- /* Commit hardware parameters. */
- if ( ( i_snd_rc = snd_pcm_hw_params( p_sys->p_snd_pcm, p_hw ) ) < 0 )
+ /* Set buffer size. */
+ val = snd_pcm_hw_params_set_buffer_size_near( p_sys->p_snd_pcm, p_hw,
+ &i_buffer_size );
+ if( val )
+ {
+ msg_Err( p_aout, "unable to set buffer size (%s)",
+ snd_strerror( val ) );
+ goto error;
+ }
+
+ /* Commit hardware parameters. */
+ val = snd_pcm_hw_params( p_sys->p_snd_pcm, p_hw );
+ if( val < 0 )
+ {
+ if( i_snd_pcm_format == SND_PCM_FORMAT_FLOAT )
{
- if ( b_retry == false &&
- i_snd_pcm_format == SND_PCM_FORMAT_FLOAT)
- {
- b_retry = true;
- i_snd_pcm_format = SND_PCM_FORMAT_S16;
- p_aout->output.output.i_format = AOUT_FMT_S16_NE;
- msg_Warn( p_aout, "unable to commit hardware configuration "
- "with fl32 samples. Retrying with s16l (%s)", snd_strerror( i_snd_rc ) );
- }
- else
- {
- msg_Err( p_aout, "unable to commit hardware configuration (%s)",
- snd_strerror( i_snd_rc ) );
- goto error;
- }
+ i_snd_pcm_format = SND_PCM_FORMAT_S16;
+ p_aout->output.output.i_format = VLC_CODEC_S16N;
+ msg_Warn( p_aout, "unable to commit hardware configuration "
+ "with fl32 samples (%s). Retrying with s16l.",
+ snd_strerror( val ) );
+ goto retry;
}
+ msg_Err( p_aout, "unable to commit hardware configuration (%s)",
+ snd_strerror( val ) );
+ goto error;
}
-#ifdef HAVE_ALSA_NEW_API
- if( ( i_snd_rc = snd_pcm_hw_params_get_period_time( p_hw,
- &p_sys->i_period_time, NULL ) ) < 0 )
-#else
- if( ( p_sys->i_period_time =
- (int)snd_pcm_hw_params_get_period_time( p_hw, NULL ) ) < 0 )
-#endif
+ val = snd_pcm_hw_params_get_period_time( p_hw, &p_sys->i_period_time,
+ NULL );
+ if( val < 0 )
{
msg_Err( p_aout, "unable to get period time (%s)",
- snd_strerror( i_snd_rc ) );
+ snd_strerror( val ) );
goto error;
}
/* Get Initial software parameters */
snd_pcm_sw_params_current( p_sys->p_snd_pcm, p_sw );
- i_snd_rc = snd_pcm_sw_params_set_sleep_min( p_sys->p_snd_pcm, p_sw, 0 );
-
- i_snd_rc = snd_pcm_sw_params_set_avail_min( p_sys->p_snd_pcm, p_sw,
- p_aout->output.i_nb_samples );
+ snd_pcm_sw_params_set_avail_min( p_sys->p_snd_pcm, p_sw,
+ p_aout->output.i_nb_samples );
/* start playing when one period has been written */
- i_snd_rc = snd_pcm_sw_params_set_start_threshold( p_sys->p_snd_pcm, p_sw,
- ALSA_DEFAULT_PERIOD_SIZE);
- if( i_snd_rc < 0 )
+ val = snd_pcm_sw_params_set_start_threshold( p_sys->p_snd_pcm, p_sw,
+ ALSA_DEFAULT_PERIOD_SIZE);
+ if( val < 0 )
{
msg_Err( p_aout, "unable to set start threshold (%s)",
- snd_strerror( i_snd_rc ) );
+ snd_strerror( val ) );
goto error;
}
snd_output_printf( p_sys->p_snd_stderr, "\n" );
#endif
+ p_sys->start_date = 0;
+ vlc_sem_init( &p_sys->wait, 0 );
+
/* Create ALSA thread and wait for its readiness. */
- if( vlc_thread_create( p_aout, "aout", ALSAThread,
- VLC_THREAD_PRIORITY_OUTPUT ) )
+ if( vlc_clone( &p_sys->thread, ALSAThread, p_aout,
+ VLC_THREAD_PRIORITY_OUTPUT ) )
{
msg_Err( p_aout, "cannot create ALSA thread (%m)" );
+ vlc_sem_destroy( &p_sys->wait );
goto error;
}
return VLC_EGENERIC;
}
+static void PlayIgnore( aout_instance_t *p_aout )
+{ /* Already playing - nothing to do */
+ (void) p_aout;
+}
+
/*****************************************************************************
- * Play: nothing to do
+ * Play: start playback
*****************************************************************************/
static void Play( aout_instance_t *p_aout )
{
- if( !p_aout->output.p_sys->b_playing )
- {
- p_aout->output.p_sys->b_playing = 1;
+ p_aout->output.pf_play = PlayIgnore;
- /* get the playing date of the first aout buffer */
- p_aout->output.p_sys->start_date =
- aout_FifoFirstDate( p_aout, &p_aout->output.fifo );
+ /* get the playing date of the first aout buffer */
+ p_aout->output.p_sys->start_date =
+ aout_FifoFirstDate( p_aout, &p_aout->output.fifo );
- /* wake up the audio output thread */
- vlc_mutex_lock( &p_aout->output.p_sys->lock );
- vlc_cond_signal( &p_aout->output.p_sys->wait );
- vlc_mutex_unlock( &p_aout->output.p_sys->lock );
- }
+ /* wake up the audio output thread */
+ sem_post( &p_aout->output.p_sys->wait );
}
/*****************************************************************************
{
aout_instance_t *p_aout = (aout_instance_t *)p_this;
struct aout_sys_t * p_sys = p_aout->output.p_sys;
- int i_snd_rc;
/* Make sure that the thread will stop once it is waken up */
- vlc_object_kill( p_aout );
-
- /* make sure the audio output thread is waken up */
- vlc_mutex_lock( &p_aout->output.p_sys->lock );
- vlc_cond_signal( &p_aout->output.p_sys->wait );
- vlc_mutex_unlock( &p_aout->output.p_sys->lock );
-
- /* */
- vlc_thread_join( p_aout );
- p_aout->b_die = false;
-
- i_snd_rc = snd_pcm_close( p_sys->p_snd_pcm );
-
- if( i_snd_rc > 0 )
- {
- msg_Err( p_aout, "failed closing ALSA device (%s)",
- snd_strerror( i_snd_rc ) );
- }
+ vlc_cancel( p_sys->thread );
+ vlc_join( p_sys->thread, NULL );
+ vlc_sem_destroy( &p_sys->wait );
+ snd_pcm_close( p_sys->p_snd_pcm );
#ifdef ALSA_DEBUG
snd_output_close( p_sys->p_snd_stderr );
#endif
-
free( p_sys );
}
+static void pcm_drop(void *pcm)
+{
+ snd_pcm_drop(pcm);
+}
+
/*****************************************************************************
* ALSAThread: asynchronous thread used to DMA the data to the device
*****************************************************************************/
-static void* ALSAThread( vlc_object_t* p_this )
+static void* ALSAThread( void *data )
{
- aout_instance_t * p_aout = (aout_instance_t*)p_this;
+ aout_instance_t * p_aout = data;
struct aout_sys_t * p_sys = p_aout->output.p_sys;
- int canc = vlc_savecancel ();
- p_sys->p_status = (snd_pcm_status_t *)malloc(snd_pcm_status_sizeof());
/* Wait for the exact time to start playing (avoids resampling) */
- vlc_mutex_lock( &p_sys->lock );
- while( !p_sys->start_date && vlc_object_alive (p_aout) )
- vlc_cond_wait( &p_sys->wait, &p_sys->lock );
- vlc_mutex_unlock( &p_sys->lock );
-
- if( !vlc_object_alive (p_aout) )
- goto cleanup;
-
+ vlc_sem_wait( &p_sys->wait );
mwait( p_sys->start_date - AOUT_PTS_TOLERANCE / 4 );
- while ( vlc_object_alive (p_aout) )
- {
+ vlc_cleanup_push( pcm_drop, p_sys->p_snd_pcm );
+ for(;;)
ALSAFill( p_aout );
- }
-cleanup:
- snd_pcm_drop( p_sys->p_snd_pcm );
- free( p_aout->output.p_sys->p_status );
- vlc_restorecancel (canc);
- return NULL;
+ assert(0);
+ vlc_cleanup_pop();
}
/*****************************************************************************
static void ALSAFill( aout_instance_t * p_aout )
{
struct aout_sys_t * p_sys = p_aout->output.p_sys;
- aout_buffer_t * p_buffer;
- snd_pcm_status_t * p_status = p_sys->p_status;
+ snd_pcm_t *p_pcm = p_sys->p_snd_pcm;
+ snd_pcm_status_t * p_status;
int i_snd_rc;
mtime_t next_date;
+ int canc = vlc_savecancel();
/* Fill in the buffer until space or audio output buffer shortage */
/* Get the status */
- i_snd_rc = snd_pcm_status( p_sys->p_snd_pcm, p_status );
+ snd_pcm_status_alloca(&p_status);
+ i_snd_rc = snd_pcm_status( p_pcm, p_status );
if( i_snd_rc < 0 )
{
msg_Err( p_aout, "cannot get device status" );
if( snd_pcm_status_get_state( p_status ) == SND_PCM_STATE_XRUN )
{
/* Prepare the device */
- i_snd_rc = snd_pcm_prepare( p_sys->p_snd_pcm );
-
+ i_snd_rc = snd_pcm_prepare( p_pcm );
if( i_snd_rc )
{
msg_Err( p_aout, "cannot recover from buffer underrun" );
msg_Dbg( p_aout, "recovered from buffer underrun" );
/* Get the new status */
- i_snd_rc = snd_pcm_status( p_sys->p_snd_pcm, p_status );
+ i_snd_rc = snd_pcm_status( p_pcm, p_status );
if( i_snd_rc < 0 )
{
msg_Err( p_aout, "cannot get device status after recovery" );
/* Here the device should be in RUNNING state, p_status is valid. */
snd_pcm_sframes_t delay = snd_pcm_status_get_delay( p_status );
if( delay == 0 ) /* workaround buggy alsa drivers */
- if( snd_pcm_delay( p_sys->p_snd_pcm, &delay ) < 0 )
+ if( snd_pcm_delay( p_pcm, &delay ) < 0 )
delay = 0; /* FIXME: use a positive minimal delay */
- int i_bytes = snd_pcm_frames_to_bytes( p_sys->p_snd_pcm, delay );
- next_date = mdate() + ( (mtime_t)i_bytes * 1000000
+
+ size_t i_bytes = snd_pcm_frames_to_bytes( p_pcm, delay );
+ mtime_t delay_us = CLOCK_FREQ * i_bytes
/ p_aout->output.output.i_bytes_per_frame
/ p_aout->output.output.i_rate
- * p_aout->output.output.i_frame_length );
+ * p_aout->output.output.i_frame_length;
#ifdef ALSA_DEBUG
snd_pcm_state_t state = snd_pcm_status_get_state( p_status );
if( state != SND_PCM_STATE_RUNNING )
msg_Err( p_aout, "pcm status (%d) != RUNNING", state );
- msg_Dbg( p_aout, "Delay is %ld frames (%d bytes)", delay, i_bytes );
+ msg_Dbg( p_aout, "Delay is %ld frames (%zu bytes)", delay, i_bytes );
msg_Dbg( p_aout, "Bytes per frame: %d", p_aout->output.output.i_bytes_per_frame );
msg_Dbg( p_aout, "Rate: %d", p_aout->output.output.i_rate );
msg_Dbg( p_aout, "Frame length: %d", p_aout->output.output.i_frame_length );
-
- msg_Dbg( p_aout, "Next date is in %d microseconds", (int)(next_date - mdate()) );
+ msg_Dbg( p_aout, "Next date: in %"PRId64" microseconds", delay_us );
#endif
+ next_date = mdate() + delay_us;
}
- p_buffer = aout_OutputNextBuffer( p_aout, next_date,
+ block_t *p_buffer = aout_OutputNextBuffer( p_aout, next_date,
(p_aout->output.output.i_format == VLC_CODEC_SPDIFL) );
/* Audio output buffer shortage -> stop the fill process and wait */
if( p_buffer == NULL )
goto error;
+ block_cleanup_push( p_buffer );
for (;;)
{
- i_snd_rc = snd_pcm_writei( p_sys->p_snd_pcm, p_buffer->p_buffer,
- p_buffer->i_nb_samples );
- if( i_snd_rc != -ESTRPIPE )
- break;
+ int n = snd_pcm_poll_descriptors_count(p_pcm);
+ struct pollfd ufd[n];
+ unsigned short revents;
+
+ snd_pcm_poll_descriptors(p_pcm, ufd, n);
+ do
+ {
+ vlc_restorecancel(canc);
+ poll(ufd, n, -1);
+ canc = vlc_savecancel();
+ snd_pcm_poll_descriptors_revents(p_pcm, ufd, n, &revents);
+ }
+ while(!revents);
+
+ if(revents & POLLOUT)
+ {
+ i_snd_rc = snd_pcm_writei( p_pcm, p_buffer->p_buffer,
+ p_buffer->i_nb_samples );
+ if( i_snd_rc != -ESTRPIPE )
+ break;
+ }
/* a suspend event occurred
* (stream is suspended and waiting for an application recovery) */
msg_Dbg( p_aout, "entering in suspend mode, trying to resume..." );
- while( vlc_object_alive (p_aout) && vlc_object_alive (p_aout->p_libvlc) &&
- ( i_snd_rc = snd_pcm_resume( p_sys->p_snd_pcm ) ) == -EAGAIN )
+ while( ( i_snd_rc = snd_pcm_resume( p_pcm ) ) == -EAGAIN )
{
- msleep( 1000000 );
+ vlc_restorecancel(canc);
+ msleep(CLOCK_FREQ); /* device still suspended, wait... */
+ canc = vlc_savecancel();
}
if( i_snd_rc < 0 )
- /* Device does not supprot resuming, restart it */
- i_snd_rc = snd_pcm_prepare( p_sys->p_snd_pcm );
+ /* Device does not support resuming, restart it */
+ i_snd_rc = snd_pcm_prepare( p_pcm );
}
if( i_snd_rc < 0 )
msg_Err( p_aout, "cannot write: %s", snd_strerror( i_snd_rc ) );
- aout_BufferFree( p_buffer );
+ vlc_restorecancel(canc);
+ vlc_cleanup_run();
return;
error:
if( i_snd_rc < 0 )
msg_Err( p_aout, "ALSA error: %s", snd_strerror( i_snd_rc ) );
- msleep( p_sys->i_period_time >> 1 );
-}
-static void GetDevicesForCard( module_config_t *p_item, int i_card );
-static void GetDevices( module_config_t *p_item );
+ vlc_restorecancel(canc);
+ msleep(p_sys->i_period_time / 2);
+}
/*****************************************************************************
* config variable callback
vlc_value_t newval, vlc_value_t oldval, void *p_unused )
{
module_config_t *p_item;
- int i;
(void)newval;
(void)oldval;
(void)p_unused;
/* Clear-up the current list */
if( p_item->i_list )
{
+ int i;
+
/* Keep the first entrie */
for( i = 1; i < p_item->i_list; i++ )
{
}
p_item->i_list = 1;
- GetDevices( p_item );
+ GetDevices( p_this, p_item );
/* Signal change to the interface */
p_item->b_dirty = true;
}
-static void GetDevicesForCard( module_config_t *p_item, int i_card )
+static void GetDevicesForCard( vlc_object_t *obj, module_config_t *p_item,
+ int i_card )
{
int i_pcm_device = -1;
int i_err = 0;
snd_pcm_info_t *p_pcm_info;
snd_ctl_t *p_ctl;
- char psz_dev[64];
+ char psz_dev[4 + 3 * sizeof(int)];
char *psz_card_name;
- sprintf( psz_dev, "hw:%i", i_card );
+ snprintf( psz_dev, sizeof (psz_dev), "hw:%u", i_card );
if( ( i_err = snd_ctl_open( &p_ctl, psz_dev, 0 ) ) < 0 )
return;
if( ( i_err = snd_ctl_pcm_info( p_ctl, p_pcm_info ) ) < 0 )
{
if( i_err != -ENOENT )
- {
- /*printf( "get_devices_for_card(): "
- "snd_ctl_pcm_info() "
- "failed (%d:%d): %s.\n", i_card,
- i_pcm_device, snd_strerror( -i_err ) );*/
- }
+ msg_Err( obj, "cannot get PCM device %d:%d infos: %s", i_card,
+ i_pcm_device, snd_strerror( -i_err ) );
continue;
}
- if( asprintf( &psz_device, "hw:%d,%d", i_card, i_pcm_device ) == -1 )
- break;
+ if( asprintf( &psz_device, "plughw:%u,%u", i_card, i_pcm_device ) == -1 )
+ continue;
if( asprintf( &psz_descr, "%s: %s (%s)", psz_card_name,
snd_pcm_info_get_name(p_pcm_info), psz_device ) == -1 )
{
free( psz_device );
- break;
+ continue;
}
- p_item->ppsz_list =
- (char **)realloc( p_item->ppsz_list,
- (p_item->i_list + 2) * sizeof(char *) );
- p_item->ppsz_list_text =
- (char **)realloc( p_item->ppsz_list_text,
- (p_item->i_list + 2) * sizeof(char *) );
- p_item->ppsz_list[ p_item->i_list ] = psz_device;
- p_item->ppsz_list_text[ p_item->i_list ] = psz_descr;
- p_item->i_list++;
- p_item->ppsz_list[ p_item->i_list ] = NULL;
- p_item->ppsz_list_text[ p_item->i_list ] = NULL;
+ msg_Dbg( obj, " %s", psz_descr );
+
+ if( p_item )
+ {
+ p_item->ppsz_list = xrealloc( p_item->ppsz_list,
+ (p_item->i_list + 2) * sizeof(char *) );
+ p_item->ppsz_list_text = xrealloc( p_item->ppsz_list_text,
+ (p_item->i_list + 2) * sizeof(char *) );
+ p_item->ppsz_list[ p_item->i_list ] = psz_device;
+ p_item->ppsz_list_text[ p_item->i_list ] = psz_descr;
+ p_item->i_list++;
+ p_item->ppsz_list[ p_item->i_list ] = NULL;
+ p_item->ppsz_list_text[ p_item->i_list ] = NULL;
+ }
+ else
+ {
+ free( psz_device );
+ free( psz_descr );
+ }
}
snd_ctl_close( p_ctl );
}
-
-static void GetDevices( module_config_t *p_item )
+static void GetDevices( vlc_object_t *obj, module_config_t *p_item )
{
int i_card = -1;
- int i_err = 0;
+ int i_err;
- if( ( i_err = snd_card_next( &i_card ) ) != 0 )
- {
- /*printf( "snd_card_next() failed: %s", snd_strerror( -i_err ) );*/
- return;
- }
+ msg_Dbg( obj, "Available alsa output devices:" );
+ while( (i_err = snd_card_next( &i_card )) == 0 && i_card > -1 )
+ GetDevicesForCard( obj, p_item, i_card );
- while( i_card > -1 )
- {
- GetDevicesForCard( p_item, i_card );
- if( ( i_err = snd_card_next( &i_card ) ) != 0 )
- {
- /*printf( "snd_card_next() failed: %s", snd_strerror( -i_err ) );*/
- break;
- }
- }
+ if( i_err )
+ msg_Err( obj, "cannot enumerate cards: %s", snd_strerror( -i_err ) );
}
projects / vlc / blobdiff