X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_output%2Falsa.c;h=89a2838958eed1f48db6e3b68a7ff762880c32ce;hb=1af1b86864e7d6ef241011b8e97941ed673fd5ad;hp=fb2f45c1aae6e7555cd09d2c27a7e54b8198d03d;hpb=51bbf793131496c6f31f70953ff434f17be80d63;p=vlc diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c index fb2f45c1aa..89a2838958 100644 --- a/modules/audio_output/alsa.c +++ b/modules/audio_output/alsa.c @@ -1,8 +1,8 @@ /***************************************************************************** * 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 - Original Author * Jeffrey Baker - Port to ALSA 1.0 API @@ -24,92 +24,64 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -/***************************************************************************** - * Preamble - *****************************************************************************/ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include + #include #include - -#include /* ENOMEM */ #include - #include +#include -/* 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 +#include -/*#define ALSA_DEBUG*/ - -/***************************************************************************** - * aout_sys_t: ALSA audio output method descriptor - ***************************************************************************** - * This structure is part of the audio output thread descriptor. - * It describes the ALSA specific properties of an audio device. - *****************************************************************************/ +/** Private data for an ALSA PCM playback stream */ struct aout_sys_t { - snd_pcm_t * p_snd_pcm; - unsigned int i_period_time; - -#ifdef 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; + snd_pcm_t *pcm; }; #define A52_FRAME_NB 1536 -/* These values are in frames. - To convert them to a number of bytes you have to multiply them by the - number of channel(s) (eg. 2 for stereo) and the size of a sample (eg. - 2 for int16_t). */ -#define ALSA_DEFAULT_PERIOD_SIZE 1024 -#define ALSA_DEFAULT_BUFFER_SIZE ( ALSA_DEFAULT_PERIOD_SIZE << 8 ) -#define ALSA_SPDIF_PERIOD_SIZE A52_FRAME_NB -#define ALSA_SPDIF_BUFFER_SIZE ( ALSA_SPDIF_PERIOD_SIZE << 4 ) -/* Why << 4 ? --Meuuh */ -/* Why not ? --Bozo */ -/* Right. --Meuuh */ - -#define DEFAULT_ALSA_DEVICE N_("default") - /***************************************************************************** * Local prototypes *****************************************************************************/ -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 ALSAFill ( aout_instance_t * ); +static int Open (vlc_object_t *); +static void Close (vlc_object_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_category( CAT_AUDIO ) set_subcategory( SUBCAT_AUDIO_AOUT ) - add_string( "alsa-audio-device", DEFAULT_ALSA_DEVICE, aout_FindAndRestart, - N_("ALSA Device Name"), NULL, false ) + add_string ("alsa-audio-device", "default", N_("ALSA device"), NULL, false) add_deprecated_alias( "alsadev" ) /* deprecated since 0.9.3 */ change_string_list( ppsz_devices, ppsz_devices_text, FindDevicesCallback ) change_action_add( FindDevicesCallback, N_("Refresh list") ) @@ -118,797 +90,540 @@ vlc_module_begin () set_callbacks( Open, Close ) vlc_module_end () -/***************************************************************************** - * 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 ) -{ - 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 ); +/** Helper for ALSA -> VLC debugging output */ +static void Dump (vlc_object_t *obj, const char *msg, + int (*cb)(void *, snd_output_t *), void *p) +{ + snd_output_t *output; + char *str; - /* 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 */ + if (unlikely(snd_output_buffer_open (&output))) + return; - /* 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 ) ) ) + int val = cb (p, output); + if (val) { - 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; - } - - 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; - } - } - - 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 = "5.1"; - var_Change( p_aout, "audio-device", - VLC_VAR_ADDCHOICE, &val, &text ); - break; - } - } + msg_Warn (obj, "cannot get info: %s", snd_strerror (val)); + return; + } - --i_channels; - } + size_t len = snd_output_buffer_string (output, &str); + if (len > 0 && str[len - 1]) + len--; /* strip trailing newline */ + msg_Dbg (obj, "%s%.*s", msg, (int)len, str); + snd_output_close (output); +} +#define Dump(o, m, cb, p) \ + Dump(VLC_OBJECT(o), m, (int (*)(void *, snd_output_t *))(cb), p) - /* 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 ); - } - } +static void DumpDevice (vlc_object_t *obj, snd_pcm_t *pcm) +{ + snd_pcm_info_t *info; - /* Close the previously opened device */ - snd_pcm_close( p_sys->p_snd_pcm ); - } - else if ( i_ret == -EBUSY ) + Dump (obj, " ", snd_pcm_dump, pcm); + snd_pcm_info_alloca (&info); + if (snd_pcm_info (pcm, info) == 0) { - msg_Warn( p_aout, "audio device: %s is already in use", psz_device ); - } - - /* Test for S/PDIF device if needed */ - 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 ) ) ) - { - 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" ) ) - 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 ); - } + msg_Dbg (obj, " device name : %s", snd_pcm_info_get_name (info)); + msg_Dbg (obj, " device ID : %s", snd_pcm_info_get_id (info)); + msg_Dbg (obj, " subdevice name: %s", + snd_pcm_info_get_subdevice_name (info)); } +} - var_Change( p_aout, "audio-device", VLC_VAR_CHOICESCOUNT, &val, NULL ); - if( val.i_int <= 0 ) - { - /* Probe() has failed. */ - msg_Dbg( p_aout, "failed to find a useable alsa configuration" ); - var_Destroy( p_aout, "audio-device" ); - return; - } +static void DumpDeviceStatus (vlc_object_t *obj, snd_pcm_t *pcm) +{ + snd_pcm_status_t *status; - /* Add final settings to the variable */ - var_AddCallback( p_aout, "audio-device", aout_ChannelsRestart, NULL ); - var_SetBool( p_aout, "intf-change", true ); + snd_pcm_status_alloca (&status); + snd_pcm_status (pcm, status); + Dump (obj, "current status:\n", snd_pcm_status_dump, status); } +#define DumpDeviceStatus(o, p) DumpDeviceStatus(VLC_OBJECT(o), p) -/***************************************************************************** - * Open: create a handle and open an alsa device - ***************************************************************************** - * This function opens an alsa device, through the alsa API. - * - * 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 ) +/** + * Initializes list of devices. + */ +static void Probe (vlc_object_t *obj) { - aout_instance_t * p_aout = (aout_instance_t *)p_this; - struct aout_sys_t * p_sys; - vlc_value_t val; + /* Due to design bug in audio output core, this hack is required: */ + if (var_Type (obj, "audio-device")) + return; - 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 */ + /* The variable does not exist - first call. */ + vlc_value_t text; - int i_vlc_pcm_format; /* Audio format for VLC's data */ - int i_snd_pcm_format; /* Audio format for ALSA's data */ + 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); - snd_pcm_uframes_t i_buffer_size = 0; - snd_pcm_uframes_t i_period_size = 0; - int i_channels = 0; + GetDevices (obj, NULL); - snd_pcm_hw_params_t *p_hw; - snd_pcm_sw_params_t *p_sw; + var_AddCallback (obj, "audio-device", aout_ChannelsRestart, NULL); + var_TriggerCallback (obj, "intf-change"); +} - 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 ) ); - 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 ); +static void Play (audio_output_t *, block_t *); +static void Pause (audio_output_t *, bool, mtime_t); +static void PauseDummy (audio_output_t *, bool, mtime_t); +static void Flush (audio_output_t *, bool); + +/** Initializes an ALSA playback stream */ +static int Open (vlc_object_t *obj) +{ + audio_output_t *aout = (audio_output_t *)obj; /* Get device name */ - if( (psz_device = config_GetPsz( p_aout, "alsa-audio-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; - } + char *device; - /* Choose the IEC device for S/PDIF output: - if the device is overriden 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 ) ) - { - 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; - } + if (var_Type (aout, "audio-device")) + device = var_GetString (aout, "audio-device"); else - { - psz_iec_device = NULL; - } + device = var_InheritString (aout, "alsa-audio-device"); + if (unlikely(device == NULL)) + return VLC_ENOMEM; - /* 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; - i_snd_pcm_format = SND_PCM_FORMAT_FLOAT; - } - else - { - i_vlc_pcm_format = VLC_CODEC_S16N; - i_snd_pcm_format = SND_PCM_FORMAT_S16; - } + snd_pcm_format_t pcm_format; /* ALSA sample format */ + vlc_fourcc_t fourcc = aout->format.i_format; + bool spdif = false; - /* 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 ) + switch (fourcc) { - Probe( p_aout, psz_device, psz_iec_device, &i_snd_pcm_format ); + 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_SPDIF(&aout->format)) + spdif = var_InheritBool (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; + } } - if ( var_Get( p_aout, "audio-device", &val ) < 0 ) + /* 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. */ + if (spdif && !strcmp (device, "default")) { - free( p_sys ); - free( psz_device ); - return VLC_EGENERIC; - } + unsigned aes3; - p_aout->output.output.i_format = i_vlc_pcm_format; - 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; - free( psz_device ); - psz_device = strdup( "surround51" ); - } - 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; - free( psz_device ); - psz_device = strdup( "surround40" ); - } - else if ( val.i_int == AOUT_VAR_STEREO ) - { - p_aout->output.output.i_physical_channels - = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT; - } - else if ( val.i_int == AOUT_VAR_MONO ) - { - p_aout->output.output.i_physical_channels = AOUT_CHAN_CENTER; + switch (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; + } + + free (device); + if (asprintf (&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; } - else if( val.i_int != AOUT_VAR_SPDIF ) + + /* Allocate structures */ + aout_sys_t *sys = malloc (sizeof (*sys)); + if (unlikely(sys == NULL)) { - /* This should not happen ! */ - msg_Err( p_aout, "internal: can't find audio-device (%i)", val.i_int ); - free( p_sys ); - free( psz_device ); - return VLC_EGENERIC; + free (device); + return VLC_ENOMEM; } - -#ifdef ALSA_DEBUG - snd_output_stdio_attach( &p_sys->p_snd_stderr, stderr, 0 ); -#endif + aout->sys = sys; /* Open the device */ - if ( val.i_int == AOUT_VAR_SPDIF ) + snd_pcm_t *pcm; + /* VLC always has a resampler. No need for ALSA's. */ + const int mode = SND_PCM_NO_AUTO_RESAMPLE + /* ALSA discards extra channels (by default). This is not good. */ + | SND_PCM_NO_AUTO_CHANNELS + /* VLC is currently unable to leverage ALSA softvol. No need for it. */ + | SND_PCM_NO_SOFTVOL; + + int val = snd_pcm_open (&pcm, device, SND_PCM_STREAM_PLAYBACK, mode); +#if (SND_LIB_VERSION <= 0x010015) +# warning Please update alsa-lib to version > 1.0.21a. + var_Create (aout->p_libvlc, "alsa-working", VLC_VAR_BOOL); + if (val != 0 && var_GetBool (aout->p_libvlc, "alsa-working")) + dialog_Fatal (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 (aout->p_libvlc, "alsa-working", !val); +#endif + if (val != 0) { - if ( ( i_snd_rc = snd_pcm_open( &p_sys->p_snd_pcm, psz_iec_device, - SND_PCM_STREAM_PLAYBACK, 0 ) ) < 0 ) +#if (SND_LIB_VERSION <= 0x010017) +# warning Please update alsa-lib to version > 1.0.23. + var_Create (aout->p_libvlc, "alsa-broken", VLC_VAR_BOOL); + if (!var_GetBool (aout->p_libvlc, "alsa-broken")) { - msg_Err( p_aout, "cannot open ALSA device `%s' (%s)", - psz_iec_device, snd_strerror( i_snd_rc ) ); - dialog_Fatal( p_aout, _("Audio output failed"), - _("VLC could not open the ALSA device \"%s\" (%s)."), - psz_iec_device, snd_strerror( i_snd_rc ) ); - free( p_sys ); - free( psz_device ); - return VLC_EGENERIC; + var_SetBool (aout->p_libvlc, "alsa-broken", true); + dialog_Fatal (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."); } - 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; - - aout_VolumeNoneInit( p_aout ); +#endif + msg_Err (aout, "cannot open ALSA device \"%s\": %s", device, + snd_strerror (val)); + dialog_Fatal (aout, _("Audio output failed"), + _("The audio device \"%s\" could not be used:\n%s."), + device, snd_strerror (val)); + free (device); + free (sys); + return VLC_EGENERIC; } - else - { - int i; + sys->pcm = pcm; - msg_Dbg( p_aout, "opening ALSA device `%s'", psz_device ); + /* Print some potentially useful debug */ + msg_Dbg (aout, "using ALSA device: %s", device); + free (device); + DumpDevice (VLC_OBJECT(aout), pcm); - /* 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. */ + /* Setup */ + unsigned channels = aout_FormatNbChannels (&aout->format); - 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 ); - - p_aout->output.i_nb_samples = i_period_size = ALSA_DEFAULT_PERIOD_SIZE; - - aout_VolumeSoftInit( p_aout ); + if (spdif) + { + fourcc = VLC_CODEC_SPDIFL; + pcm_format = SND_PCM_FORMAT_S16; + channels = 2; } - /* Free psz_device so that all the remaining data is stack-allocated */ - free( psz_device ); - - p_aout->output.pf_play = Play; + /* Get Initial hardware parameters */ + snd_pcm_hw_params_t *hw; + unsigned param; - snd_pcm_hw_params_alloca(&p_hw); - snd_pcm_sw_params_alloca(&p_sw); + snd_pcm_hw_params_alloca (&hw); + snd_pcm_hw_params_any (pcm, hw); + Dump (aout, "initial hardware setup:\n", snd_pcm_hw_params_dump, hw); - /* 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 ) + /* Set sample format */ + val = snd_pcm_hw_params_set_format (pcm, hw, pcm_format); + if (val < 0) { - b_retry = false; - - /* Get Initial hardware parameters */ - if ( ( i_snd_rc = snd_pcm_hw_params_any( p_sys->p_snd_pcm, p_hw ) ) < 0 ) - { - msg_Err( p_aout, "unable to retrieve initial hardware parameters (%s)", - snd_strerror( i_snd_rc ) ); - goto error; - } - - /* 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( 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; - } - } - if( i_vlc_pcm_format != VLC_CODEC_SPDIFL ) - 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; - } - 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; - } - - /* 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 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 ); - } + /* TODO: fallback to FL32 / S16N */ + msg_Err (aout, "cannot set sample format: %s", snd_strerror (val)); + goto error; + } - /* 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; - } + val = snd_pcm_hw_params_set_access (pcm, hw, + SND_PCM_ACCESS_RW_INTERLEAVED); + if (val) + { + msg_Err (aout, "cannot set access mode: %s", snd_strerror (val)); + goto error; + } - /* Commit hardware parameters. */ - if ( ( i_snd_rc = snd_pcm_hw_params( p_sys->p_snd_pcm, p_hw ) ) < 0 ) - { - 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 = VLC_CODEC_S16N; - 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; - } - } + /* Set channels count */ + val = snd_pcm_hw_params_set_channels (pcm, hw, channels); + if (val && channels > 2) /* Fallback to stereo */ + { + val = snd_pcm_hw_params_set_channels (pcm, hw, 2); + channels = 2; + } + if (val) + { + msg_Err (aout, "cannot set channels count: %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 + /* Set sample rate */ + unsigned rate = aout->format.i_rate; + val = snd_pcm_hw_params_set_rate_near (pcm, hw, &rate, NULL); + if (val) { - msg_Err( p_aout, "unable to get period time (%s)", - snd_strerror( i_snd_rc ) ); + msg_Err (aout, "cannot set sample rate: %s", snd_strerror (val)); + goto error; + } + if (aout->format.i_rate != rate) + msg_Dbg (aout, "resampling from %d Hz to %d Hz", + aout->format.i_rate, rate); + + /* Set buffer size */ + param = AOUT_MAX_ADVANCE_TIME; + val = snd_pcm_hw_params_set_buffer_time_near (pcm, hw, ¶m, NULL); + if (val) + msg_Warn (aout, "cannot set buffer duration near %u us: %s", + param, snd_strerror (val)); + val = snd_pcm_hw_params_set_buffer_time_last (pcm, hw, ¶m, NULL); + if (val) + msg_Warn (aout, "cannot set buffer duration: %s", snd_strerror (val)); + + /* Set number of periods (at least two) */ + param = 2; + val = snd_pcm_hw_params_set_periods_min (pcm, hw, ¶m, NULL); + if (val) + msg_Warn (aout, "cannot set minimum of %u periods: %s", param, + snd_strerror (val)); + val = snd_pcm_hw_params_set_periods_first (pcm, hw, ¶m, NULL); + if (val) + msg_Warn (aout, "cannot set periods count near %u: %s", param, + snd_strerror (val)); + + /* Commit hardware parameters */ + val = snd_pcm_hw_params (pcm, hw); + if (val < 0) + { + msg_Err (aout, "cannot commit hardware parameters: %s", + snd_strerror (val)); goto error; } + Dump (aout, "final HW setup:\n", snd_pcm_hw_params_dump, hw); /* Get Initial software parameters */ - snd_pcm_sw_params_current( p_sys->p_snd_pcm, p_sw ); + snd_pcm_sw_params_t *sw; - i_snd_rc = snd_pcm_sw_params_set_sleep_min( p_sys->p_snd_pcm, p_sw, 0 ); + snd_pcm_sw_params_alloca (&sw); + snd_pcm_sw_params_current (pcm, sw); + Dump (aout, "initial software parameters:\n", snd_pcm_sw_params_dump, sw); - i_snd_rc = 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 ) + /* START REVISIT */ + //snd_pcm_sw_params_set_avail_min( pcm, sw, i_period_size ); + // FIXME: useful? + val = snd_pcm_sw_params_set_start_threshold (pcm, sw, 1); + if( val < 0 ) { - msg_Err( p_aout, "unable to set start threshold (%s)", - snd_strerror( i_snd_rc ) ); + msg_Err( aout, "unable to set start threshold (%s)", + snd_strerror( val ) ); goto error; } + /* END REVISIT */ /* Commit software parameters. */ - if ( snd_pcm_sw_params( p_sys->p_snd_pcm, p_sw ) < 0 ) + val = snd_pcm_sw_params (pcm, sw); + if (val) { - msg_Err( p_aout, "unable to set software configuration" ); + msg_Err (aout, "cannot commit software parameters: %s", + snd_strerror (val)); goto error; } + Dump (aout, "final software parameters:\n", snd_pcm_sw_params_dump, sw); -#ifdef ALSA_DEBUG - snd_output_printf( p_sys->p_snd_stderr, "\nALSA hardware setup:\n\n" ); - snd_pcm_dump_hw_setup( p_sys->p_snd_pcm, p_sys->p_snd_stderr ); - snd_output_printf( p_sys->p_snd_stderr, "\nALSA software setup:\n\n" ); - snd_pcm_dump_sw_setup( p_sys->p_snd_pcm, p_sys->p_snd_stderr ); - snd_output_printf( p_sys->p_snd_stderr, "\n" ); -#endif - - /* Create ALSA thread and wait for its readiness. */ - if( vlc_thread_create( p_aout, "aout", ALSAThread, - VLC_THREAD_PRIORITY_OUTPUT ) ) + val = snd_pcm_prepare (pcm); + if (val) { - msg_Err( p_aout, "cannot create ALSA thread (%m)" ); + msg_Err (aout, "cannot prepare device: %s", snd_strerror (val)); goto error; } - return 0; - -error: - snd_pcm_close( p_sys->p_snd_pcm ); -#ifdef ALSA_DEBUG - snd_output_close( p_sys->p_snd_stderr ); -#endif - free( p_sys ); - return VLC_EGENERIC; -} - -/***************************************************************************** - * Play: nothing to do - *****************************************************************************/ -static void Play( aout_instance_t *p_aout ) -{ - if( !p_aout->output.p_sys->b_playing ) + /* Setup audio_output_t */ + aout->format.i_format = fourcc; + aout->format.i_rate = rate; + if (channels == 2) + aout->format.i_physical_channels = AOUT_CHAN_LEFT|AOUT_CHAN_RIGHT; + if (spdif) { - p_aout->output.p_sys->b_playing = 1; - - /* 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 ); + aout->format.i_bytes_per_frame = AOUT_SPDIF_SIZE; + aout->format.i_frame_length = A52_FRAME_NB; + aout_VolumeNoneInit (aout); } -} - -/***************************************************************************** - * Close: close the ALSA device - *****************************************************************************/ -static void Close( vlc_object_t *p_this ) -{ - 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 ); + else + aout_VolumeSoftInit (aout); - if( i_snd_rc > 0 ) + aout->pf_play = Play; + if (snd_pcm_hw_params_can_pause (hw)) + aout->pf_pause = Pause; + else { - msg_Err( p_aout, "failed closing ALSA device (%s)", - snd_strerror( i_snd_rc ) ); + aout->pf_pause = PauseDummy; + msg_Warn (aout, "device cannot be paused"); } + aout->pf_flush = Flush; -#ifdef ALSA_DEBUG - snd_output_close( p_sys->p_snd_stderr ); -#endif + Probe (obj); + return 0; - free( p_sys ); +error: + snd_pcm_close (pcm); + free (sys); + return VLC_EGENERIC; } -/***************************************************************************** - * ALSAThread: asynchronous thread used to DMA the data to the device - *****************************************************************************/ -static void* ALSAThread( vlc_object_t* p_this ) +/** + * Queues one audio buffer to the hardware. + */ +static void Play (audio_output_t *aout, block_t *block) { - aout_instance_t * p_aout = (aout_instance_t*)p_this; - 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; - - mwait( p_sys->start_date - AOUT_PTS_TOLERANCE / 4 ); + aout_sys_t *sys = aout->sys; + snd_pcm_t *pcm = sys->pcm; + snd_pcm_sframes_t frames; + snd_pcm_state_t state = snd_pcm_state (pcm); - while ( vlc_object_alive (p_aout) ) + if (snd_pcm_delay (pcm, &frames) == 0) { - 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; -} - -/***************************************************************************** - * ALSAFill: function used to fill the ALSA buffer as much as possible - *****************************************************************************/ -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; - int i_snd_rc; - mtime_t next_date; + mtime_t delay = frames * CLOCK_FREQ / aout->format.i_rate; - /* Fill in the buffer until space or audio output buffer shortage */ + if (state != SND_PCM_STATE_RUNNING) + { + delay = block->i_pts - (mdate () + delay); + if (delay > 0) + { + frames = (delay * aout->format.i_rate) / CLOCK_FREQ; + msg_Dbg (aout, "prepending %ld zeroes", frames); - /* Get the status */ - i_snd_rc = snd_pcm_status( p_sys->p_snd_pcm, p_status ); - if( i_snd_rc < 0 ) - { - msg_Err( p_aout, "cannot get device status" ); - goto error; + void *pad = calloc (frames, aout->format.i_bytes_per_frame); + if (likely(pad != NULL)) + { + snd_pcm_writei (pcm, pad, frames); + free (pad); + } + } + } + else + aout_TimeReport (aout, block->i_pts - delay); } - /* Handle buffer underruns and get the status again */ - 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 ); + /* TODO: better overflow handling */ + /* TODO: no period wake ups */ - if( i_snd_rc ) + while (block->i_nb_samples > 0) + { + frames = snd_pcm_writei (pcm, block->p_buffer, block->i_nb_samples); + if (frames >= 0) { - msg_Err( p_aout, "cannot recover from buffer underrun" ); - goto error; + size_t bytes = snd_pcm_frames_to_bytes (pcm, frames); + block->i_nb_samples -= frames; + block->p_buffer += bytes; + block->i_buffer -= bytes; + // pts, length } - - 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 ); - if( i_snd_rc < 0 ) + else { - msg_Err( p_aout, "cannot get device status after recovery" ); - goto error; + int val = snd_pcm_recover (pcm, frames, 1); + if (val) + { + msg_Err (aout, "cannot recover playback stream: %s", + snd_strerror (val)); + DumpDeviceStatus (aout, pcm); + break; + } + msg_Warn (aout, "cannot write samples: %s", snd_strerror (frames)); } - - /* Underrun, try to recover as quickly as possible */ - next_date = mdate(); } - else - { - /* 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 ) - 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 - / p_aout->output.output.i_bytes_per_frame - / p_aout->output.output.i_rate - * 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, "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()) ); -#endif - } - - p_buffer = aout_OutputNextBuffer( p_aout, next_date, - (p_aout->output.output.i_format == VLC_CODEC_SPDIFL) ); + block_Release (block); +} - /* Audio output buffer shortage -> stop the fill process and wait */ - if( p_buffer == NULL ) - goto error; +/** + * Pauses/resumes the audio playback. + */ +static void Pause (audio_output_t *aout, bool pause, mtime_t date) +{ + snd_pcm_t *pcm = aout->sys->pcm; - 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 val = snd_pcm_pause (pcm, pause); + if (unlikely(val)) + PauseDummy (aout, pause, date); +} - /* a suspend event occurred - * (stream is suspended and waiting for an application recovery) */ - msg_Dbg( p_aout, "entering in suspend mode, trying to resume..." ); +static void PauseDummy (audio_output_t *aout, bool pause, mtime_t date) +{ + snd_pcm_t *pcm = aout->sys->pcm; - 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 ) - { - msleep( 1000000 ); - } + /* Stupid device cannot pause. Discard samples. */ + if (pause) + snd_pcm_drop (pcm); + else + snd_pcm_prepare (pcm); + (void) date; +} - if( i_snd_rc < 0 ) - /* Device does not supprot resuming, restart it */ - i_snd_rc = snd_pcm_prepare( p_sys->p_snd_pcm ); +/** + * Flushes/drains the audio playback buffer. + */ +static void Flush (audio_output_t *aout, bool wait) +{ + snd_pcm_t *pcm = aout->sys->pcm; - } + if (wait) + snd_pcm_drain (pcm); + else + snd_pcm_drop (pcm); + snd_pcm_prepare (pcm); +} - if( i_snd_rc < 0 ) - msg_Err( p_aout, "cannot write: %s", snd_strerror( i_snd_rc ) ); - aout_BufferFree( p_buffer ); - return; +/** + * Releases the audio output. + */ +static void Close (vlc_object_t *obj) +{ + audio_output_t *aout = (audio_output_t *)obj; + aout_sys_t *sys = aout->sys; + snd_pcm_t *pcm = aout->sys->pcm; -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 ); + snd_pcm_drop (pcm); + snd_pcm_close (pcm); + free (sys); } -static void GetDevicesForCard( module_config_t *p_item, int i_card ); -static void GetDevices( module_config_t *p_item ); - /***************************************************************************** * config variable callback *****************************************************************************/ @@ -916,7 +631,6 @@ static int FindDevicesCallback( vlc_object_t *p_this, char const *psz_name, 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; @@ -927,6 +641,8 @@ static int FindDevicesCallback( vlc_object_t *p_this, char const *psz_name, /* 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++ ) { @@ -939,7 +655,7 @@ static int FindDevicesCallback( vlc_object_t *p_this, char const *psz_name, } p_item->i_list = 1; - GetDevices( p_item ); + GetDevices( p_this, p_item ); /* Signal change to the interface */ p_item->b_dirty = true; @@ -948,94 +664,65 @@ static int FindDevicesCallback( vlc_object_t *p_this, char const *psz_name, } -static void GetDevicesForCard( module_config_t *p_item, int i_card ) +static void GetDevices (vlc_object_t *obj, module_config_t *item) { - 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_card_name; + void **hints; - sprintf( psz_dev, "hw:%i", i_card ); + msg_Dbg(obj, "Available ALSA PCM devices:"); - if( ( i_err = snd_ctl_open( &p_ctl, psz_dev, 0 ) ) < 0 ) + if (snd_device_name_hint(-1, "pcm", &hints) < 0) return; - if( ( i_err = snd_card_get_name( i_card, &psz_card_name ) ) != 0) - psz_card_name = _("Unknown soundcard"); - - snd_pcm_info_alloca( &p_pcm_info ); - - for (;;) + for (size_t i = 0; hints[i] != NULL; i++) { - char *psz_device, *psz_descr; - if( ( i_err = snd_ctl_pcm_next_device( p_ctl, &i_pcm_device ) ) < 0 ) - i_pcm_device = -1; - if( i_pcm_device < 0 ) - break; - - snd_pcm_info_set_device( p_pcm_info, i_pcm_device ); - snd_pcm_info_set_subdevice( p_pcm_info, 0 ); - snd_pcm_info_set_stream( p_pcm_info, SND_PCM_STREAM_PLAYBACK ); + void *hint = hints[i]; + char *dev; - if( ( i_err = snd_ctl_pcm_info( p_ctl, p_pcm_info ) ) < 0 ) + char *name = snd_device_name_get_hint(hint, "NAME"); + if (unlikely(name == NULL)) + continue; + if (unlikely(asprintf (&dev, "plug:'%s'", name) == -1)) { - 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 ) );*/ - } + free(name); continue; } - if( asprintf( &psz_device, "hw:%d,%d", i_card, i_pcm_device ) == -1 ) - break; - if( asprintf( &psz_descr, "%s: %s (%s)", psz_card_name, - snd_pcm_info_get_name(p_pcm_info), psz_device ) == -1 ) + 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); + + if (item != NULL) { - free( psz_device ); - break; + item->ppsz_list = xrealloc(item->ppsz_list, + (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] = dev; + if (desc == NULL) + desc = strdup(name); + item->ppsz_list_text[item->i_list] = desc; + item->i_list++; + } + 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); } - - 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; } - snd_ctl_close( p_ctl ); -} - - + snd_device_name_free_hint(hints); -static void GetDevices( module_config_t *p_item ) -{ - int i_card = -1; - int i_err = 0; - - if( ( i_err = snd_card_next( &i_card ) ) != 0 ) + if (item != NULL) { - /*printf( "snd_card_next() failed: %s", snd_strerror( -i_err ) );*/ - return; - } - - 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; - } + item->ppsz_list[item->i_list] = NULL; + item->ppsz_list_text[item->i_list] = NULL; } }