X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_output%2Falsa.c;h=1aafeb646fda6aa1531e6cbaa0e1701d260e3c61;hb=b4d7ab2bf417e6fc92f42d2228cdc134db19ef8a;hp=84e3fd5e7f94e2087bd7805e8731cd207b05c649;hpb=15643af12d9eb61eff8a8e89d8170f3d2b73d7e1;p=vlc diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c index 84e3fd5e7f..1aafeb646f 100644 --- a/modules/audio_output/alsa.c +++ b/modules/audio_output/alsa.c @@ -1,32 +1,29 @@ /***************************************************************************** * alsa.c : alsa plugin for vlc ***************************************************************************** - * Copyright (C) 2000-2001 the VideoLAN team - * $Id$ + * Copyright (C) 2000-2010 VLC authors and VideoLAN + * Copyright (C) 2009-2011 Rémi Denis-Courmont * * Authors: Henri Fallon - Original Author * Jeffrey Baker - Port to ALSA 1.0 API * John Paul Lorenti - Device selection * Arnaud de Bossoreille de Ribou - S/PDIF and aout3 * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -/***************************************************************************** - * Preamble - *****************************************************************************/ #ifdef HAVE_CONFIG_H # include "config.h" #endif @@ -35,1011 +32,780 @@ #include #include - -#include /* ENOMEM */ #include - #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 - - mtime_t start_date; - vlc_thread_t thread; - vlc_sem_t wait; + snd_pcm_t *pcm; + unsigned rate; /**< Sample rate */ + vlc_fourcc_t format; /**< Sample format */ + uint8_t chans_table[AOUT_CHAN_MAX]; /**< Channels order table */ + uint8_t chans_to_reorder; /**< Number of channels to reorder */ + + bool soft_mute; + float soft_gain; + char *device; }; +#include "audio_output/volume.h" + #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 */ +static int Open (vlc_object_t *); +static void Close (vlc_object_t *); +static int EnumDevices (vlc_object_t *, char const *, char ***, char ***); -#define DEFAULT_ALSA_DEVICE N_("default") +#define AUDIO_DEV_TEXT N_("Audio output device") +#define AUDIO_DEV_LONGTEXT N_("Audio output device (using ALSA syntax).") -/***************************************************************************** - * Local prototypes - *****************************************************************************/ -static int Open ( vlc_object_t * ); -static void Close ( vlc_object_t * ); -static void Play ( aout_instance_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 ); +#define AUDIO_CHAN_TEXT N_("Audio output channels") +#define AUDIO_CHAN_LONGTEXT N_("Channels available for audio output. " \ + "If the input has more channels than the output, it will be down-mixed. " \ + "This parameter is ignored when digital pass-through is active.") +static const int channels[] = { + AOUT_CHAN_CENTER, AOUT_CHANS_STEREO, AOUT_CHANS_4_0, AOUT_CHANS_4_1, + AOUT_CHANS_5_0, AOUT_CHANS_5_1, AOUT_CHANS_7_1, +}; +static const char *const channels_text[] = { + N_("Mono"), N_("Stereo"), N_("Surround 4.0"), N_("Surround 4.1"), + N_("Surround 5.0"), N_("Surround 5.1"), N_("Surround 7.1"), +}; -/***************************************************************************** - * Module descriptor - *****************************************************************************/ -static const char *const ppsz_devices[] = { "default" }; -static const char *const ppsz_devices_text[] = { N_("Default") }; 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_deprecated_alias( "alsadev" ) /* deprecated since 0.9.3 */ - change_string_list( ppsz_devices, ppsz_devices_text, FindDevicesCallback ) - change_action_add( FindDevicesCallback, N_("Refresh list") ) - + add_string ("alsa-audio-device", "default", + AUDIO_DEV_TEXT, AUDIO_DEV_LONGTEXT, false) + change_string_cb (EnumDevices) + add_integer ("alsa-audio-channels", AOUT_CHANS_FRONT, + AUDIO_CHAN_TEXT, AUDIO_CHAN_LONGTEXT, false) + change_integer_list (channels, channels_text) + add_sw_gain () set_capability( "audio output", 150 ) 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 ) + +/** Helper for ALSA -> VLC debugging output */ +static void Dump (vlc_object_t *obj, const char *msg, + int (*cb)(void *, snd_output_t *), void *p) { - 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 */ - if ( !(i_ret = snd_pcm_open( &p_sys->p_snd_pcm, psz_device, - SND_PCM_STREAM_PLAYBACK, - SND_PCM_NONBLOCK ) ) ) + snd_output_t *output; + char *str; + + if (unlikely(snd_output_buffer_open (&output))) + return; + + int val = cb (p, output); + if (val) { - int i_channels; - snd_pcm_hw_params_t * p_hw; - snd_pcm_hw_params_alloca (&p_hw); + msg_Warn (obj, "cannot get info: %s", snd_strerror (val)); + return; + } - 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; - } + 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) - if ( snd_pcm_hw_params_set_format( p_sys->p_snd_pcm, p_hw, - *pi_snd_pcm_format ) < 0 ) - { - int i_snd_rc = -1; +static void DumpDevice (vlc_object_t *obj, snd_pcm_t *pcm) +{ + snd_pcm_info_t *info; - 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; - } - } + Dump (obj, " ", snd_pcm_dump, pcm); + snd_pcm_info_alloca (&info); + if (snd_pcm_info (pcm, info) == 0) + { + 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)); + } +} - i_channels = aout_FormatNbChannels( &p_aout->output.output ); +static void DumpDeviceStatus (vlc_object_t *obj, snd_pcm_t *pcm) +{ + snd_pcm_status_t *status; - 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; - } - } + 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) + +#if (SND_LIB_VERSION >= 0x01001B) +static const uint16_t vlc_chans[] = { + [SND_CHMAP_MONO] = AOUT_CHAN_CENTER, + [SND_CHMAP_FL] = AOUT_CHAN_LEFT, + [SND_CHMAP_FR] = AOUT_CHAN_RIGHT, + [SND_CHMAP_RL] = AOUT_CHAN_REARLEFT, + [SND_CHMAP_RR] = AOUT_CHAN_REARRIGHT, + [SND_CHMAP_FC] = AOUT_CHAN_CENTER, + [SND_CHMAP_LFE] = AOUT_CHAN_LFE, + [SND_CHMAP_SL] = AOUT_CHAN_MIDDLELEFT, + [SND_CHMAP_SR] = AOUT_CHAN_MIDDLERIGHT, + [SND_CHMAP_RC] = AOUT_CHAN_REARCENTER, +}; - --i_channels; - } +static int Map2Mask (vlc_object_t *obj, const snd_pcm_chmap_t *restrict map) +{ + uint16_t mask = 0; + + for (unsigned i = 0; i < map->channels; i++) + { + const unsigned pos = map->pos[i]; + uint_fast16_t vlc_chan = 0; - /* 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 (pos < sizeof (vlc_chans) / sizeof (vlc_chans[0])) + vlc_chan = vlc_chans[pos]; + if (vlc_chan == 0) { - 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 ); - } + msg_Dbg (obj, " %s channel %u position %u", "unsupported", i, pos); + return -1; } - - /* Close the previously opened device */ - snd_pcm_close( p_sys->p_snd_pcm ); + if (mask & vlc_chan) + { + msg_Dbg (obj, " %s channel %u position %u", "duplicate", i, pos); + return -1; + } + mask |= vlc_chan; } - else if ( i_ret == -EBUSY ) + return mask; +} + +/** + * Compares a fixed ALSA channels map with the VLC channels order. + */ +static unsigned SetupChannelsFixed(const snd_pcm_chmap_t *restrict map, + uint16_t *restrict maskp, uint8_t *restrict tab) +{ + uint32_t chans_out[AOUT_CHAN_MAX]; + uint16_t mask = 0; + + for (unsigned i = 0; i < map->channels; i++) { - msg_Warn( p_aout, "audio device: %s is already in use", psz_device ); + uint_fast16_t vlc_chan = vlc_chans[map->pos[i]]; + + chans_out[i] = vlc_chan; + mask |= vlc_chan; + } + + *maskp = mask; + return aout_CheckChannelReorder(NULL, chans_out, mask, tab); +} + +/** + * Negotiate channels mapping. + */ +static unsigned SetupChannels (vlc_object_t *obj, snd_pcm_t *pcm, + uint16_t *restrict mask, uint8_t *restrict tab) +{ + snd_pcm_chmap_query_t **maps = snd_pcm_query_chmaps (pcm); + if (maps == NULL) + { /* Fallback to default order if unknown */ + msg_Dbg(obj, "channels map not provided"); + return 0; } - /* Test for S/PDIF device if needed */ - if ( psz_iec_device ) + /* Find most appropriate available channels map */ + unsigned best_offset, best_score = 0, to_reorder = 0; + + for (snd_pcm_chmap_query_t *const *p = maps; *p != NULL; p++) { - /* 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 ) ) ) + snd_pcm_chmap_query_t *map = *p; + + switch (map->type) { - 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 ); + case SND_CHMAP_TYPE_FIXED: + case SND_CHMAP_TYPE_PAIRED: + case SND_CHMAP_TYPE_VAR: + break; + default: + msg_Err (obj, "unknown channels map type %u", map->type); + continue; } - else if ( i_ret == -EBUSY ) + + int chans = Map2Mask (obj, &map->map); + if (chans == -1) + continue; + + unsigned score = (popcount (chans & *mask) << 8) + | (255 - popcount (chans)); + if (score > best_score) { - msg_Warn( p_aout, "audio device: %s is already in use", - psz_iec_device ); + best_offset = p - maps; + best_score = score; } } - 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 (best_score == 0) { - if( var_GetBool( p_aout->p_libvlc, "alsa-working" ) ) - dialog_FatalWait( 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." ); + msg_Err (obj, "cannot find supported channels map"); + goto out; } - else - var_SetBool( p_aout->p_libvlc, "alsa-working", true ); + + const snd_pcm_chmap_t *map = &maps[best_offset]->map; + msg_Dbg (obj, "using channels map %u, type %u, %u channel(s)", best_offset, + maps[best_offset]->type, map->channels); + + /* Setup channels map */ + to_reorder = SetupChannelsFixed(map, mask, tab); + + /* TODO: avoid reordering for PAIRED and VAR types */ + //snd_pcm_set_chmap (pcm, ...) +out: + snd_pcm_free_chmaps (maps); + return to_reorder; +} +#else /* (SND_LIB_VERSION < 0x01001B) */ +# define SetupChannels(obj, pcm, mask, tab) (0) #endif - if( val.i_int <= 0 ) + +static int TimeGet (audio_output_t *aout, mtime_t *); +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 Start (audio_output_t *aout, audio_sample_format_t *restrict fmt) +{ + aout_sys_t *sys = aout->sys; + snd_pcm_format_t pcm_format; /* ALSA sample format */ + bool spdif = false; + + switch (fmt->i_format) { - /* Probe() has failed. */ - msg_Dbg( p_aout, "failed to find a usable ALSA configuration" ); - var_Destroy( p_aout, "audio-device" ); - return; + case VLC_CODEC_FL64: + pcm_format = SND_PCM_FORMAT_FLOAT64; + break; + case VLC_CODEC_FL32: + pcm_format = SND_PCM_FORMAT_FLOAT; + break; + case VLC_CODEC_S32N: + pcm_format = SND_PCM_FORMAT_S32; + break; + case VLC_CODEC_S16N: + pcm_format = SND_PCM_FORMAT_S16; + break; + case VLC_CODEC_U8: + pcm_format = SND_PCM_FORMAT_U8; + break; + default: + if (AOUT_FMT_SPDIF(fmt)) + spdif = var_InheritBool (aout, "spdif"); + if (spdif) + { + fmt->i_format = VLC_CODEC_SPDIFL; + pcm_format = SND_PCM_FORMAT_S16; + } + else + if (HAVE_FPU) + { + fmt->i_format = VLC_CODEC_FL32; + pcm_format = SND_PCM_FORMAT_FLOAT; + } + else + { + fmt->i_format = VLC_CODEC_S16N; + pcm_format = SND_PCM_FORMAT_S16; + } } - /* Add final settings to the variable */ - var_AddCallback( p_aout, "audio-device", aout_ChannelsRestart, NULL ); - var_SetBool( p_aout, "intf-change", true ); -} + const char *device = sys->device; + char *devbuf = NULL; + /* Choose the IEC device for S/PDIF output */ + if (spdif) + { + unsigned aes3; -/***************************************************************************** - * 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 ) -{ - aout_instance_t * p_aout = (aout_instance_t *)p_this; - struct aout_sys_t * p_sys; - vlc_value_t val; + switch (fmt->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; + } - 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 */ + char *opt = NULL; + if (!strcmp (device, "default")) + device = "iec958"; /* TODO: hdmi */ + else + { + opt = strchr(device, ':'); + if (opt && opt[1] == '\0') { + /* if device is terminated by : but there's no options, + * remove ':', we'll add it back in the format string. */ + *opt = '\0'; + opt = NULL; + } + } - int i_vlc_pcm_format; /* Audio format for VLC's data */ - int i_snd_pcm_format; /* Audio format for ALSA's data */ + if (asprintf (&devbuf, + "%s%cAES0=0x%x,AES1=0x%x,AES2=0x%x,AES3=0x%x", device, + opt ? ',' : ':', + IEC958_AES0_CON_EMPHASIS_NONE | IEC958_AES0_NONAUDIO, + IEC958_AES1_CON_ORIGINAL | IEC958_AES1_CON_PCM_CODER, + 0, aes3) == -1) + return VLC_ENOMEM; + device = devbuf; + } - snd_pcm_uframes_t i_buffer_size = 0; - snd_pcm_uframes_t i_period_size = 0; - int i_channels = 0; + /* Open the device */ + snd_pcm_t *pcm; + /* VLC always has a resampler. No need for ALSA's. */ + const int mode = SND_PCM_NO_AUTO_RESAMPLE; + + int val = snd_pcm_open (&pcm, device, SND_PCM_STREAM_PLAYBACK, mode); + free (devbuf); + if (val != 0) + { + msg_Err (aout, "cannot open ALSA device \"%s\": %s", sys->device, + snd_strerror (val)); + dialog_Fatal (aout, _("Audio output failed"), + _("The audio device \"%s\" could not be used:\n%s."), + sys->device, snd_strerror (val)); + return VLC_EGENERIC; + } + sys->pcm = pcm; - snd_pcm_hw_params_t *p_hw; - snd_pcm_sw_params_t *p_sw; + /* Print some potentially useful debug */ + msg_Dbg (aout, "using ALSA device: %s", sys->device); + DumpDevice (VLC_OBJECT(aout), pcm); - int i_snd_rc = -1; - unsigned int i_old_rate; - bool b_retry = true; + /* Get Initial hardware parameters */ + snd_pcm_hw_params_t *hw; + unsigned param; - /* Allocate structures */ - p_aout->output.p_sys = p_sys = malloc( sizeof( aout_sys_t ) ); - if( p_sys == NULL ) - return VLC_ENOMEM; + 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); - /* Get device name */ - if( (psz_device = config_GetPsz( p_aout, "alsa-audio-device" )) == NULL ) + val = snd_pcm_hw_params_set_rate_resample(pcm, hw, 0); + if (val) { - msg_Err( p_aout, "no audio device given (maybe \"default\" ?)" ); - dialog_Fatal( p_aout, _("No Audio Device"), "%s", - _("No audio device name was given. You might want to " \ - "enter \"default\".") ); - free( p_sys ); - return VLC_EGENERIC; + msg_Err (aout, "cannot disable resampling: %s", snd_strerror (val)); + goto error; } - /* 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 ) ) + val = snd_pcm_hw_params_set_access (pcm, hw, + SND_PCM_ACCESS_RW_INTERLEAVED); + if (val) { - 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; + msg_Err (aout, "cannot set access mode: %s", snd_strerror (val)); + goto error; } - else if( AOUT_FMT_NON_LINEAR( &p_aout->output.output ) ) + + /* Set sample format */ + if (snd_pcm_hw_params_test_format (pcm, hw, pcm_format) == 0) + ; + else + if (snd_pcm_hw_params_test_format (pcm, hw, SND_PCM_FORMAT_FLOAT) == 0) { - psz_iec_device = psz_device; + fmt->i_format = VLC_CODEC_FL32; + pcm_format = SND_PCM_FORMAT_FLOAT; } else + if (snd_pcm_hw_params_test_format (pcm, hw, SND_PCM_FORMAT_S32) == 0) { - psz_iec_device = NULL; + fmt->i_format = VLC_CODEC_S32N; + pcm_format = SND_PCM_FORMAT_S32; } - - /* Choose the linear PCM format (read the comment above about FPU - and float32) */ - if( HAVE_FPU ) + else + if (snd_pcm_hw_params_test_format (pcm, hw, SND_PCM_FORMAT_S16) == 0) { - i_vlc_pcm_format = VLC_CODEC_FL32; - i_snd_pcm_format = SND_PCM_FORMAT_FLOAT; + fmt->i_format = VLC_CODEC_S16N; + pcm_format = SND_PCM_FORMAT_S16; } else { - i_vlc_pcm_format = VLC_CODEC_S16N; - i_snd_pcm_format = SND_PCM_FORMAT_S16; + msg_Err (aout, "no supported sample format"); + goto error; } - /* 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 ) + val = snd_pcm_hw_params_set_format (pcm, hw, pcm_format); + if (val) { - Probe( p_aout, psz_device, psz_iec_device, &i_snd_pcm_format ); + msg_Err (aout, "cannot set sample format: %s", snd_strerror (val)); + goto error; } - if ( var_Get( p_aout, "audio-device", &val ) < 0 ) + /* Set channels count */ + unsigned channels; + if (!spdif) { - free( p_sys ); - free( psz_device ); - return VLC_EGENERIC; - } + uint16_t map = var_InheritInteger (aout, "alsa-audio-channels"); - 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" ); + sys->chans_to_reorder = SetupChannels (VLC_OBJECT(aout), pcm, &map, + sys->chans_table); + fmt->i_physical_channels = map; + fmt->i_original_channels = map; + channels = popcount (map); } - else if ( val.i_int == AOUT_VAR_2F2R ) + else { - 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" ); + sys->chans_to_reorder = 0; + channels = 2; } - else if ( val.i_int == AOUT_VAR_STEREO ) + + /* By default, ALSA plug will pad missing channels with zeroes, which is + * usually fine. However, it will also discard extraneous channels, which + * is not acceptable. Thus the user must configure the physically + * available channels, and VLC will downmix if needed. */ + val = snd_pcm_hw_params_set_channels (pcm, hw, channels); + if (val) { - p_aout->output.output.i_physical_channels - = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT; + msg_Err (aout, "cannot set %u channels: %s", channels, + snd_strerror (val)); + goto error; } - else if ( val.i_int == AOUT_VAR_MONO ) + + /* Set sample rate */ + val = snd_pcm_hw_params_set_rate_near (pcm, hw, &fmt->i_rate, NULL); + if (val) { - p_aout->output.output.i_physical_channels = AOUT_CHAN_CENTER; + msg_Err (aout, "cannot set sample rate: %s", snd_strerror (val)); + goto error; } - else if( val.i_int != AOUT_VAR_SPDIF ) + sys->rate = fmt->i_rate; + +#if 1 /* work-around for period-long latency outputs (e.g. PulseAudio): */ + param = AOUT_MIN_PREPARE_TIME; + val = snd_pcm_hw_params_set_period_time_near (pcm, hw, ¶m, NULL); + if (val) { - /* 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; + msg_Err (aout, "cannot set period: %s", snd_strerror (val)); + goto error; } - -#ifdef ALSA_DEBUG - snd_output_stdio_attach( &p_sys->p_snd_stderr, stderr, 0 ); #endif - - /* Open the device */ - if ( val.i_int == AOUT_VAR_SPDIF ) + /* Set buffer size */ + param = AOUT_MAX_ADVANCE_TIME; + val = snd_pcm_hw_params_set_buffer_time_near (pcm, hw, ¶m, NULL); + if (val) { - if ( ( i_snd_rc = snd_pcm_open( &p_sys->p_snd_pcm, psz_iec_device, - SND_PCM_STREAM_PLAYBACK, 0 ) ) < 0 ) - { - 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; - } - 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 ); + msg_Err (aout, "cannot set buffer duration: %s", snd_strerror (val)); + goto error; } - else +#if 0 + val = snd_pcm_hw_params_get_buffer_time (hw, ¶m, NULL); + if (val) { - 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 ); - - p_aout->output.i_nb_samples = i_period_size = ALSA_DEFAULT_PERIOD_SIZE; - - aout_VolumeSoftInit( p_aout ); + msg_Warn (aout, "cannot get buffer time: %s", snd_strerror(val)); + param = AOUT_MIN_PREPARE_TIME; } - - /* 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_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 ) + else + param /= 2; + val = snd_pcm_hw_params_set_period_time_near (pcm, hw, ¶m, NULL); + if (val) { - 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; - i_snd_rc = snd_pcm_hw_params_set_rate_near( p_sys->p_snd_pcm, p_hw, - &p_aout->output.output.i_rate, - NULL ); - 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 period size. */ - if ( ( i_snd_rc = snd_pcm_hw_params_set_period_size_near( p_sys->p_snd_pcm, - p_hw, &i_period_size, NULL ) ) < 0 ) - { - 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. */ - if ( ( i_snd_rc = snd_pcm_hw_params_set_buffer_size_near( p_sys->p_snd_pcm, - p_hw, &i_buffer_size ) ) < 0 ) - { - msg_Err( p_aout, "unable to set buffer size (%s)", - snd_strerror( i_snd_rc ) ); - 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; - } - } + msg_Err (aout, "cannot set period: %s", snd_strerror (val)); + goto error; } +#endif - if( ( i_snd_rc = snd_pcm_hw_params_get_period_time( p_hw, - &p_sys->i_period_time, NULL ) ) < 0 ) + /* Commit hardware parameters */ + val = snd_pcm_hw_params (pcm, hw); + if (val < 0) { - msg_Err( p_aout, "unable to get period time (%s)", - snd_strerror( i_snd_rc ) ); + 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 - - p_sys->start_date = 0; - vlc_sem_init( &p_sys->wait, 0 ); - - /* Create ALSA thread and wait for its readiness. */ - if( vlc_clone( &p_sys->thread, ALSAThread, p_aout, - VLC_THREAD_PRIORITY_OUTPUT ) ) + val = snd_pcm_prepare (pcm); + if (val) { - msg_Err( p_aout, "cannot create ALSA thread (%m)" ); - vlc_sem_destroy( &p_sys->wait ); + msg_Err (aout, "cannot prepare device: %s", snd_strerror (val)); goto error; } + /* Setup audio_output_t */ + if (spdif) + { + fmt->i_bytes_per_frame = AOUT_SPDIF_SIZE; + fmt->i_frame_length = A52_FRAME_NB; + } + sys->format = fmt->i_format; + + aout->time_get = TimeGet; + aout->play = Play; + if (snd_pcm_hw_params_can_pause (hw)) + aout->pause = Pause; + else + { + aout->pause = PauseDummy; + msg_Warn (aout, "device cannot be paused"); + } + aout->flush = Flush; + aout_SoftVolumeStart (aout); 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 ); + snd_pcm_close (pcm); 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 ) -{ - 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 ); - - /* wake up the audio output thread */ - sem_post( &p_aout->output.p_sys->wait ); -} - -/***************************************************************************** - * Close: close the ALSA device - *****************************************************************************/ -static void Close( vlc_object_t *p_this ) +static int TimeGet (audio_output_t *aout, mtime_t *restrict delay) { - 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_cancel( p_sys->thread ); - vlc_join( p_sys->thread, NULL ); - vlc_sem_destroy( &p_sys->wait ); + aout_sys_t *sys = aout->sys; + snd_pcm_sframes_t frames; - /* */ - i_snd_rc = snd_pcm_close( p_sys->p_snd_pcm ); - - if( i_snd_rc > 0 ) + int val = snd_pcm_delay (sys->pcm, &frames); + if (val) { - msg_Err( p_aout, "failed closing ALSA device (%s)", - snd_strerror( i_snd_rc ) ); + msg_Err (aout, "cannot estimate delay: %s", snd_strerror (val)); + return -1; } - -#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( void *data ) -{ - aout_instance_t * p_aout = data; - struct aout_sys_t * p_sys = p_aout->output.p_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 ); - - vlc_cleanup_push( pcm_drop, p_sys->p_snd_pcm ); - for(;;) - ALSAFill( p_aout ); - - assert(0); - vlc_cleanup_pop(); + *delay = frames * CLOCK_FREQ / sys->rate; + return 0; } -/***************************************************************************** - * ALSAFill: function used to fill the ALSA buffer as much as possible - *****************************************************************************/ -static void ALSAFill( aout_instance_t * p_aout ) +/** + * Queues one audio buffer to the hardware. + */ +static void Play (audio_output_t *aout, block_t *block) { - struct aout_sys_t * p_sys = p_aout->output.p_sys; - 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 */ - 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" ); - goto error; - } - - /* 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_pcm ); - if( i_snd_rc ) - { - msg_Err( p_aout, "cannot recover from buffer underrun" ); - goto error; - } + aout_sys_t *sys = aout->sys; - msg_Dbg( p_aout, "recovered from buffer underrun" ); + if (sys->chans_to_reorder != 0) + aout_ChannelReorder(block->p_buffer, block->i_buffer, + sys->chans_to_reorder, sys->chans_table, sys->format); - /* Get the new 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" ); - goto error; - } - - /* 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_pcm, &delay ) < 0 ) - delay = 0; /* FIXME: use a positive minimal delay */ - - 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; - -#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 (%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: in %"PRId64" microseconds", delay_us ); -#endif - next_date = mdate() + delay_us; - } + snd_pcm_t *pcm = sys->pcm; - 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; + /* TODO: better overflow handling */ + /* TODO: no period wake ups */ - for (;;) + while (block->i_nb_samples > 0) { - int n = snd_pcm_poll_descriptors_count(p_pcm); - struct pollfd ufd[n]; - unsigned short revents; + snd_pcm_sframes_t frames; - snd_pcm_poll_descriptors(p_pcm, ufd, n); - do + frames = snd_pcm_writei (pcm, block->p_buffer, block->i_nb_samples); + if (frames >= 0) { - vlc_restorecancel(canc); - poll(ufd, n, -1); - canc = vlc_savecancel(); - snd_pcm_poll_descriptors_revents(p_pcm, ufd, n, &revents); + 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 } - while(!revents); - - if(revents & POLLOUT) + else { - i_snd_rc = snd_pcm_writei( p_pcm, p_buffer->p_buffer, - p_buffer->i_nb_samples ); - if( i_snd_rc != -ESTRPIPE ) + 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)); } - - /* 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( ( i_snd_rc = snd_pcm_resume( p_pcm ) ) == -EAGAIN ) - { - vlc_restorecancel(canc); - msleep(CLOCK_FREQ); /* device still suspended, wait... */ - canc = vlc_savecancel(); - } - - if( i_snd_rc < 0 ) - /* 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 ) ); - - vlc_restorecancel(canc); - block_Release( p_buffer ); - return; - -error: - if( i_snd_rc < 0 ) - msg_Err( p_aout, "ALSA error: %s", snd_strerror( i_snd_rc ) ); - - vlc_restorecancel(canc); - msleep(p_sys->i_period_time / 2); + block_Release (block); } -static void GetDevicesForCard( module_config_t *p_item, int i_card ); -static void GetDevices( module_config_t *p_item ); - -/***************************************************************************** - * config variable callback - *****************************************************************************/ -static int FindDevicesCallback( vlc_object_t *p_this, char const *psz_name, - vlc_value_t newval, vlc_value_t oldval, void *p_unused ) +/** + * Pauses/resumes the audio playback. + */ +static void Pause (audio_output_t *aout, bool pause, mtime_t date) { - module_config_t *p_item; - int i; - (void)newval; - (void)oldval; - (void)p_unused; + snd_pcm_t *pcm = aout->sys->pcm; - p_item = config_FindConfig( p_this, psz_name ); - if( !p_item ) return VLC_SUCCESS; + int val = snd_pcm_pause (pcm, pause); + if (unlikely(val)) + PauseDummy (aout, pause, date); +} - /* Clear-up the current list */ - if( p_item->i_list ) - { - /* Keep the first entrie */ - for( i = 1; i < p_item->i_list; i++ ) - { - free( (char *)p_item->ppsz_list[i] ); - free( (char *)p_item->ppsz_list_text[i] ); - } - /* TODO: Remove when no more needed */ - p_item->ppsz_list[i] = NULL; - p_item->ppsz_list_text[i] = NULL; - } - p_item->i_list = 1; +static void PauseDummy (audio_output_t *aout, bool pause, mtime_t date) +{ + snd_pcm_t *pcm = aout->sys->pcm; - GetDevices( p_item ); + /* Stupid device cannot pause. Discard samples. */ + if (pause) + snd_pcm_drop (pcm); + else + snd_pcm_prepare (pcm); + (void) date; +} - /* Signal change to the interface */ - p_item->b_dirty = true; +/** + * Flushes/drains the audio playback buffer. + */ +static void Flush (audio_output_t *aout, bool wait) +{ + snd_pcm_t *pcm = aout->sys->pcm; - return VLC_SUCCESS; + if (wait) + snd_pcm_drain (pcm); + else + snd_pcm_drop (pcm); + snd_pcm_prepare (pcm); } -static void GetDevicesForCard( module_config_t *p_item, int i_card ) +/** + * Releases the audio output. + */ +static void Stop (audio_output_t *aout) { - 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; + aout_sys_t *sys = aout->sys; + snd_pcm_t *pcm = sys->pcm; - sprintf( psz_dev, "hw:%i", i_card ); + snd_pcm_drop (pcm); + snd_pcm_close (pcm); +} - if( ( i_err = snd_ctl_open( &p_ctl, psz_dev, 0 ) ) < 0 ) - return; +/** + * Enumerates ALSA output devices. + */ +static int EnumDevices(vlc_object_t *obj, char const *varname, + char ***restrict idp, char ***restrict namep) +{ + void **hints; - if( ( i_err = snd_card_get_name( i_card, &psz_card_name ) ) != 0) - psz_card_name = _("Unknown soundcard"); + msg_Dbg (obj, "Available ALSA PCM devices:"); + if (snd_device_name_hint(-1, "pcm", &hints) < 0) + return -1; - snd_pcm_info_alloca( &p_pcm_info ); + char **ids = NULL, **names = NULL; + unsigned n = 0; - 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]; - 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 ) );*/ - } + char *name = snd_device_name_get_hint(hint, "NAME"); + if (unlikely(name == NULL)) 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 ) - { - free( psz_device ); - break; - } + 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); - p_item->ppsz_list = realloc_or_free( p_item->ppsz_list, - (p_item->i_list + 2) * sizeof(char *) ); - assert( p_item->ppsz_list ); - p_item->ppsz_list_text = realloc_or_free( p_item->ppsz_list_text, - (p_item->i_list + 2) * sizeof(char *) ); - assert( p_item->ppsz_list_text ); - 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; + ids = xrealloc (ids, (n + 1) * sizeof (*ids)); + names = xrealloc (names, (n + 1) * sizeof (*names)); + ids[n] = name; + names[n] = desc; + n++; } - snd_ctl_close( p_ctl ); + snd_device_name_free_hint(hints); + *idp = ids; + *namep = names; + (void) varname; + return n; } +static int DeviceSelect (audio_output_t *aout, const char *id) +{ + aout_sys_t *sys = aout->sys; + + char *device = strdup (id ? id : "default"); + if (unlikely(device == NULL)) + return -1; + free (sys->device); + sys->device = device; + aout_DeviceReport (aout, device); + aout_RestartRequest (aout, AOUT_RESTART_OUTPUT); + return 0; +} -static void GetDevices( module_config_t *p_item ) +static int Open(vlc_object_t *obj) { - int i_card = -1; - int i_err = 0; + audio_output_t *aout = (audio_output_t *)obj; + aout_sys_t *sys = malloc (sizeof (*sys)); - if( ( i_err = snd_card_next( &i_card ) ) != 0 ) - { - /*printf( "snd_card_next() failed: %s", snd_strerror( -i_err ) );*/ - return; - } + if (unlikely(sys == NULL)) + return VLC_ENOMEM; + sys->device = var_InheritString (aout, "alsa-audio-device"); + if (unlikely(sys->device == NULL)) + goto error; - while( i_card > -1 ) + aout->sys = sys; + aout->start = Start; + aout->stop = Stop; + aout_SoftVolumeInit (aout); + aout->device_select = DeviceSelect; + aout_DeviceReport (aout, sys->device); + + /* ALSA does not support hot-plug events so list devices at startup */ + char **ids, **names; + int count = EnumDevices (VLC_OBJECT(aout), NULL, &ids, &names); + if (count >= 0) { - GetDevicesForCard( p_item, i_card ); - if( ( i_err = snd_card_next( &i_card ) ) != 0 ) + for (int i = 0; i < count; i++) { - /*printf( "snd_card_next() failed: %s", snd_strerror( -i_err ) );*/ - break; + aout_HotplugReport (aout, ids[i], names[i]); + free (names[i]); + free (ids[i]); } + free (names); + free (ids); } + + return VLC_SUCCESS; +error: + free (sys); + return VLC_ENOMEM; +} + +static void Close(vlc_object_t *obj) +{ + audio_output_t *aout = (audio_output_t *)obj; + aout_sys_t *sys = aout->sys; + + free (sys->device); + free (sys); }