/*****************************************************************************
* alsa.c : alsa plugin for vlc
*****************************************************************************
- * Copyright (C) 2000-2001 the VideoLAN team
- * $Id$
+ * Copyright (C) 2000-2010 the VideoLAN team
+ * Copyright (C) 2009-2011 Rémi Denis-Courmont
*
* Authors: Henri Fallon <henri@videolan.org> - Original Author
* Jeffrey Baker <jwbaker@acm.org> - Port to ALSA 1.0 API
#include <vlc_common.h>
#include <vlc_plugin.h>
-
-#include <errno.h> /* ENOMEM */
#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>
*****************************************************************************/
struct aout_sys_t
{
+ aout_packet_t packet;
snd_pcm_t * p_snd_pcm;
unsigned int i_period_time;
*****************************************************************************/
static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
-static void Play ( aout_instance_t * );
+static void Play ( audio_output_t *, block_t * );
static void* ALSAThread ( void * );
-static void ALSAFill ( aout_instance_t * );
+static void ALSAFill ( audio_output_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 GetDevices( vlc_object_t *, module_config_t * );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-static const char *const ppsz_devices[] = { "default" };
-static const char *const ppsz_devices_text[] = { N_("Default") };
+static const char *const ppsz_devices[] = {
+ "default", "plug:front",
+ "plug:side", "plug:rear", "plug:center_lfe",
+ "plug:surround40", "plug:surround41",
+ "plug:surround50", "plug:surround51",
+ "plug:surround71",
+ "hdmi", "iec958",
+};
+static const char *const ppsz_devices_text[] = {
+ N_("Default"), N_("Front speakers"),
+ N_("Side speakers"), N_("Rear speakers"), N_("Center and subwoofer"),
+ N_("Surround 4.0"), N_("Surround 4.1"),
+ N_("Surround 5.0"), N_("Surround 5.1"),
+ N_("Surround 7.1"),
+ N_("HDMI"), N_("S/PDIF"),
+};
vlc_module_begin ()
set_shortname( "ALSA" )
set_description( N_("ALSA audio output") )
set_callbacks( Open, Close )
vlc_module_end ()
-/*****************************************************************************
- * Probe: probe the audio device for available formats and channels
- *****************************************************************************/
-static int Probe( aout_instance_t * p_aout,
- const char * psz_device, const char * psz_iec_device,
- int *pi_snd_pcm_format )
+/* VLC will insert a resampling filter in any case, so it is best to turn off
+ * ALSA (plug) resampling. */
+static const int mode = SND_PCM_NO_AUTO_RESAMPLE
+/* ALSA just discards extra channels. Not good. Disable it. */
+ | SND_PCM_NO_AUTO_CHANNELS
+/* VLC is currently unable to leverage ALSA softvol. Disable it. */
+ | SND_PCM_NO_SOFTVOL;
+
+/**
+ * Initializes list of devices.
+ */
+static void Probe (vlc_object_t *obj)
{
- struct aout_sys_t * p_sys = p_aout->output.p_sys;
- vlc_value_t val, text;
- int i_ret;
-
- 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 );
-
- /* We'll open the audio device in non blocking mode so we can just exit
- * when it is already in use, but for the real stuff we'll still use
- * the blocking mode */
-
- /* Now test linear PCM capabilities */
- 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;
- snd_pcm_hw_params_alloca (&p_hw);
-
- if ( snd_pcm_hw_params_any( p_sys->p_snd_pcm, p_hw ) < 0 )
- {
- msg_Warn( p_aout, "unable to retrieve initial hardware parameters"
- ", disabling linear PCM audio" );
- snd_pcm_close( p_sys->p_snd_pcm );
- var_Destroy( p_aout, "audio-device" );
- return VLC_EGENERIC;
- }
-
- if ( snd_pcm_hw_params_set_format( p_sys->p_snd_pcm, p_hw,
- *pi_snd_pcm_format ) < 0 )
- {
- int i_snd_rc = -1;
-
- if( *pi_snd_pcm_format != SND_PCM_FORMAT_S16 )
- {
- *pi_snd_pcm_format = SND_PCM_FORMAT_S16;
- i_snd_rc = snd_pcm_hw_params_set_format( p_sys->p_snd_pcm,
- p_hw, *pi_snd_pcm_format );
- }
- if ( i_snd_rc < 0 )
- {
- msg_Warn( p_aout, "unable to set stream sample size and "
- "word order, disabling linear PCM audio" );
- snd_pcm_close( p_sys->p_snd_pcm );
- var_Destroy( p_aout, "audio-device" );
- return VLC_EGENERIC;
- }
- }
-
- i_channels = aout_FormatNbChannels( &p_aout->output.output );
-
- while ( i_channels > 0 )
- {
- if ( !snd_pcm_hw_params_test_channels( p_sys->p_snd_pcm, p_hw,
- i_channels ) )
- {
- switch ( i_channels )
- {
- case 1:
- val.i_int = AOUT_VAR_MONO;
- text.psz_string = _("Mono");
- var_Change( p_aout, "audio-device",
- VLC_VAR_ADDCHOICE, &val, &text );
- break;
- case 2:
- val.i_int = AOUT_VAR_STEREO;
- text.psz_string = _("Stereo");
- var_Change( p_aout, "audio-device",
- VLC_VAR_ADDCHOICE, &val, &text );
- var_Set( p_aout, "audio-device", val );
- break;
- case 4:
- val.i_int = AOUT_VAR_2F2R;
- text.psz_string = _("2 Front 2 Rear");
- var_Change( p_aout, "audio-device",
- VLC_VAR_ADDCHOICE, &val, &text );
- break;
- case 6:
- val.i_int = AOUT_VAR_5_1;
- text.psz_string = (char *)"5.1";
- var_Change( p_aout, "audio-device",
- VLC_VAR_ADDCHOICE, &val, &text );
- break;
- }
- }
-
- --i_channels;
- }
-
- /* Special case for mono on stereo only boards */
- i_channels = aout_FormatNbChannels( &p_aout->output.output );
- var_Change( p_aout, "audio-device", VLC_VAR_CHOICESCOUNT, &val, NULL );
- if( val.i_int <= 0 && i_channels == 1 )
- {
- if ( !snd_pcm_hw_params_test_channels( p_sys->p_snd_pcm, p_hw, 2 ))
- {
- val.i_int = AOUT_VAR_STEREO;
- text.psz_string = (char*)N_("Stereo");
- var_Change( p_aout, "audio-device",
- VLC_VAR_ADDCHOICE, &val, &text );
- var_Set( p_aout, "audio-device", val );
- }
- }
+ /* Due to design bug in audio output core, this hack is required: */
+ if (var_Type (obj, "audio-device"))
+ return;
- /* Close the previously opened device */
- snd_pcm_close( p_sys->p_snd_pcm );
- }
- else if ( i_ret == -EBUSY )
- {
- msg_Warn( p_aout, "audio device: %s is already in use", psz_device );
- }
+ /* The variable does not exist - first call. */
+ vlc_value_t text;
- /* Test for S/PDIF device if needed */
- if ( psz_iec_device )
- {
- /* Opening the device should be enough */
- 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( var_InheritBool( p_aout, "spdif" ) )
- var_Set( p_aout, "audio-device", val );
-
- snd_pcm_close( p_sys->p_snd_pcm );
- }
- else if ( i_ret == -EBUSY )
- {
- msg_Warn( p_aout, "audio device: %s is already in use",
- psz_iec_device );
- }
- }
+ var_Create (obj, "audio-device", VLC_VAR_STRING | VLC_VAR_HASCHOICE);
+ text.psz_string = _("Audio Device");
+ var_Change (obj, "audio-device", VLC_VAR_SETTEXT, &text, NULL);
- 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. */
-#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" );
- GetDevices( VLC_OBJECT(p_aout), NULL );
- return VLC_EGENERIC;
- }
+ GetDevices (obj, NULL);
- /* Add final settings to the variable */
- var_AddCallback( p_aout, "audio-device", aout_ChannelsRestart, NULL );
- var_TriggerCallback( p_aout, "intf-change" );
- return VLC_SUCCESS;
+ var_AddCallback (obj, "audio-device", aout_ChannelsRestart, NULL);
+ var_TriggerCallback (obj, "intf-change");
}
/*****************************************************************************
* Note: the only heap-allocated string is psz_device. All the other pointers
* are references to psz_device or to stack-allocated data.
*****************************************************************************/
-static int Open( vlc_object_t *p_this )
+static int Open (vlc_object_t *obj)
{
- aout_instance_t * p_aout = (aout_instance_t *)p_this;
+ audio_output_t * p_aout = (audio_output_t *)obj;
- /* Allocate structures */
- aout_sys_t * p_sys = malloc( sizeof( aout_sys_t ) );
- if( p_sys == NULL )
+ /* Get device name */
+ char *psz_device;
+
+ if (var_Type (p_aout, "audio-device"))
+ psz_device = var_GetString (p_aout, "audio-device");
+ else
+ psz_device = var_InheritString( p_aout, "alsa-audio-device" );
+ if (unlikely(psz_device == NULL))
return VLC_ENOMEM;
- p_aout->output.p_sys = p_sys;
- /* Get device name */
- char *psz_device = var_InheritString( p_aout, "alsa-audio-device" );
- if( unlikely(psz_device == NULL) )
+ snd_pcm_format_t pcm_format; /* ALSA sample format */
+ vlc_fourcc_t fourcc = p_aout->format.i_format;
+ bool spdif = false;
+
+ switch (fourcc)
{
- free( p_sys );
- return VLC_EGENERIC;
+ case VLC_CODEC_F64B:
+ pcm_format = SND_PCM_FORMAT_FLOAT64_BE;
+ break;
+ case VLC_CODEC_F64L:
+ pcm_format = SND_PCM_FORMAT_FLOAT64_LE;
+ break;
+ case VLC_CODEC_F32B:
+ pcm_format = SND_PCM_FORMAT_FLOAT_BE;
+ break;
+ case VLC_CODEC_F32L:
+ pcm_format = SND_PCM_FORMAT_FLOAT_LE;
+ break;
+ case VLC_CODEC_FI32:
+ fourcc = VLC_CODEC_FL32;
+ pcm_format = SND_PCM_FORMAT_FLOAT;
+ break;
+ case VLC_CODEC_S32B:
+ pcm_format = SND_PCM_FORMAT_S32_BE;
+ break;
+ case VLC_CODEC_S32L:
+ pcm_format = SND_PCM_FORMAT_S32_LE;
+ break;
+ case VLC_CODEC_S24B:
+ pcm_format = SND_PCM_FORMAT_S24_3BE;
+ break;
+ case VLC_CODEC_S24L:
+ pcm_format = SND_PCM_FORMAT_S24_3LE;
+ break;
+ case VLC_CODEC_U24B:
+ pcm_format = SND_PCM_FORMAT_U24_3BE;
+ break;
+ case VLC_CODEC_U24L:
+ pcm_format = SND_PCM_FORMAT_U24_3LE;
+ break;
+ case VLC_CODEC_S16B:
+ pcm_format = SND_PCM_FORMAT_S16_BE;
+ break;
+ case VLC_CODEC_S16L:
+ pcm_format = SND_PCM_FORMAT_S16_LE;
+ break;
+ case VLC_CODEC_U16B:
+ pcm_format = SND_PCM_FORMAT_U16_BE;
+ break;
+ case VLC_CODEC_U16L:
+ pcm_format = SND_PCM_FORMAT_U16_LE;
+ break;
+ case VLC_CODEC_S8:
+ pcm_format = SND_PCM_FORMAT_S8;
+ break;
+ case VLC_CODEC_U8:
+ pcm_format = SND_PCM_FORMAT_U8;
+ break;
+ default:
+ if (AOUT_FMT_NON_LINEAR(&p_aout->format))
+ spdif = var_InheritBool (p_aout, "spdif");
+ if (HAVE_FPU)
+ {
+ fourcc = VLC_CODEC_FL32;
+ pcm_format = SND_PCM_FORMAT_FLOAT;
+ }
+ else
+ {
+ fourcc = VLC_CODEC_S16N;
+ pcm_format = SND_PCM_FORMAT_S16;
+ }
}
/* Choose the IEC device for S/PDIF output:
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. */
- char *psz_iec_device = NULL;
- if( AOUT_FMT_NON_LINEAR( &p_aout->output.output ) )
+ if (spdif && !strcmp (psz_device, DEFAULT_ALSA_DEVICE))
{
- if( !strcmp( psz_device, DEFAULT_ALSA_DEVICE ) )
- {
- unsigned aes3;
+ 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;
+ switch (p_aout->format.i_rate)
+ {
+#define FS(freq) \
+ case freq: aes3 = IEC958_AES3_CON_FS_ ## freq; break;
+ FS( 44100) /* def. */ FS( 48000) FS( 32000)
+ FS( 22050) FS( 24000)
+ FS( 88200) FS(768000) FS( 96000)
+ FS(176400) FS(192000)
+#undef FS
+ default:
+ aes3 = IEC958_AES3_CON_FS_NOTID;
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) */
- int i_snd_pcm_format; /* Audio format for ALSA's data */
- if( HAVE_FPU )
- i_snd_pcm_format = SND_PCM_FORMAT_FLOAT;
- else
- 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 ) )
- {
- free( psz_iec_device );
- free( psz_device );
- free( p_sys );
- return VLC_EGENERIC;
+ free (psz_device);
+ if (asprintf (&psz_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)
+ return VLC_ENOMEM;
}
- bool spdif = false;
- switch( var_GetInteger( p_aout, "audio-device") )
+ /* Allocate structures */
+ aout_sys_t *p_sys = malloc (sizeof (*p_sys));
+ if (unlikely(p_sys == NULL))
{
- 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" );
- 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" );
- break;
- case AOUT_VAR_STEREO:
- p_aout->output.output.i_physical_channels
- = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT;
- break;
- case AOUT_VAR_MONO:
- p_aout->output.output.i_physical_channels = AOUT_CHAN_CENTER;
- 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, "cannot find audio-device" );
- free( psz_iec_device );
- free( psz_device );
- free( p_sys );
- return VLC_EGENERIC;
+ free (psz_device);
+ return VLC_ENOMEM;
}
+ p_aout->sys = p_sys;
#ifdef ALSA_DEBUG
snd_output_stdio_attach( &p_sys->p_snd_stderr, stderr, 0 );
/* Open the device */
msg_Dbg( p_aout, "opening ALSA device `%s'", psz_device );
int val = snd_pcm_open (&p_sys->p_snd_pcm, psz_device,
- SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK);
+ SND_PCM_STREAM_PLAYBACK, mode);
+#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 != 0 && var_GetBool (p_aout->p_libvlc, "alsa-working"))
+ dialog_Fatal (p_aout, "ALSA version problem",
+ "VLC failed to re-initialize your audio output device.\n"
+ "Please update alsa-lib to version 1.0.22 or higher "
+ "to fix this issue.");
+ var_SetBool (p_aout->p_libvlc, "alsa-working", !val);
+#endif
if (val != 0)
{
+#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 audio output device (if any).\n"
+ "Please update alsa-lib to version 1.0.24 or higher "
+ "to try to fix this issue.");
+ }
+#endif
msg_Err (p_aout, "cannot open ALSA device `%s' (%s)",
psz_device, snd_strerror (val));
dialog_Fatal (p_aout, _("Audio output failed"),
}
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;
+ unsigned channels;
- if( spdif )
+ if (spdif)
{
+ fourcc = VLC_CODEC_SPDIFL;
i_buffer_size = ALSA_SPDIF_BUFFER_SIZE;
- i_snd_pcm_format = SND_PCM_FORMAT_S16;
- i_channels = 2;
+ pcm_format = SND_PCM_FORMAT_S16;
+ channels = 2;
- 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;
+ i_period_size = ALSA_SPDIF_PERIOD_SIZE;
+ p_aout->format.i_bytes_per_frame = AOUT_SPDIF_SIZE;
+ p_aout->format.i_frame_length = A52_FRAME_NB;
aout_VolumeNoneInit( p_aout );
}
else
{
i_buffer_size = ALSA_DEFAULT_BUFFER_SIZE;
- i_channels = aout_FormatNbChannels( &p_aout->output.output );
+ channels = aout_FormatNbChannels( &p_aout->format );
- p_aout->output.i_nb_samples = i_period_size = ALSA_DEFAULT_PERIOD_SIZE;
+ i_period_size = ALSA_DEFAULT_PERIOD_SIZE;
aout_VolumeSoftInit( p_aout );
}
- p_aout->output.pf_play = Play;
+ p_aout->pf_play = Play;
+ p_aout->pf_pause = aout_PacketPause;
+ p_aout->pf_flush = aout_PacketFlush;
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 */
-retry:
/* Get Initial hardware parameters */
val = snd_pcm_hw_params_any( p_sys->p_snd_pcm, p_hw );
if( val < 0 )
}
/* Set format. */
- val = snd_pcm_hw_params_set_format( p_sys->p_snd_pcm, p_hw,
- i_snd_pcm_format );
+ val = snd_pcm_hw_params_set_format (p_sys->p_snd_pcm, p_hw, pcm_format);
if( val < 0 )
{
- if( i_snd_pcm_format != SND_PCM_FORMAT_S16 )
- {
- 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 );
- }
- if ( val < 0 )
- {
- msg_Err( p_aout, "unable to set stream sample size and "
- "word order (%s)", snd_strerror( val ) );
- goto error;
- }
+ msg_Err (p_aout, "cannot set sample format: %s", snd_strerror (val));
+ goto error;
}
- 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:
- i_vlc_pcm_format = VLC_CODEC_FL32;
- break;
- 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;
-
val = snd_pcm_hw_params_set_access( p_sys->p_snd_pcm, p_hw,
SND_PCM_ACCESS_RW_INTERLEAVED );
if( val < 0 )
}
/* Set channels. */
- val = snd_pcm_hw_params_set_channels( p_sys->p_snd_pcm, p_hw, i_channels );
- if( val < 0 )
+ val = snd_pcm_hw_params_set_channels (p_sys->p_snd_pcm, p_hw, channels);
+ if (val < 0 && channels > 2) /* Fallback to stereo */
+ {
+ val = snd_pcm_hw_params_set_channels (p_sys->p_snd_pcm, p_hw, 2);
+ channels = 2;
+ }
+ if (val < 0)
{
msg_Err( p_aout, "unable to set number of output channels (%s)",
snd_strerror( val ) );
}
/* 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 )
+ unsigned rate = p_aout->format.i_rate;
+ val = snd_pcm_hw_params_set_rate_near (p_sys->p_snd_pcm, p_hw, &rate,
+ NULL);
+ if (val < 0)
{
- 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 );
+ msg_Err (p_aout, "unable to set sampling rate (%s)",
+ snd_strerror (val));
+ goto error;
}
+ if (p_aout->format.i_rate != rate)
+ msg_Warn (p_aout, "resampling from %d Hz to %d Hz",
+ p_aout->format.i_rate, rate);
/* Set period size. */
val = snd_pcm_hw_params_set_period_size_near( p_sys->p_snd_pcm, p_hw,
snd_strerror( val ) );
goto error;
}
- p_aout->output.i_nb_samples = i_period_size;
/* Set buffer size. */
val = snd_pcm_hw_params_set_buffer_size_near( p_sys->p_snd_pcm, p_hw,
val = snd_pcm_hw_params( p_sys->p_snd_pcm, p_hw );
if( val < 0 )
{
- if( i_snd_pcm_format == SND_PCM_FORMAT_FLOAT )
- {
- 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;
/* Get Initial software parameters */
snd_pcm_sw_params_current( p_sys->p_snd_pcm, p_sw );
- 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, i_period_size );
/* start playing when one period has been written */
val = snd_pcm_sw_params_set_start_threshold( p_sys->p_snd_pcm, p_sw,
ALSA_DEFAULT_PERIOD_SIZE);
p_sys->start_date = 0;
vlc_sem_init( &p_sys->wait, 0 );
+ aout_PacketInit (p_aout, &p_sys->packet, i_period_size);
/* Create ALSA thread and wait for its readiness. */
if( vlc_clone( &p_sys->thread, ALSAThread, p_aout,
goto error;
}
+ p_aout->format.i_format = fourcc;
+ p_aout->format.i_rate = rate;
+ if (channels == 2)
+ p_aout->format.i_physical_channels = AOUT_CHAN_LEFT|AOUT_CHAN_RIGHT;
+
+ Probe (obj);
return 0;
error:
return VLC_EGENERIC;
}
-static void PlayIgnore( aout_instance_t *p_aout )
-{ /* Already playing - nothing to do */
- (void) p_aout;
-}
-
/*****************************************************************************
* Play: start playback
*****************************************************************************/
-static void Play( aout_instance_t *p_aout )
+static void Play( audio_output_t *p_aout, block_t *block )
{
- 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 );
+ p_aout->sys->start_date = block->i_pts;
+
+ aout_PacketPlay( p_aout, block );
+ p_aout->pf_play = aout_PacketPlay;
/* wake up the audio output thread */
- sem_post( &p_aout->output.p_sys->wait );
+ sem_post( &p_aout->sys->wait );
}
/*****************************************************************************
* Close: close the ALSA device
*****************************************************************************/
-static void Close( vlc_object_t *p_this )
+static void Close (vlc_object_t *obj)
{
- aout_instance_t *p_aout = (aout_instance_t *)p_this;
- struct aout_sys_t * p_sys = p_aout->output.p_sys;
+ audio_output_t *p_aout = (audio_output_t *)obj;
+ struct aout_sys_t * p_sys = p_aout->sys;
/* Make sure that the thread will stop once it is waken up */
vlc_cancel( p_sys->thread );
vlc_join( p_sys->thread, NULL );
vlc_sem_destroy( &p_sys->wait );
+ aout_PacketDestroy (p_aout);
snd_pcm_drop( p_sys->p_snd_pcm );
snd_pcm_close( p_sys->p_snd_pcm );
*****************************************************************************/
static void* ALSAThread( void *data )
{
- aout_instance_t * p_aout = data;
- struct aout_sys_t * p_sys = p_aout->output.p_sys;
+ audio_output_t * p_aout = data;
+ struct aout_sys_t * p_sys = p_aout->sys;
/* Wait for the exact time to start playing (avoids resampling) */
vlc_sem_wait( &p_sys->wait );
- mwait( p_sys->start_date - AOUT_PTS_TOLERANCE / 4 );
+ mwait( p_sys->start_date - AOUT_MAX_PTS_ADVANCE / 4 );
+#warning Should wait for buffer availability instead!
for(;;)
ALSAFill( p_aout );
/*****************************************************************************
* ALSAFill: function used to fill the ALSA buffer as much as possible
*****************************************************************************/
-static void ALSAFill( aout_instance_t * p_aout )
+static void ALSAFill( audio_output_t * p_aout )
{
- struct aout_sys_t * p_sys = p_aout->output.p_sys;
+ struct aout_sys_t * p_sys = p_aout->sys;
snd_pcm_t *p_pcm = p_sys->p_snd_pcm;
snd_pcm_status_t * p_status;
int i_snd_rc;
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->format.i_bytes_per_frame
+ / p_aout->format.i_rate
+ * p_aout->format.i_frame_length;
#ifdef ALSA_DEBUG
snd_pcm_state_t state = snd_pcm_status_get_state( p_status );
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, "Bytes per frame: %d", p_aout->format.i_bytes_per_frame );
+ msg_Dbg( p_aout, "Rate: %d", p_aout->format.i_rate );
+ msg_Dbg( p_aout, "Frame length: %d", p_aout->format.i_frame_length );
msg_Dbg( p_aout, "Next date: in %"PRId64" microseconds", delay_us );
#endif
next_date = mdate() + delay_us;
}
block_t *p_buffer = aout_OutputNextBuffer( p_aout, next_date,
- (p_aout->output.output.i_format == VLC_CODEC_SPDIFL) );
+ (p_aout->format.i_format == VLC_CODEC_SPDIFL) );
/* Audio output buffer shortage -> stop the fill process and wait */
if( p_buffer == NULL )
for (size_t i = 0; hints[i] != NULL; i++)
{
void *hint = hints[i];
+ char *dev;
+
char *name = snd_device_name_get_hint(hint, "NAME");
if (unlikely(name == NULL))
continue;
+ if (unlikely(asprintf (&dev, "plug:'%s'", name) == -1))
+ {
+ free(name);
+ continue;
+ }
char *desc = snd_device_name_get_hint(hint, "DESC");
if (desc != NULL)
for (char *lf = strchr(desc, '\n'); lf; lf = strchr(lf, '\n'))
*lf = ' ';
- msg_Dbg(obj, " %s (%s)", (desc != NULL) ? desc : name, name);
+ msg_Dbg(obj, "%s (%s)", (desc != NULL) ? desc : name, name);
if (item != NULL)
{
(item->i_list + 2) * sizeof(char *));
item->ppsz_list_text = xrealloc(item->ppsz_list_text,
(item->i_list + 2) * sizeof(char *));
- item->ppsz_list[item->i_list] = name;
+ item->ppsz_list[item->i_list] = dev;
if (desc == NULL)
desc = strdup(name);
item->ppsz_list_text[item->i_list] = desc;
}
else
{
+ vlc_value_t val, text;
+
+ val.psz_string = dev;
+ text.psz_string = desc;
+ var_Change(obj, "audio-device", VLC_VAR_ADDCHOICE, &val, &text);
free(desc);
+ free(dev);
free(name);
}
}
projects / vlc / blobdiff