*
* Authors: Derk-Jan Hartman <hartman at videolan dot org>
* Felix Paul Kühne <fkuehne at videolan dot org>
+ * David Fuhrmann <david dot fuhrmann at googlemail dot com>
*
* 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
#define AOUT_VAR_SPDIF_FLAG 0xf00000
-#define kBufferLength 2048 * 8 * 8 * 4
+#define AUDIO_BUFFER_SIZE_IN_SECONDS (AOUT_MAX_ADVANCE_TIME / CLOCK_FREQ)
+
#define AOUT_VOLUME_DEFAULT 256
#define AOUT_VOLUME_MAX 512
{
AudioObjectID i_default_dev; /* DeviceID of defaultOutputDevice */
AudioObjectID i_selected_dev; /* DeviceID of the selected device */
+ AudioObjectID i_new_selected_dev; /* DeviceID of device which will be selected on start */
bool b_selected_dev_is_digital;
AudioDeviceIOProcID i_procID; /* DeviceID of current device */
bool b_digital; /* Are we running in digital mode? */
AudioStreamBasicDescription sfmt_revert; /* The original format of the stream */
bool b_revert; /* Whether we need to revert the stream format */
bool b_changed_mixing; /* Whether we need to set the mixing mode back */
+
+
bool b_got_first_sample; /* did the aout core provide something to render? */
int i_rate; /* media sample rate */
- mtime_t i_played_length; /* how much did we play already */
- mtime_t i_last_sample_time; /* last sample time played by the AudioUnit */
+ int i_bytes_per_sample;
- struct audio_device_t *devices;
+ CFArrayRef device_list;
- vlc_mutex_t lock;
-};
+ float f_volume;
+ bool b_mute;
-struct audio_device_t
-{
- struct audio_device_t *next;
- UInt32 deviceid;
- char *name;
+ vlc_mutex_t lock;
+ vlc_cond_t cond;
};
-
#pragma mark -
#pragma mark local prototypes & module descriptor
static int StartSPDIF (audio_output_t *, audio_sample_format_t *);
static void Stop (audio_output_t *);
-static int DeviceList (audio_output_t *p_aout, char ***namesp, char ***descsp);
static void RebuildDeviceList (audio_output_t *);
static int SwitchAudioDevice (audio_output_t *p_aout, const char *name);
static int VolumeSet (audio_output_t *, float);
static OSStatus HardwareListener (AudioObjectID, UInt32, const AudioObjectPropertyAddress *, void *);
static OSStatus StreamListener (AudioObjectID, UInt32, const AudioObjectPropertyAddress *, void *);
+static int RegisterAudioStreamsCallback(audio_output_t *, AudioDeviceID);
static int AudioDeviceHasOutput (AudioDeviceID);
static int AudioDeviceSupportsDigital(audio_output_t *, AudioDeviceID);
static int AudioStreamSupportsDigital(audio_output_t *, AudioStreamID);
static int Open(vlc_object_t *obj)
{
- audio_output_t *aout = (audio_output_t *)obj;
- aout_sys_t *sys = malloc(sizeof (*sys));
-
- if (unlikely(sys == NULL))
+ audio_output_t *p_aout = (audio_output_t *)obj;
+ aout_sys_t *p_sys = malloc(sizeof (*p_sys));
+ if (unlikely(p_sys == NULL))
return VLC_ENOMEM;
- vlc_mutex_init(&sys->lock);
+ OSStatus err = noErr;
+
+ vlc_mutex_init(&p_sys->lock);
+ vlc_cond_init(&p_sys->cond);
+ p_sys->b_digital = false;
- aout->sys = sys;
- aout->start = Start;
- aout->stop = Stop;
- aout->volume_set = VolumeSet;
- aout->mute_set = MuteSet;
- aout->device_enum = DeviceList;
- aout->sys->devices = NULL;
- aout->device_select = SwitchAudioDevice;
+ p_aout->sys = p_sys;
+ p_aout->start = Start;
+ p_aout->stop = Stop;
+ p_aout->volume_set = VolumeSet;
+ p_aout->mute_set = MuteSet;
+ p_aout->device_select = SwitchAudioDevice;
+ p_sys->device_list = CFArrayCreate(kCFAllocatorDefault, NULL, 0, NULL);
- RebuildDeviceList(aout);
+ /* Attach a Listener so that we are notified of a change in the Device setup */
+ AudioObjectPropertyAddress audioDevicesAddress = { kAudioHardwarePropertyDevices, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
+ err = AudioObjectAddPropertyListener(kAudioObjectSystemObject, &audioDevicesAddress, HardwareListener, (void *)p_aout);
+ if (err != noErr)
+ msg_Warn(p_aout, "failed to add listener for audio device configuration [%4.4s]", (char *)&err);
+
+ RebuildDeviceList(p_aout);
/* remember the volume */
- aout_VolumeReport(aout, var_InheritInteger(aout, "auhal-volume") / (float)AOUT_VOLUME_DEFAULT);
- MuteSet(aout, var_InheritBool(aout, "mute"));
+ p_sys->f_volume = var_InheritInteger(p_aout, "auhal-volume") / (float)AOUT_VOLUME_DEFAULT;
+ aout_VolumeReport(p_aout, p_sys->f_volume);
+ p_sys->b_mute = var_InheritBool(p_aout, "mute");
+ aout_MuteReport(p_aout, p_sys->b_mute);
- SwitchAudioDevice(aout, config_GetPsz(aout, "auhal-audio-device"));
+ SwitchAudioDevice(p_aout, config_GetPsz(p_aout, "auhal-audio-device"));
return VLC_SUCCESS;
}
static void Close(vlc_object_t *obj)
{
- audio_output_t *aout = (audio_output_t *)obj;
- aout_sys_t *sys = aout->sys;
+ audio_output_t *p_aout = (audio_output_t *)obj;
+ aout_sys_t *p_sys = p_aout->sys;
- config_PutPsz(aout, "auhal-audio-device", aout_DeviceGet(aout));
+ OSStatus err = noErr;
- for (struct audio_device_t * device = sys->devices, *next; device != NULL; device = next) {
- next = device->next;
- free(device->name);
- free(device);
+ /* remove audio devices callback */
+ AudioObjectPropertyAddress audioDevicesAddress = { kAudioHardwarePropertyDevices, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
+ err = AudioObjectRemovePropertyListener(kAudioObjectSystemObject, &audioDevicesAddress, HardwareListener, (void *)p_aout);
+ if (err != noErr)
+ msg_Err(p_aout, "AudioHardwareRemovePropertyListener failed [%4.4s]", (char *)&err);
+
+
+ /* remove audio device alive callback */
+ AudioObjectPropertyAddress deviceAliveAddress = { kAudioDevicePropertyDeviceIsAlive, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
+ err = AudioObjectRemovePropertyListener(p_sys->i_selected_dev, &deviceAliveAddress, HardwareListener, (void *)p_aout);
+ if (err != noErr)
+ msg_Err(p_aout, "failed to remove audio device life checker [%4.4s]", (char *)&err);
+
+ /* remove audio streams callback */
+ if (p_sys->i_stream_id > 0) {
+ AudioObjectPropertyAddress physicalFormatsAddress = { kAudioStreamPropertyAvailablePhysicalFormats, kAudioObjectPropertyScopeGlobal, 0 };
+ err = AudioObjectRemovePropertyListener(p_sys->i_stream_id, &physicalFormatsAddress, HardwareListener, (void *)p_aout);
+ if (err != noErr)
+ msg_Err(p_aout, "failed to remove audio device property streams callback [%4.4s]", (char *)&err);
}
- vlc_mutex_destroy(&sys->lock);
+ config_PutPsz(p_aout, "auhal-audio-device", aout_DeviceGet(p_aout));
+
+ CFRelease(p_sys->device_list);
+
+ vlc_mutex_destroy(&p_sys->lock);
+ vlc_cond_destroy(&p_sys->cond);
- free(sys);
+ free(p_sys);
}
static int Start(audio_output_t *p_aout, audio_sample_format_t *restrict fmt)
* property size */
int b_alive = false;
+ bool b_start_digital = false;
+
p_sys = p_aout->sys;
p_sys->b_digital = false;
p_sys->au_component = NULL;
p_sys->i_stream_index = -1;
p_sys->b_revert = false;
p_sys->b_changed_mixing = false;
+ p_sys->i_bytes_per_sample = 0;
- aout_FormatPrint(p_aout, "VLC is looking for:", fmt);
+ p_sys->i_selected_dev = p_sys->i_new_selected_dev;
- if (p_sys->b_selected_dev_is_digital)
- msg_Dbg(p_aout, "audio device supports digital output");
+ aout_FormatPrint(p_aout, "VLC is looking for:", fmt);
msg_Dbg(p_aout, "attempting to use device %i", p_sys->i_selected_dev);
if (err != noErr) {
/* Be tolerant, only give a warning here */
- msg_Warn(p_aout, "could not check whether device [0x%x] is alive: %4.4s",
+ msg_Warn(p_aout, "could not check whether device [0x%x] is alive [%4.4s]",
(unsigned int)p_sys->i_selected_dev, (char *)&err);
b_alive = false;
}
- if (!b_alive) {
+ if (!b_alive || p_sys->i_selected_dev == 0) {
msg_Warn(p_aout, "selected audio device is not alive, switching to default device");
- p_sys->i_selected_dev = p_sys->i_default_dev;
+
+ AudioObjectID defaultDeviceID = 0;
+ UInt32 propertySize = 0;
+ AudioObjectPropertyAddress defaultDeviceAddress = { kAudioHardwarePropertyDefaultOutputDevice, kAudioDevicePropertyScopeOutput, kAudioObjectPropertyElementMaster };
+ propertySize = sizeof(AudioObjectID);
+ err = AudioObjectGetPropertyData(kAudioObjectSystemObject, &defaultDeviceAddress, 0, NULL, &propertySize, &defaultDeviceID);
+ if (err != noErr) {
+ msg_Err(p_aout, "could not get default audio device [%4.4s]", (char *)&err);
+ goto error;
+ }
+ else
+ msg_Dbg(p_aout, "using default audio device %i", defaultDeviceID);
+
+ p_sys->i_selected_dev = defaultDeviceID;
}
+ // recheck if device still supports digital
+ b_start_digital = p_sys->b_selected_dev_is_digital;
+ if(!AudioDeviceSupportsDigital(p_aout, p_sys->i_selected_dev))
+ b_start_digital = false;
+
+ if (b_start_digital)
+ msg_Dbg(p_aout, "Using audio device for digital output");
+ else
+ msg_Dbg(p_aout, "Audio device supports PCM mode only");
+
/* add a callback to see if the device dies later on */
err = AudioObjectAddPropertyListener(p_sys->i_selected_dev, &audioDeviceAliveAddress, HardwareListener, (void *)p_aout);
if (err != noErr) {
/* Be tolerant, only give a warning here */
- msg_Warn(p_aout, "could not set alive check callback on device [0x%x]: %4.4s",
+ msg_Warn(p_aout, "could not set alive check callback on device [0x%x] [%4.4s]",
(unsigned int)p_sys->i_selected_dev, (char *)&err);
}
err = AudioObjectGetPropertyData(p_sys->i_selected_dev, &audioDeviceHogModeAddress, 0, NULL, &i_param_size, &p_sys->i_hog_pid);
if (err != noErr) {
/* This is not a fatal error. Some drivers simply don't support this property */
- msg_Warn(p_aout, "could not check whether device is hogged: %4.4s",
+ msg_Warn(p_aout, "could not check whether device is hogged [%4.4s]",
(char *)&err);
p_sys->i_hog_pid = -1;
}
bool b_success = false;
/* Check for Digital mode or Analog output mode */
- if (AOUT_FMT_SPDIF (fmt) && p_sys->b_selected_dev_is_digital) {
+ if (AOUT_FMT_SPDIF (fmt) && b_start_digital) {
if (StartSPDIF (p_aout, fmt)) {
msg_Dbg(p_aout, "digital output successfully opened");
b_success = true;
p_sys->au_component = AudioComponentFindNext(NULL, &desc);
if (p_sys->au_component == NULL) {
- msg_Warn(p_aout, "we cannot find our HAL component");
+ msg_Err(p_aout, "cannot find any HAL component, PCM output failed");
return false;
}
err = AudioComponentInstanceNew(p_sys->au_component, &p_sys->au_unit);
if (err != noErr) {
- msg_Warn(p_aout, "we cannot open our HAL component");
+ msg_Err(p_aout, "cannot open HAL component, PCM output failed [%4.4s]", (char *)&err);
return false;
}
sizeof(AudioObjectID));
if (err != noErr) {
- msg_Warn(p_aout, "we cannot select the audio device");
+ msg_Err(p_aout, "cannot select audio output device, PCM output failed [%4.4s]", (char *)&err);
return false;
}
&DeviceFormat,
&i_param_size);
- if (err != noErr)
+ if (err != noErr) {
+ msg_Err(p_aout, "failed to detect supported stream formats [%4.4s]", (char *)&err);
return false;
- else
+ } else
msg_Dbg(p_aout, STREAM_FORMAT_MSG("current format is: ", DeviceFormat));
/* Get the channel layout of the device side of the unit (vlc -> unit -> device) */
}
if (fmt->i_physical_channels == 0) {
fmt->i_physical_channels = AOUT_CHANS_STEREO;
- msg_Err(p_aout, "You should configure your speaker layout with Audio Midi Setup Utility in /Applications/Utilities. Now using Stereo mode.");
+ msg_Err(p_aout, "You should configure your speaker layout with Audio Midi Setup in /Applications/Utilities. VLC will output Stereo only.");
dialog_Fatal(p_aout, _("Audio device is not configured"), "%s",
_("You should configure your speaker layout with "
- "the \"Audio Midi Setup\" utility in /Applications/"
- "Utilities. Stereo mode is being used now."));
+ "\"Audio Midi Setup\" in /Applications/"
+ "Utilities. VLC will output Stereo only."));
}
}
free(layout);
} else {
- msg_Warn(p_aout, "this driver does not support kAudioDevicePropertyPreferredChannelLayout. BAD DRIVER AUTHOR !!!");
+ msg_Warn(p_aout, "device driver does not support kAudioDevicePropertyPreferredChannelLayout - using stereo fallback [%4.4s]", (char *)&err);
fmt->i_physical_channels = AOUT_CHANS_STEREO;
}
p_aout->sys->chans_to_reorder = aout_CheckChannelReorder(NULL, chans_out, fmt->i_physical_channels, p_aout->sys->chan_table);
if (p_aout->sys->chans_to_reorder)
- msg_Dbg(p_aout, "channel reordering needed");
+ msg_Dbg(p_aout, "channel reordering needed for 6.1 output");
break;
case 8:
p_aout->sys->chans_to_reorder = aout_CheckChannelReorder(NULL, chans_out, fmt->i_physical_channels, p_aout->sys->chan_table);
if (p_aout->sys->chans_to_reorder)
- msg_Dbg(p_aout, "channel reordering needed");
+ msg_Dbg(p_aout, "channel reordering needed for 7.1 output");
break;
}
p_sys->clock_diff += mdate();
/* setup circular buffer */
- TPCircularBufferInit(&p_sys->circular_buffer, kBufferLength);
+ TPCircularBufferInit(&p_sys->circular_buffer, AUDIO_BUFFER_SIZE_IN_SECONDS *
+ fmt->i_rate * fmt->i_bytes_per_frame);
p_sys->b_got_first_sample = false;
- p_sys->i_played_length = 0;
- p_sys->i_last_sample_time = 0;
/* Set volume for output unit */
- float volume = var_InheritInteger(p_aout, "auhal-volume") / (float)AOUT_VOLUME_DEFAULT;
- volume = volume * volume * volume;
- verify_noerr(AudioUnitSetParameter(p_sys->au_unit,
- kHALOutputParam_Volume,
- kAudioUnitScope_Global,
- 0,
- volume,
- 0));
+ VolumeSet(p_aout, p_sys->f_volume);
+ MuteSet(p_aout, p_sys->b_mute);
return true;
}
/*
* StartSPDIF: Setup an encoded digital stream (SPDIF) output
*/
-static int StartSPDIF (audio_output_t * p_aout, audio_sample_format_t *fmt)
+static int StartSPDIF(audio_output_t * p_aout, audio_sample_format_t *fmt)
{
struct aout_sys_t *p_sys = p_aout->sys;
OSStatus err = noErr;
err = AudioObjectSetPropertyData(p_sys->i_selected_dev, &audioDeviceHogModeAddress, 0, NULL, i_param_size, &p_sys->i_hog_pid);
if (err != noErr) {
- msg_Err(p_aout, "failed to set hogmode: [%4.4s]", (char *)&err);
+ msg_Err(p_aout, "failed to set hogmode [%4.4s]", (char *)&err);
return false;
}
}
if (err != noErr) {
- msg_Err(p_aout, "failed to set mixmode: [%4.4s]", (char *)&err);
+ msg_Err(p_aout, "failed to set mixmode [%4.4s]", (char *)&err);
return false;
}
}
AudioObjectPropertyAddress streamsAddress = { kAudioDevicePropertyStreams, kAudioDevicePropertyScopeOutput, kAudioObjectPropertyElementMaster };
err = AudioObjectGetPropertyDataSize(p_sys->i_selected_dev, &streamsAddress, 0, NULL, &i_param_size);
if (err != noErr) {
- msg_Err(p_aout, "could not get number of streams: [%4.4s]", (char *)&err);
+ msg_Err(p_aout, "could not get size of stream description packet [%4.4s]", (char *)&err);
return false;
}
err = AudioObjectGetPropertyData(p_sys->i_selected_dev, &streamsAddress, 0, NULL, &i_param_size, p_streams);
if (err != noErr) {
- msg_Err(p_aout, "could not get number of streams: [%4.4s]", (char *)&err);
+ msg_Err(p_aout, "could not fetch stream descriptions [%4.4s]", (char *)&err);
free(p_streams);
return false;
}
/* Retrieve all the stream formats supported by each output stream */
err = AudioObjectGetPropertyDataSize(p_streams[i], &physicalFormatsAddress, 0, NULL, &i_param_size);
if (err != noErr) {
- msg_Err(p_aout, "could not get number of streamformats: [%s] (%i)", (char *)&err, (int32_t)err);
+ msg_Err(p_aout, "could not get number of streamformats: [%4.4s] (%i)", (char *)&err, (int32_t)err);
continue;
}
i_param_size = sizeof(p_sys->sfmt_revert);
err = AudioObjectGetPropertyData(p_sys->i_stream_id, ¤tPhysicalFormatAddress, 0, NULL, &i_param_size, &p_sys->sfmt_revert);
if (err != noErr) {
- msg_Err(p_aout, "could not retrieve the original streamformat: [%4.4s]", (char *)&err);
+ msg_Err(p_aout, "could not retrieve the original streamformat [%4.4s]", (char *)&err);
continue;
}
p_sys->b_revert = true;
}
free(p_streams);
- /* get notified when we don't have spdif-output anymore */
- err = AudioObjectAddPropertyListener(p_sys->i_stream_id, &physicalFormatsAddress, HardwareListener, (void *)p_aout);
- if (err != noErr) {
- msg_Warn(p_aout, "could not set audio device property streams callback on device: %4.4s",
- (char *)&err);
- }
-
msg_Dbg(p_aout, STREAM_FORMAT_MSG("original stream format: ", p_sys->sfmt_revert));
- if (!AudioStreamChangeFormat(p_aout, p_sys->i_stream_id, p_sys->stream_format))
+ if (!AudioStreamChangeFormat(p_aout, p_sys->i_stream_id, p_sys->stream_format)) {
+ msg_Err(p_aout, "failed to change stream format for SPDIF output");
return false;
+ }
/* Set the format flags */
if (p_sys->stream_format.mFormatFlags & kAudioFormatFlagIsBigEndian)
(void *)p_aout,
&p_sys->i_procID);
if (err != noErr) {
- msg_Err(p_aout, "AudioDeviceCreateIOProcID failed: [%4.4s]", (char *)&err);
+ msg_Err(p_aout, "Failed to create Process ID [%4.4s]", (char *)&err);
return false;
}
/* Start device */
err = AudioDeviceStart(p_sys->i_selected_dev, p_sys->i_procID);
if (err != noErr) {
- msg_Err(p_aout, "AudioDeviceStart failed: [%4.4s]", (char *)&err);
+ msg_Err(p_aout, "Failed to start audio device [%4.4s]", (char *)&err);
err = AudioDeviceDestroyIOProcID(p_sys->i_selected_dev, p_sys->i_procID);
if (err != noErr)
- msg_Err(p_aout, "AudioDeviceDestroyIOProcID failed: [%4.4s]", (char *)&err);
+ msg_Err(p_aout, "Failed to destroy process ID [%4.4s]", (char *)&err);
return false;
}
/* setup circular buffer */
- TPCircularBufferInit(&p_sys->circular_buffer, kBufferLength);
- p_sys->i_played_length = 0;
- p_sys->i_last_sample_time = 0;
+ TPCircularBufferInit(&p_sys->circular_buffer, 200 * AOUT_SPDIF_SIZE);
return true;
}
OSStatus err = noErr;
UInt32 i_param_size = 0;
- AudioObjectPropertyAddress deviceAliveAddress = { kAudioDevicePropertyDeviceIsAlive, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
- err = AudioObjectRemovePropertyListener(p_sys->i_selected_dev, &deviceAliveAddress, HardwareListener, (void *)p_aout);
- if (err != noErr)
- msg_Err(p_aout, "failed to remove audio device life checker: [%4.4s]", (char *)&err);
-
- if (p_sys->b_digital) {
- AudioObjectPropertyAddress physicalFormatsAddress = { kAudioStreamPropertyAvailablePhysicalFormats, kAudioObjectPropertyScopeGlobal, 0 };
- err = AudioObjectRemovePropertyListener(p_sys->i_stream_id, &physicalFormatsAddress, HardwareListener, (void *)p_aout);
- if (err != noErr)
- msg_Err(p_aout, "failed to remove audio device property streams callback: [%4.4s]", (char *)&err);
- }
-
if (p_sys->au_unit) {
verify_noerr(AudioOutputUnitStop(p_sys->au_unit));
verify_noerr(AudioUnitUninitialize(p_sys->au_unit));
err = AudioDeviceStop(p_sys->i_selected_dev,
p_sys->i_procID);
if (err != noErr)
- msg_Err(p_aout, "AudioDeviceStop failed: [%4.4s]", (char *)&err);
+ msg_Err(p_aout, "Failed to stop audio device [%4.4s]", (char *)&err);
/* Remove IOProc callback */
err = AudioDeviceDestroyIOProcID(p_sys->i_selected_dev,
p_sys->i_procID);
if (err != noErr)
- msg_Err(p_aout, "AudioDeviceDestroyIOProcID failed: [%4.4s]", (char *)&err);
+ msg_Err(p_aout, "Failed to destroy Process ID [%4.4s]", (char *)&err);
if (p_sys->b_revert)
AudioStreamChangeFormat(p_aout, p_sys->i_stream_id, p_sys->sfmt_revert);
}
if (err != noErr)
- msg_Err(p_aout, "failed to set mixmode: [%4.4s]", (char *)&err);
+ msg_Err(p_aout, "failed to re-set mixmode [%4.4s]", (char *)&err);
}
}
- AudioObjectPropertyAddress audioDevicesAddress = { kAudioHardwarePropertyDevices, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
- err = AudioObjectRemovePropertyListener(kAudioObjectSystemObject, &audioDevicesAddress, HardwareListener, (void *)p_aout);
-
- if (err != noErr)
- msg_Err(p_aout, "AudioHardwareRemovePropertyListener failed: [%4.4s]", (char *)&err);
-
if (p_sys->i_hog_pid == getpid()) {
p_sys->i_hog_pid = -1;
i_param_size = sizeof(p_sys->i_hog_pid);
kAudioObjectPropertyElementMaster };
err = AudioObjectSetPropertyData(p_sys->i_selected_dev, &audioDeviceHogModeAddress, 0, NULL, i_param_size, &p_sys->i_hog_pid);
if (err != noErr)
- msg_Err(p_aout, "Could not release hogmode: [%4.4s]", (char *)&err);
+ msg_Err(p_aout, "Failed to release hogmode [%4.4s]", (char *)&err);
}
- p_sys->i_played_length = 0;
- p_sys->i_last_sample_time = 0;
+ p_sys->i_bytes_per_sample = 0;
+ p_sys->b_digital = false;
/* clean-up circular buffer */
TPCircularBufferCleanup(&p_sys->circular_buffer);
#pragma mark -
#pragma mark core interaction
-static int DeviceList(audio_output_t *p_aout, char ***namesp, char ***descsp)
+static void ReportDevice(audio_output_t *p_aout, UInt32 i_id, char *name)
{
- struct aout_sys_t *p_sys = p_aout->sys;
- char **names, **descs;
- unsigned n = 0;
-
- for (struct audio_device_t *device = p_sys->devices; device != NULL; device = device->next)
- n++;
+ char deviceid[10];
+ sprintf(deviceid, "%i", i_id);
- *namesp = names = xmalloc(sizeof(*names) * n);
- *descsp = descs = xmalloc(sizeof(*descs) * n);
-
- char deviceid[100];
- for (struct audio_device_t *device = p_sys->devices; device != NULL; device = device->next) {
- sprintf(deviceid, "%i", device->deviceid);
- *(names++) = strdup(deviceid);
- *(descs++) = strdup(device->name);
- }
-
- return n;
-}
-
-static void add_device_to_list(audio_output_t * p_aout, UInt32 i_id, char *name)
-{
- struct aout_sys_t *p_sys = p_aout->sys;
-
- struct audio_device_t *device = malloc(sizeof(*device));
- if (unlikely(device == NULL))
- return;
-
- device->next = p_sys->devices;
- device->deviceid = i_id;
- device->name = strdup(name);
-
- p_sys->devices = device;
+ aout_HotplugReport(p_aout, deviceid, name);
}
static void RebuildDeviceList(audio_output_t * p_aout)
{
OSStatus err = noErr;
UInt32 propertySize = 0;
- AudioObjectID defaultDeviceID = 0;
AudioObjectID *deviceIDs;
UInt32 numberOfDevices;
+ CFMutableArrayRef currentListOfDevices;
struct aout_sys_t *p_sys = p_aout->sys;
- if (p_sys->devices) {
- for (struct audio_device_t * device = p_sys->devices, *next; device != NULL; device = next) {
- next = device->next;
- free(device->name);
- free(device);
- }
- }
+ /* setup local array */
+ currentListOfDevices = CFArrayCreateMutable(kCFAllocatorDefault, 0, NULL);
/* Get number of devices */
AudioObjectPropertyAddress audioDevicesAddress = { kAudioHardwarePropertyDevices, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
err = AudioObjectGetPropertyDataSize(kAudioObjectSystemObject, &audioDevicesAddress, 0, NULL, &propertySize);
if (err != noErr) {
- msg_Err(p_aout, "Could not get number of devices: [%s]", (char *)&err);
+ msg_Err(p_aout, "Could not get number of devices: [%4.4s]", (char *)&err);
return;
}
numberOfDevices = propertySize / sizeof(AudioDeviceID);
if (numberOfDevices < 1) {
- msg_Err(p_aout, "No audio output devices were found.");
+ msg_Err(p_aout, "No audio output devices found.");
return;
}
msg_Dbg(p_aout, "found %i audio device(s)", numberOfDevices);
/* Populate DeviceID array */
err = AudioObjectGetPropertyData(kAudioObjectSystemObject, &audioDevicesAddress, 0, NULL, &propertySize, deviceIDs);
if (err != noErr) {
- msg_Err(p_aout, "could not get the device IDs: [%s]", (char *)&err);
- return;
- }
-
- /* Find the ID of the default Device */
- AudioObjectPropertyAddress defaultDeviceAddress = { kAudioHardwarePropertyDefaultOutputDevice, kAudioDevicePropertyScopeOutput, kAudioObjectPropertyElementMaster };
- propertySize = sizeof(AudioObjectID);
- err= AudioObjectGetPropertyData(kAudioObjectSystemObject, &defaultDeviceAddress, 0, NULL, &propertySize, &defaultDeviceID);
- if (err != noErr) {
- msg_Err(p_aout, "could not get default audio device: [%s]", (char *)&err);
+ msg_Err(p_aout, "could not get the device IDs [%4.4s]", (char *)&err);
return;
}
- p_sys->i_default_dev = defaultDeviceID;
AudioObjectPropertyAddress deviceNameAddress = { kAudioObjectPropertyName, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
continue;
}
- add_device_to_list(p_aout, i_id, psz_name);
+ ReportDevice(p_aout, i_id, psz_name);
+ CFArrayAppendValue(currentListOfDevices, CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &i_id));
if (AudioDeviceSupportsDigital(p_aout, deviceIDs[i])) {
b_digital = true;
char *psz_encoded_name = nil;
asprintf(&psz_encoded_name, _("%s (Encoded Output)"), psz_name);
i_id = i_id | AOUT_VAR_SPDIF_FLAG;
- add_device_to_list(p_aout, i_id, psz_encoded_name);
+ ReportDevice(p_aout, i_id, psz_encoded_name);
+ CFArrayAppendValue(currentListOfDevices, CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &i_id));
free(psz_encoded_name);
}
+ // TODO: only register once for each device
+ RegisterAudioStreamsCallback(p_aout, deviceIDs[i]);
+
CFRelease(device_name_ref);
free(psz_name);
}
- add_device_to_list(p_aout, 0, _("System Sound Output Device"));
+ CFIndex count = 0;
+ if (p_sys->device_list)
+ count = CFArrayGetCount(p_sys->device_list);
- /* Attach a Listener so that we are notified of a change in the Device setup */
- err = AudioObjectAddPropertyListener(kAudioObjectSystemObject, &audioDevicesAddress, HardwareListener, (void *)p_aout);
- if (err != noErr)
- msg_Warn(p_aout, "failed to add listener for audio device configuration (%i)", err);
+ if (count > 0) {
+ CFNumberRef cfn_device_id;
+ int i_device_id = 0;
+ for (CFIndex x = 0; x < count; x++) {
+ if (!CFArrayContainsValue(currentListOfDevices, CFRangeMake(0, count), CFArrayGetValueAtIndex(p_sys->device_list, x))) {
+ cfn_device_id = CFArrayGetValueAtIndex(p_sys->device_list, x);
+
+ if (cfn_device_id) {
+ CFNumberGetValue(cfn_device_id, kCFNumberSInt32Type, &i_device_id);
+ ReportDevice(p_aout, i_device_id, NULL);
+ }
+ }
+ }
+ }
+ CFRelease(p_sys->device_list);
+ p_sys->device_list = CFArrayCreateCopy(kCFAllocatorDefault, currentListOfDevices);
+ CFRelease(currentListOfDevices);
+
+ ReportDevice(p_aout, 0, _("System Sound Output Device"));
free(deviceIDs);
}
struct aout_sys_t *p_sys = p_aout->sys;
if (name)
- p_sys->i_selected_dev = atoi(name);
+ p_sys->i_new_selected_dev = atoi(name);
else
- p_sys->i_selected_dev = 0;
+ p_sys->i_new_selected_dev = 0;
- bool b_supports_digital = (p_sys->i_selected_dev & AOUT_VAR_SPDIF_FLAG);
+ bool b_supports_digital = (p_sys->i_new_selected_dev & AOUT_VAR_SPDIF_FLAG);
if (b_supports_digital)
p_sys->b_selected_dev_is_digital = true;
else
p_sys->b_selected_dev_is_digital = false;
- p_sys->i_selected_dev = p_sys->i_selected_dev & ~AOUT_VAR_SPDIF_FLAG;
+ p_sys->i_new_selected_dev = p_sys->i_new_selected_dev & ~AOUT_VAR_SPDIF_FLAG;
aout_DeviceReport(p_aout, name);
aout_RestartRequest(p_aout, AOUT_RESTART_OUTPUT);
struct aout_sys_t *p_sys = p_aout->sys;
OSStatus ostatus;
+ if(p_sys->b_digital)
+ return VLC_EGENERIC;
+
+ p_sys->f_volume = volume;
aout_VolumeReport(p_aout, volume);
/* Set volume for output unit */
struct aout_sys_t *p_sys = p_aout->sys;
OSStatus ostatus;
+ if(p_sys->b_digital)
+ return VLC_EGENERIC;
+
+ p_sys->b_mute = mute;
aout_MuteReport(p_aout, mute);
float volume = .0;
-
if (!mute)
- volume = var_InheritInteger(p_aout, "auhal-volume") / (float)AOUT_VOLUME_DEFAULT;
+ volume = p_sys->f_volume;
ostatus = AudioUnitSetParameter(p_sys->au_unit,
kHALOutputParam_Volume,
#pragma mark -
#pragma mark actual playback
-static void Play (audio_output_t * p_aout, block_t * p_block)
+static void Play(audio_output_t * p_aout, block_t * p_block)
{
struct aout_sys_t *p_sys = p_aout->sys;
VLC_CODEC_FL32);
}
- /* keep track of the played data */
- p_aout->sys->i_played_length += p_block->i_length;
-
/* move data to buffer */
- if (unlikely(TPCircularBufferProduceBytes(&p_sys->circular_buffer, p_block->p_buffer, p_block->i_buffer) == 0)) {
- msg_Warn(p_aout, "Audio buffer was dropped");
- }
+ if (unlikely(!TPCircularBufferProduceBytes(&p_sys->circular_buffer, p_block->p_buffer, p_block->i_buffer)))
+ msg_Warn(p_aout, "dropped buffer");
+ if (!p_sys->i_bytes_per_sample)
+ p_sys->i_bytes_per_sample = p_block->i_buffer / p_block->i_nb_samples;
}
block_Release(p_block);
}
-static void Pause (audio_output_t *p_aout, bool pause, mtime_t date)
+static void Pause(audio_output_t *p_aout, bool pause, mtime_t date)
{
struct aout_sys_t * p_sys = p_aout->sys;
VLC_UNUSED(date);
static void Flush(audio_output_t *p_aout, bool wait)
{
- struct aout_sys_t * p_sys = p_aout->sys;
- VLC_UNUSED(wait);
+ struct aout_sys_t *p_sys = p_aout->sys;
- p_sys->b_got_first_sample = false;
+ if (wait) {
+ int32_t availableBytes;
+ vlc_mutex_lock(&p_sys->lock);
+ TPCircularBufferTail(&p_sys->circular_buffer, &availableBytes);
+ while (availableBytes > 0) {
+ vlc_cond_wait(&p_sys->cond, &p_sys->lock);
+ TPCircularBufferTail(&p_sys->circular_buffer, &availableBytes);
+ }
+ vlc_mutex_unlock(&p_sys->lock);
- /* flush circular buffer */
- AudioOutputUnitStop(p_aout->sys->au_unit);
- TPCircularBufferClear(&p_aout->sys->circular_buffer);
+ } else {
+ p_sys->b_got_first_sample = false;
- p_sys->i_played_length = 0;
- p_sys->i_last_sample_time = 0;
+ /* flush circular buffer */
+ AudioOutputUnitStop(p_aout->sys->au_unit);
+ TPCircularBufferClear(&p_aout->sys->circular_buffer);
+ }
}
static int TimeGet(audio_output_t *p_aout, mtime_t *delay)
{
struct aout_sys_t * p_sys = p_aout->sys;
- vlc_mutex_lock(&p_sys->lock);
- mtime_t i_pos = p_sys->i_last_sample_time * CLOCK_FREQ / p_sys->i_rate;
- vlc_mutex_unlock(&p_sys->lock);
-
- if (i_pos > 0) {
- *delay = p_aout->sys->i_played_length - i_pos;
- return 0;
- }
- else
+ if (!p_sys->i_bytes_per_sample)
return -1;
+
+ int32_t availableBytes;
+ TPCircularBufferTail(&p_sys->circular_buffer, &availableBytes);
+
+ *delay = (availableBytes / p_sys->i_bytes_per_sample) * CLOCK_FREQ / p_sys->i_rate;
+
+ return 0;
}
/*****************************************************************************
VLC_UNUSED(ioActionFlags);
VLC_UNUSED(inTimeStamp);
VLC_UNUSED(inBusNumber);
+ VLC_UNUSED(inNumberFrames);
audio_output_t * p_aout = (audio_output_t *)p_obj;
struct aout_sys_t * p_sys = p_aout->sys;
- int bytesToCopy = ioData->mBuffers[0].mDataByteSize;
+ int bytesRequested = ioData->mBuffers[0].mDataByteSize;
Float32 *targetBuffer = (Float32*)ioData->mBuffers[0].mData;
+ vlc_mutex_lock(&p_sys->lock);
/* Pull audio from buffer */
int32_t availableBytes;
Float32 *buffer = TPCircularBufferTail(&p_sys->circular_buffer, &availableBytes);
/* check if we have enough data */
if (!availableBytes) {
/* return an empty buffer so silence is played until we have data */
- for (UInt32 j = 0; j < inNumberFrames; j++)
- targetBuffer[j] = 0.;
+ memset(targetBuffer, 0, ioData->mBuffers[0].mDataByteSize);
} else {
- memcpy(targetBuffer, buffer, __MIN(bytesToCopy, availableBytes));
- TPCircularBufferConsume(&p_sys->circular_buffer, __MIN(bytesToCopy, availableBytes));
- VLC_UNUSED(inNumberFrames);
- vlc_mutex_lock(&p_sys->lock);
- p_sys->i_last_sample_time = inTimeStamp->mSampleTime;
- vlc_mutex_unlock(&p_sys->lock);
+ int32_t bytesToCopy = __MIN(bytesRequested, availableBytes);
+
+ memcpy(targetBuffer, buffer, bytesToCopy);
+ TPCircularBufferConsume(&p_sys->circular_buffer, bytesToCopy);
+ ioData->mBuffers[0].mDataByteSize = bytesToCopy;
}
+ vlc_cond_signal(&p_sys->cond);
+ vlc_mutex_unlock(&p_sys->lock);
+
return noErr;
}
/*
* RenderCallbackSPDIF: callback for SPDIF audio output
*/
-static OSStatus RenderCallbackSPDIF (AudioDeviceID inDevice,
+static OSStatus RenderCallbackSPDIF(AudioDeviceID inDevice,
const AudioTimeStamp * inNow,
const void * inInputData,
const AudioTimeStamp * inInputTime,
VLC_UNUSED(inDevice);
VLC_UNUSED(inInputData);
VLC_UNUSED(inInputTime);
+ VLC_UNUSED(inOutputTime);
audio_output_t * p_aout = (audio_output_t *)threadGlobals;
struct aout_sys_t * p_sys = p_aout->sys;
- int bytesToCopy = outOutputData->mBuffers[p_sys->i_stream_index].mDataByteSize;
- Float32 *targetBuffer = (Float32*)outOutputData->mBuffers[p_sys->i_stream_index].mData;
+ int bytesRequested = outOutputData->mBuffers[p_sys->i_stream_index].mDataByteSize;
+ char *targetBuffer = outOutputData->mBuffers[p_sys->i_stream_index].mData;
+ vlc_mutex_lock(&p_sys->lock);
/* Pull audio from buffer */
int32_t availableBytes;
- Float32 *buffer = TPCircularBufferTail(&p_sys->circular_buffer, &availableBytes);
+ char *buffer = TPCircularBufferTail(&p_sys->circular_buffer, &availableBytes);
/* check if we have enough data */
if (!availableBytes) {
/* return an empty buffer so silence is played until we have data */
memset(targetBuffer, 0, outOutputData->mBuffers[p_sys->i_stream_index].mDataByteSize);
} else {
- memcpy(targetBuffer, buffer, __MIN(bytesToCopy, availableBytes));
- TPCircularBufferConsume(&p_sys->circular_buffer, __MIN(bytesToCopy, availableBytes));
- vlc_mutex_lock(&p_sys->lock);
- p_sys->i_last_sample_time = inOutputTime->mSampleTime;
- vlc_mutex_unlock(&p_sys->lock);
+ int32_t bytesToCopy = __MIN(bytesRequested, availableBytes);
+
+ memcpy(targetBuffer, buffer, bytesToCopy);
+ TPCircularBufferConsume(&p_sys->circular_buffer, bytesToCopy);
+ outOutputData->mBuffers[p_sys->i_stream_index].mDataByteSize = bytesToCopy;
}
+ vlc_cond_signal(&p_sys->cond);
+ vlc_mutex_unlock(&p_sys->lock);
+
return noErr;
}
if (!p_aout)
return -1;
-#ifndef NDEBUG
for (unsigned int i = 0; i < inNumberAddresses; i++) {
switch (inAddresses[i].mSelector) {
case kAudioHardwarePropertyDevices:
- msg_Warn(p_aout, "audio device configuration changed, resetting cache");
+ msg_Dbg(p_aout, "audio device configuration changed, resetting cache");
break;
case kAudioDevicePropertyDeviceIsAlive:
break;
case kAudioStreamPropertyAvailablePhysicalFormats:
- msg_Warn(p_aout, "available physical formats for audio device changed, resetting aout");
+ msg_Dbg(p_aout, "available physical formats for audio device changed, resetting aout");
break;
default:
break;
}
}
-#endif
RebuildDeviceList(p_aout);
aout_RestartRequest(p_aout, AOUT_RESTART_OUTPUT);
#pragma mark -
#pragma mark helpers
+static int RegisterAudioStreamsCallback(audio_output_t *p_aout, AudioDeviceID i_dev_id)
+{
+ OSStatus err = noErr;
+ UInt32 i_param_size = 0;
+ AudioStreamID *p_streams = NULL;
+ int i_streams = 0;
+
+ /* Retrieve all the output streams */
+ AudioObjectPropertyAddress streamsAddress = { kAudioDevicePropertyStreams, kAudioDevicePropertyScopeOutput, kAudioObjectPropertyElementMaster };
+ err = AudioObjectGetPropertyDataSize(i_dev_id, &streamsAddress, 0, NULL, &i_param_size);
+ if (err != noErr) {
+ msg_Err(p_aout, "could not get number of streams [%4.4s] (%i)", (char *)&err, (int32_t)err);
+ return VLC_EGENERIC;
+ }
+
+ i_streams = i_param_size / sizeof(AudioStreamID);
+ p_streams = (AudioStreamID *)malloc(i_param_size);
+ if (p_streams == NULL)
+ return VLC_ENOMEM;
+
+ err = AudioObjectGetPropertyData(i_dev_id, &streamsAddress, 0, NULL, &i_param_size, p_streams);
+ if (err != noErr) {
+ msg_Err(p_aout, "could not get list of streams [%4.4s]", (char *)&err);
+ return VLC_EGENERIC;
+ }
+
+ for (int i = 0; i < i_streams; i++) {
+ /* get notified when physical formats change */
+ AudioObjectPropertyAddress physicalFormatsAddress = { kAudioStreamPropertyAvailablePhysicalFormats, kAudioObjectPropertyScopeGlobal, 0 };
+ err = AudioObjectAddPropertyListener(p_streams[i], &physicalFormatsAddress, HardwareListener, (void *)p_aout);
+ if (err != noErr) {
+ // nope just means that we already have a callback
+ if (err == kAudioHardwareIllegalOperationError) {
+ msg_Dbg(p_aout, "could not set audio stream formats property callback on stream id %i, callback already set? [%4.4s]", p_streams[i],
+ (char *)&err);
+ } else {
+ msg_Warn(p_aout, "could not set audio stream formats property callback on stream id %i [%4.4s]", p_streams[i],
+ (char *)&err);
+ }
+ }
+ }
+
+ free(p_streams);
+ return VLC_SUCCESS;
+}
+
/*
* AudioDeviceHasOutput: Checks if the device is actually an output device
*/
AudioObjectPropertyAddress streamsAddress = { kAudioDevicePropertyStreams, kAudioDevicePropertyScopeOutput, kAudioObjectPropertyElementMaster };
err = AudioObjectGetPropertyDataSize(i_dev_id, &streamsAddress, 0, NULL, &i_param_size);
if (err != noErr) {
- msg_Err(p_aout, "could not get number of streams: [%s] (%i)", (char *)&err, (int32_t)err);
+ msg_Err(p_aout, "could not get number of streams [%4.4s] (%i)", (char *)&err, (int32_t)err);
return false;
}
err = AudioObjectGetPropertyData(i_dev_id, &streamsAddress, 0, NULL, &i_param_size, p_streams);
if (err != noErr) {
- msg_Err(p_aout, "could not get list of streams: [%s]", (char *)&err);
+ msg_Err(p_aout, "could not get list of streams [%4.4s]", (char *)&err);
return false;
}
AudioObjectPropertyAddress physicalFormatsAddress = { kAudioStreamPropertyAvailablePhysicalFormats, kAudioObjectPropertyScopeGlobal, 0 };
err = AudioObjectGetPropertyDataSize(i_stream_id, &physicalFormatsAddress, 0, NULL, &i_param_size);
if (err != noErr) {
- msg_Err(p_aout, "could not get number of streamformats: [%s] (%i)", (char *)&err, (int32_t)err);
+ msg_Err(p_aout, "could not get number of streamformats [%4.4s] (%i)", (char *)&err, (int32_t)err);
return false;
}
i_formats = i_param_size / sizeof(AudioStreamRangedDescription);
- msg_Dbg(p_aout, "found %i stream formats", i_formats);
+ msg_Dbg(p_aout, "found %i stream formats for stream id %i", i_formats, i_stream_id);
p_format_list = (AudioStreamRangedDescription *)malloc(i_param_size);
if (p_format_list == NULL)
err = AudioObjectGetPropertyData(i_stream_id, &physicalFormatsAddress, 0, NULL, &i_param_size, p_format_list);
if (err != noErr) {
- msg_Err(p_aout, "could not get the list of streamformats: [%4.4s]", (char *)&err);
+ msg_Err(p_aout, "could not get the list of streamformats [%4.4s]", (char *)&err);
free(p_format_list);
p_format_list = NULL;
return false;
/* Install the callback */
err = AudioObjectAddPropertyListener(i_stream_id, &physicalFormatAddress, StreamListener, (void *)&w);
if (err != noErr) {
- msg_Err(p_aout, "AudioObjectAddPropertyListener for kAudioStreamPropertyPhysicalFormat failed: [%4.4s]", (char *)&err);
+ msg_Err(p_aout, "AudioObjectAddPropertyListener for kAudioStreamPropertyPhysicalFormat failed [%4.4s]", (char *)&err);
return false;
}
err = AudioObjectSetPropertyData(i_stream_id, &physicalFormatAddress, 0, NULL, sizeof(AudioStreamBasicDescription),
&change_format);
if (err != noErr) {
- msg_Err(p_aout, "could not set the stream format: [%4.4s]", (char *)&err);
+ msg_Err(p_aout, "could not set the stream format [%4.4s]", (char *)&err);
return false;
}
/* Removing the property listener */
err = AudioObjectRemovePropertyListener(i_stream_id, &physicalFormatAddress, StreamListener, (void *)&w);
if (err != noErr) {
- msg_Err(p_aout, "AudioStreamRemovePropertyListener failed: [%4.4s]", (char *)&err);
+ msg_Err(p_aout, "AudioStreamRemovePropertyListener failed [%4.4s]", (char *)&err);
return false;
}
projects / vlc / blobdiff