*****************************************************************************/
struct aout_sys_t
{
- 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;
+ bool b_selected_dev_is_default; /* true if the user selected the default audio device (id 0) */
+
AudioDeviceIOProcID i_procID; /* DeviceID of current device */
bool b_digital; /* Are we running in digital mode? */
- mtime_t clock_diff; /* Difference between VLC clock and Device clock */
uint8_t chans_to_reorder; /* do we need channel reordering */
uint8_t chan_table[AOUT_CHAN_MAX];
- UInt32 i_numberOfChannels;
TPCircularBuffer circular_buffer; /* circular buffer to swap the audio data */
/* AUHAL specific */
pid_t i_hog_pid; /* The keep the pid of our hog status */
AudioStreamID i_stream_id; /* The StreamID that has a cac3 streamformat */
int i_stream_index; /* The index of i_stream_id in an AudioBufferList */
- AudioStreamBasicDescription stream_format; /* The format we changed the stream to */
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 */
int i_bytes_per_sample;
- struct audio_device_t *devices;
+ CFArrayRef device_list;
+
+ vlc_mutex_t var_lock; /* protects access to device_list and i_selected_dev */
+
+ float f_volume;
+ bool b_mute;
+ bool b_paused;
vlc_mutex_t lock;
vlc_cond_t cond;
-};
-struct audio_device_t
-{
- struct audio_device_t *next;
- UInt32 deviceid;
- char *name;
+ bool b_ignore_streams_changed_callback;
};
-
#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 RenderCallbackSPDIF (AudioDeviceID, const AudioTimeStamp *, const void *, const AudioTimeStamp *,
AudioBufferList *, const AudioTimeStamp *, void *);
-static OSStatus HardwareListener (AudioObjectID, UInt32, const AudioObjectPropertyAddress *, void *);
+static OSStatus DevicesListener (AudioObjectID, UInt32, const AudioObjectPropertyAddress *, void *);
+static OSStatus DeviceAliveListener (AudioObjectID, UInt32, const AudioObjectPropertyAddress *, void *);
+static OSStatus DefaultDeviceChangedListener (AudioObjectID, UInt32, const AudioObjectPropertyAddress *, void *);
+static OSStatus StreamsChangedListener (AudioObjectID, UInt32, const AudioObjectPropertyAddress *, void *);
+
static OSStatus StreamListener (AudioObjectID, UInt32, const AudioObjectPropertyAddress *, void *);
-static int RegisterAudioStreamsCallback(audio_output_t *, AudioDeviceID);
+static int ManageAudioStreamsCallback(audio_output_t *p_aout, AudioDeviceID i_dev_id, bool b_register);
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)
{
- OSStatus err = noErr;
-
- 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);
- vlc_cond_init(&sys->cond);
-
- 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;
+ OSStatus err = noErr;
+ vlc_mutex_init(&p_sys->var_lock);
+ vlc_mutex_init(&p_sys->lock);
+ vlc_cond_init(&p_sys->cond);
+ p_sys->b_digital = false;
+ p_sys->b_ignore_streams_changed_callback = false;
+ p_sys->b_selected_dev_is_default = false;
+ p_sys->b_paused = false;
+
+ 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);
+
+ /*
+ * Force an own run loop for callbacks.
+ *
+ * According to rtaudio, this is absolutely necessary since 10.6 to get correct notifications.
+ * It might fix issues when using the module as a library where a proper loop is not setup already.
+ */
+ CFRunLoopRef theRunLoop = NULL;
+ AudioObjectPropertyAddress property = { kAudioHardwarePropertyRunLoop, kAudioObjectPropertyScopeGlobal,kAudioObjectPropertyElementMaster };
+ err = AudioObjectSetPropertyData(kAudioObjectSystemObject, &property, 0, NULL, sizeof(CFRunLoopRef), &theRunLoop);
+ if (err != noErr) {
+ msg_Err(p_aout, "failed to set the run loop property [%4.4s]", (char *)&err);
+ }
- /* Attach a Listener so that we are notified of a change in the Device setup */
+ /* 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 *)aout);
+ err = AudioObjectAddPropertyListener(kAudioObjectSystemObject, &audioDevicesAddress, DevicesListener, (void *)p_aout);
+ if (err != noErr)
+ msg_Err(p_aout, "failed to add listener for audio device configuration [%4.4s]", (char *)&err);
+
+ /* Attach a listener to be notified about changes in default audio device */
+ AudioObjectPropertyAddress defaultDeviceAddress = { kAudioHardwarePropertyDefaultOutputDevice, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
+ err = AudioObjectAddPropertyListener(kAudioObjectSystemObject, &defaultDeviceAddress, DefaultDeviceChangedListener, (void *)p_aout);
if (err != noErr)
- msg_Warn(aout, "failed to add listener for audio device configuration [%4.4s]", (char *)&err);
+ msg_Err(p_aout, "failed to add listener for default audio device [%4.4s]", (char *)&err);
- RebuildDeviceList(aout);
+ 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"));
+ char *psz_audio_device = var_InheritString(p_aout, "auhal-audio-device");
+ SwitchAudioDevice(p_aout, psz_audio_device);
+ free(psz_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;
- OSStatus err = noErr;
+ OSStatus err = noErr;
- /* remove audio device callback */
- AudioObjectPropertyAddress deviceAliveAddress = { kAudioDevicePropertyDeviceIsAlive, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
- err = AudioObjectRemovePropertyListener(sys->i_selected_dev, &deviceAliveAddress, HardwareListener, (void *)aout);
+ /* remove audio devices callback */
+ AudioObjectPropertyAddress audioDevicesAddress = { kAudioHardwarePropertyDevices, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
+ err = AudioObjectRemovePropertyListener(kAudioObjectSystemObject, &audioDevicesAddress, DevicesListener, (void *)p_aout);
if (err != noErr)
- msg_Err(aout, "failed to remove audio device life checker: [%4.4s]", (char *)&err);
+ msg_Err(p_aout, "AudioHardwareRemovePropertyListener failed [%4.4s]", (char *)&err);
- /* remove audio streams callback */
- if (sys->i_stream_id > 0) {
- AudioObjectPropertyAddress physicalFormatsAddress = { kAudioStreamPropertyAvailablePhysicalFormats, kAudioObjectPropertyScopeGlobal, 0 };
- err = AudioObjectRemovePropertyListener(sys->i_stream_id, &physicalFormatsAddress, HardwareListener, (void *)aout);
- if (err != noErr)
- msg_Err(aout, "failed to remove audio device property streams callback: [%4.4s]", (char *)&err);
+ /* remove listener to be notified about changes in default audio device */
+ AudioObjectPropertyAddress defaultDeviceAddress = { kAudioHardwarePropertyDefaultOutputDevice, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
+ err = AudioObjectRemovePropertyListener(kAudioObjectSystemObject, &defaultDeviceAddress, DefaultDeviceChangedListener, (void *)p_aout);
+ if (err != noErr)
+ msg_Err(p_aout, "failed to remove listener for default audio device [%4.4s]", (char *)&err);
+
+ vlc_mutex_lock(&p_sys->var_lock);
+ /* remove streams callbacks */
+ CFIndex count = CFArrayGetCount(p_sys->device_list);
+ if (count > 0) {
+ for (CFIndex x = 0; x < count; x++) {
+ AudioDeviceID deviceId = 0;
+ CFNumberRef cfn_device_id = CFArrayGetValueAtIndex(p_sys->device_list, x);
+ if (!cfn_device_id)
+ continue;
+
+ CFNumberGetValue(cfn_device_id, kCFNumberSInt32Type, &deviceId);
+ if (!(deviceId & AOUT_VAR_SPDIF_FLAG)) {
+ ManageAudioStreamsCallback(p_aout, deviceId, false);
+ }
+ }
}
- config_PutPsz(aout, "auhal-audio-device", aout_DeviceGet(aout));
+ CFRelease(p_sys->device_list);
+ vlc_mutex_unlock(&p_sys->var_lock);
- for (struct audio_device_t * device = sys->devices, *next; device != NULL; device = next) {
- next = device->next;
- free(device->name);
- free(device);
- }
+ char *psz_device = aout_DeviceGet(p_aout);
+ config_PutPsz(p_aout, "auhal-audio-device", psz_device);
+ free(psz_device);
- vlc_mutex_destroy(&sys->lock);
- vlc_cond_destroy(&sys->cond);
+ vlc_mutex_destroy(&p_sys->var_lock);
+ 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)
p_sys->b_digital = false;
p_sys->au_component = NULL;
p_sys->au_unit = NULL;
- p_sys->clock_diff = (mtime_t) 0;
p_sys->i_hog_pid = -1;
p_sys->i_stream_id = 0;
p_sys->i_stream_index = -1;
p_sys->b_revert = false;
p_sys->b_changed_mixing = false;
p_sys->i_bytes_per_sample = 0;
+ p_sys->b_paused = false;
+
+ vlc_mutex_lock(&p_sys->var_lock);
+ p_sys->i_selected_dev = p_sys->i_new_selected_dev;
aout_FormatPrint(p_aout, "VLC is looking for:", fmt);
msg_Dbg(p_aout, "attempting to use device %i", p_sys->i_selected_dev);
- /* Check if the desired device is alive and usable */
- i_param_size = sizeof(b_alive);
- AudioObjectPropertyAddress audioDeviceAliveAddress = { kAudioDevicePropertyDeviceIsAlive,
- kAudioObjectPropertyScopeGlobal,
- kAudioObjectPropertyElementMaster };
- err = AudioObjectGetPropertyData(p_sys->i_selected_dev, &audioDeviceAliveAddress, 0, NULL, &i_param_size, &b_alive);
+ AudioObjectPropertyAddress audioDeviceAliveAddress = { kAudioDevicePropertyDeviceIsAlive, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
+ if (p_sys->i_selected_dev > 0) {
+ /* Check if the desired device is alive and usable */
+ i_param_size = sizeof(b_alive);
+ err = AudioObjectGetPropertyData(p_sys->i_selected_dev, &audioDeviceAliveAddress, 0, NULL, &i_param_size, &b_alive);
+ 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]",
+ (unsigned int)p_sys->i_selected_dev, (char *)&err);
+ b_alive = false;
+ }
- 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",
- (unsigned int)p_sys->i_selected_dev, (char *)&err);
- b_alive = false;
+ if (!b_alive)
+ msg_Warn(p_aout, "selected audio device is not alive, switching to default device");
}
- if (!b_alive) {
- msg_Warn(p_aout, "selected audio device is not alive, switching to default device with id %i", p_sys->i_default_dev);
- p_sys->i_selected_dev = p_sys->i_default_dev;
- p_sys->b_selected_dev_is_digital = false;
+ p_sys->b_selected_dev_is_default = false;
+ if (!b_alive || p_sys->i_selected_dev == 0) {
+ p_sys->b_selected_dev_is_default = true;
+
+ AudioObjectID defaultDeviceID = 0;
+ UInt32 propertySize = sizeof(AudioObjectID);
+ 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);
+ vlc_mutex_unlock(&p_sys->var_lock);
+ goto error;
+ }
+ else
+ msg_Dbg(p_aout, "using default audio device %i", defaultDeviceID);
+
+ p_sys->i_selected_dev = defaultDeviceID;
+ p_sys->b_selected_dev_is_digital = var_InheritBool(p_aout, "spdif");
}
+ vlc_mutex_unlock(&p_sys->var_lock);
// recheck if device still supports digital
b_start_digital = p_sys->b_selected_dev_is_digital;
b_start_digital = false;
if (b_start_digital)
- msg_Dbg(p_aout, "Use audio device for digital output");
+ 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);
+ err = AudioObjectAddPropertyListener(p_sys->i_selected_dev, &audioDeviceAliveAddress, DeviceAliveListener, (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;
}
AudioComponentDescription desc;
AudioStreamBasicDescription DeviceFormat;
AudioChannelLayout *layout;
- AudioChannelLayout new_layout;
AURenderCallbackStruct input;
p_aout->sys->chans_to_reorder = 0;
+ SInt32 currentMinorSystemVersion;
+ if(Gestalt(gestaltSystemVersionMinor, ¤tMinorSystemVersion) != noErr)
+ msg_Err(p_aout, "failed to check OSX version");
+
/* Lets go find our Component */
desc.componentType = kAudioUnitType_Output;
desc.componentSubType = kAudioUnitSubType_HALOutput;
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) */
fmt->i_physical_channels = AOUT_CHANS_STEREO;
} else {
/* We want more than stereo and we can do that */
+ msg_Dbg(p_aout, "Device is configured with %d channels", layout->mNumberChannelDescriptions);
+
+ // maps auhal channels (1-9) to vlc ones
+ static const unsigned i_auhal_channel_mapping[] = {
+ [kAudioChannelLabel_Left] = AOUT_CHAN_LEFT,
+ [kAudioChannelLabel_Right] = AOUT_CHAN_RIGHT,
+ [kAudioChannelLabel_Center] = AOUT_CHAN_CENTER,
+ [kAudioChannelLabel_LFEScreen] = AOUT_CHAN_LFE,
+ [kAudioChannelLabel_LeftSurround] = AOUT_CHAN_REARLEFT,
+ [kAudioChannelLabel_RightSurround] = AOUT_CHAN_REARRIGHT,
+ [kAudioChannelLabel_RearSurroundLeft] = AOUT_CHAN_MIDDLELEFT, // needs to be swapped with rear
+ [kAudioChannelLabel_RearSurroundRight] = AOUT_CHAN_MIDDLERIGHT,// needs to be swapped with rear
+ [kAudioChannelLabel_CenterSurround] = AOUT_CHAN_REARCENTER
+ };
+
+
+ uint32_t chans_out[AOUT_CHAN_MAX];
+ memset(&chans_out, 0, sizeof(chans_out));
+
+ bool b_have_middle_channels = false;
+ unsigned index = 0;
for (unsigned int i = 0; i < layout->mNumberChannelDescriptions; i++) {
#ifndef NDEBUG
- msg_Dbg(p_aout, "this is channel: %d", (int)layout->mChannelDescriptions[i].mChannelLabel);
+ msg_Dbg(p_aout, "this is channel: %d, at index %d", (int)layout->mChannelDescriptions[i].mChannelLabel, i);
#endif
+ if(index >= AOUT_CHAN_MAX)
+ break;
+
+ AudioChannelLabel chan = layout->mChannelDescriptions[i].mChannelLabel;
+ if(chan < sizeof(i_auhal_channel_mapping) / sizeof(i_auhal_channel_mapping[0])
+ && i_auhal_channel_mapping[chan] > 0) {
+ fmt->i_physical_channels |= i_auhal_channel_mapping[chan];
+ chans_out[index++] = i_auhal_channel_mapping[chan];
+
+ if (chan == kAudioChannelLabel_RearSurroundLeft ||
+ chan == kAudioChannelLabel_RearSurroundRight)
+ b_have_middle_channels = true;
+ } else {
+ msg_Dbg(p_aout, "found nonrecognized channel %d at index %d", chan, i);
+ }
+ }
- switch(layout->mChannelDescriptions[i].mChannelLabel) {
- case kAudioChannelLabel_Left:
- fmt->i_physical_channels |= AOUT_CHAN_LEFT;
- continue;
- case kAudioChannelLabel_Right:
- fmt->i_physical_channels |= AOUT_CHAN_RIGHT;
- continue;
- case kAudioChannelLabel_Center:
- fmt->i_physical_channels |= AOUT_CHAN_CENTER;
- continue;
- case kAudioChannelLabel_LFEScreen:
- fmt->i_physical_channels |= AOUT_CHAN_LFE;
- continue;
- case kAudioChannelLabel_LeftSurround:
- fmt->i_physical_channels |= AOUT_CHAN_REARLEFT;
- continue;
- case kAudioChannelLabel_RightSurround:
- fmt->i_physical_channels |= AOUT_CHAN_REARRIGHT;
- continue;
- case kAudioChannelLabel_RearSurroundLeft:
- fmt->i_physical_channels |= AOUT_CHAN_MIDDLELEFT;
- continue;
- case kAudioChannelLabel_RearSurroundRight:
- fmt->i_physical_channels |= AOUT_CHAN_MIDDLERIGHT;
- continue;
- case kAudioChannelLabel_CenterSurround:
- fmt->i_physical_channels |= AOUT_CHAN_REARCENTER;
- continue;
- default:
- msg_Warn(p_aout, "unrecognized channel form provided by driver: %d", (int)layout->mChannelDescriptions[i].mChannelLabel);
+ /*
+ * For 7.1, AOUT_CHAN_MIDDLELEFT/RIGHT needs to be swapped with AOUT_CHAN_REARLEFT/RIGHT.
+ * Auhals kAudioChannelLabel_Left/RightSurround is used as surround for 5.1, but as middle speakers
+ * for rear 7.1.
+ */
+ if (b_have_middle_channels) {
+ for (unsigned i = 0; i < index; i++) {
+ switch (chans_out[i]) {
+ case AOUT_CHAN_MIDDLELEFT:
+ chans_out[i] = AOUT_CHAN_REARLEFT;
+ break;
+ case AOUT_CHAN_MIDDLERIGHT:
+ chans_out[i] = AOUT_CHAN_REARRIGHT;
+ break;
+ case AOUT_CHAN_REARLEFT:
+ chans_out[i] = AOUT_CHAN_MIDDLELEFT;
+ break;
+ case AOUT_CHAN_REARRIGHT:
+ chans_out[i] = AOUT_CHAN_MIDDLERIGHT;
+ break;
+ }
}
}
+
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."));
+ } else {
+
+ 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");
+ else
+ msg_Dbg(p_aout, "no channel reordering needed");
}
+
}
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;
}
msg_Dbg(p_aout, "selected %d physical channels for device output", aout_FormatNbChannels(fmt));
msg_Dbg(p_aout, "VLC will output: %s", aout_FormatPrintChannels(fmt));
- p_sys->i_numberOfChannels = aout_FormatNbChannels(fmt);
-
- memset (&new_layout, 0, sizeof(new_layout));
- uint32_t chans_out[AOUT_CHAN_MAX];
- switch(aout_FormatNbChannels(fmt)) {
- case 1:
- new_layout.mChannelLayoutTag = kAudioChannelLayoutTag_Mono;
- break;
- case 2:
- new_layout.mChannelLayoutTag = kAudioChannelLayoutTag_Stereo;
- break;
- case 3:
- if (fmt->i_physical_channels & AOUT_CHAN_CENTER)
- new_layout.mChannelLayoutTag = kAudioChannelLayoutTag_DVD_7; // L R C
- else if (fmt->i_physical_channels & AOUT_CHAN_LFE)
- new_layout.mChannelLayoutTag = kAudioChannelLayoutTag_DVD_4; // L R LFE
- break;
- case 4:
- if (fmt->i_physical_channels & (AOUT_CHAN_CENTER | AOUT_CHAN_LFE))
- new_layout.mChannelLayoutTag = kAudioChannelLayoutTag_DVD_10; // L R C LFE
- else if (fmt->i_physical_channels & (AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT))
- new_layout.mChannelLayoutTag = kAudioChannelLayoutTag_DVD_3; // L R Ls Rs
- else if (fmt->i_physical_channels & (AOUT_CHAN_CENTER | AOUT_CHAN_REARCENTER))
- new_layout.mChannelLayoutTag = kAudioChannelLayoutTag_DVD_3; // L R C Cs
- break;
- case 5:
- if (fmt->i_physical_channels & (AOUT_CHAN_CENTER))
- new_layout.mChannelLayoutTag = kAudioChannelLayoutTag_DVD_19; // L R Ls Rs C
- else if (fmt->i_physical_channels & (AOUT_CHAN_LFE))
- new_layout.mChannelLayoutTag = kAudioChannelLayoutTag_DVD_18; // L R Ls Rs LFE
- break;
- case 6:
- if (fmt->i_physical_channels & (AOUT_CHAN_LFE))
- new_layout.mChannelLayoutTag = kAudioChannelLayoutTag_DVD_20; // L R Ls Rs C LFE
- else
- new_layout.mChannelLayoutTag = kAudioChannelLayoutTag_AudioUnit_6_0; // L R Ls Rs C Cs
- break;
- case 7:
- new_layout.mChannelLayoutTag = kAudioChannelLayoutTag_MPEG_6_1_A;
-
- chans_out[0] = AOUT_CHAN_LEFT;
- chans_out[1] = AOUT_CHAN_RIGHT;
- chans_out[2] = AOUT_CHAN_CENTER;
- chans_out[3] = AOUT_CHAN_LFE;
- chans_out[4] = AOUT_CHAN_REARLEFT;
- chans_out[5] = AOUT_CHAN_REARRIGHT;
- chans_out[6] = AOUT_CHAN_REARCENTER;
-
- 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");
-
- break;
- case 8:
- new_layout.mChannelLayoutTag = kAudioChannelLayoutTag_MPEG_7_1_A;
-
- chans_out[0] = AOUT_CHAN_LEFT;
- chans_out[1] = AOUT_CHAN_RIGHT;
- chans_out[2] = AOUT_CHAN_CENTER;
- chans_out[3] = AOUT_CHAN_LFE;
- chans_out[4] = AOUT_CHAN_MIDDLELEFT;
- chans_out[5] = AOUT_CHAN_MIDDLERIGHT;
- chans_out[6] = AOUT_CHAN_REARLEFT;
- chans_out[7] = AOUT_CHAN_REARRIGHT;
-
- 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");
-
- break;
- }
/* Set up the format to be used */
DeviceFormat.mSampleRate = fmt->i_rate;
kAudioUnitScope_Input,
0, &input, sizeof(input)));
- /* Set the new_layout as the layout VLC will use to feed the AU unit */
- verify_noerr(AudioUnitSetProperty(p_sys->au_unit,
- kAudioUnitProperty_AudioChannelLayout,
- kAudioUnitScope_Output,
- 0, &new_layout, sizeof(new_layout)));
-
- if (new_layout.mNumberChannelDescriptions > 0)
- free(new_layout.mChannelDescriptions);
-
/* AU initiliaze */
verify_noerr(AudioUnitInitialize(p_sys->au_unit));
- /* Find the difference between device clock and mdate clock */
- p_sys->clock_diff = - (mtime_t)
- AudioConvertHostTimeToNanos(AudioGetCurrentHostTime()) / 1000;
- p_sys->clock_diff += mdate();
-
/* setup circular buffer */
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;
+ verify_noerr(AudioOutputUnitStart(p_sys->au_unit));
/* 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;
Boolean b_writeable = false;
AudioStreamID *p_streams = NULL;
unsigned i_streams = 0;
+ AudioStreamBasicDescription desired_stream_format;
/* Start doing the SPDIF setup proces */
p_sys->b_digital = true;
i_param_size = sizeof(p_sys->i_hog_pid);
p_sys->i_hog_pid = getpid() ;
+ /*
+ * HACK: On 10.6, auhal will trigger the streams changed callback when calling below line,
+ * directly in the same thread. This call needs to be ignored to avoid endless restarting.
+ */
+ p_sys->b_ignore_streams_changed_callback = true;
err = AudioObjectSetPropertyData(p_sys->i_selected_dev, &audioDeviceHogModeAddress, 0, NULL, i_param_size, &p_sys->i_hog_pid);
+ p_sys->b_ignore_streams_changed_callback = false;
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;
}
if (i_requested_rate_format >= 0) /* We prefer to output at the samplerate of the original audio */
- p_sys->stream_format = p_format_list[i_requested_rate_format].mFormat;
+ desired_stream_format = p_format_list[i_requested_rate_format].mFormat;
else if (i_current_rate_format >= 0) /* If not possible, we will try to use the current samplerate of the device */
- p_sys->stream_format = p_format_list[i_current_rate_format].mFormat;
+ desired_stream_format = p_format_list[i_current_rate_format].mFormat;
else
- p_sys->stream_format = p_format_list[i_backup_rate_format].mFormat; /* And if we have to, any digital format will be just fine (highest rate possible) */
+ desired_stream_format = p_format_list[i_backup_rate_format].mFormat; /* And if we have to, any digital format will be just fine (highest rate possible) */
}
free(p_format_list);
}
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, desired_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)
+ if (desired_stream_format.mFormatFlags & kAudioFormatFlagIsBigEndian)
fmt->i_format = VLC_CODEC_SPDIFB;
else
fmt->i_format = VLC_CODEC_SPDIFL;
fmt->i_bytes_per_frame = AOUT_SPDIF_SIZE;
fmt->i_frame_length = A52_FRAME_NB;
- fmt->i_rate = (unsigned int)p_sys->stream_format.mSampleRate;
+ fmt->i_rate = (unsigned int)desired_stream_format.mSampleRate;
p_sys->i_rate = fmt->i_rate;
aout_FormatPrepare(fmt);
(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;
}
- /* Check for the difference between the Device clock and mdate */
- p_sys->clock_diff = - (mtime_t)
- AudioConvertHostTimeToNanos(AudioGetCurrentHostTime()) / 1000;
- p_sys->clock_diff += mdate();
-
/* 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;
}
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 (p_sys->b_changed_mixing && p_sys->sfmt_revert.mFormatID != kAudioFormat60958AC3) {
int b_mix;
Boolean b_writeable = false;
+ i_param_size = sizeof(int);
/* Revert mixable to true if we are allowed to */
AudioObjectPropertyAddress audioDeviceSupportsMixingAddress = { kAudioDevicePropertySupportsMixing , kAudioDevicePropertyScopeOutput, kAudioObjectPropertyElementMaster };
err = AudioObjectIsPropertySettable(p_sys->i_selected_dev, &audioDeviceSupportsMixingAddress, &b_writeable);
}
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);
AudioObjectPropertyAddress audioDeviceHogModeAddress = { kAudioDevicePropertyHogMode,
kAudioDevicePropertyScopeOutput,
kAudioObjectPropertyElementMaster };
+
+ /*
+ * HACK: On 10.6, auhal will trigger the streams changed callback when calling below line,
+ * directly in the same thread. This call needs to be ignored to avoid endless restarting.
+ */
+ p_sys->b_ignore_streams_changed_callback = true;
err = AudioObjectSetPropertyData(p_sys->i_selected_dev, &audioDeviceHogModeAddress, 0, NULL, i_param_size, &p_sys->i_hog_pid);
+ p_sys->b_ignore_streams_changed_callback = false;
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);
+ }
+
+ /* remove audio device alive callback */
+ AudioObjectPropertyAddress deviceAliveAddress = { kAudioDevicePropertyDeviceIsAlive, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
+ err = AudioObjectRemovePropertyListener(p_sys->i_selected_dev, &deviceAliveAddress, DeviceAliveListener, (void *)p_aout);
+ if (err != noErr) {
+ /* Be tolerant, only give a warning here */
+ msg_Warn(p_aout, "failed to remove audio device life checker [%4.4s]", (char *)&err);
}
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)
-{
- 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++;
-
- *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)
+static void ReportDevice(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;
+ char deviceid[10];
+ sprintf(deviceid, "%i", i_id);
- 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);
- }
- }
- p_sys->devices = NULL;
+ ReportDevice(p_aout, 0, _("System Sound Output Device"));
+
+ /* setup local array */
+ currentListOfDevices = CFArrayCreateMutable(kCFAllocatorDefault, 0, NULL);
/* Get number of devices */
AudioObjectPropertyAddress audioDevicesAddress = { kAudioHardwarePropertyDevices, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
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: [%4.4s]", (char *)&err);
+ msg_Err(p_aout, "could not get the device IDs [%4.4s]", (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: [%4.4s]", (char *)&err);
- return;
- }
- p_sys->i_default_dev = defaultDeviceID;
-
AudioObjectPropertyAddress deviceNameAddress = { kAudioObjectPropertyName, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
for (unsigned int i = 0; i < numberOfDevices; i++) {
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]);
+ ManageAudioStreamsCallback(p_aout, deviceIDs[i], true);
CFRelease(device_name_ref);
free(psz_name);
}
- // TODO: fix default audio device
- add_device_to_list(p_aout, 0, _("System Sound Output Device"));
+ vlc_mutex_lock(&p_sys->var_lock);
+ CFIndex count = 0;
+ if (p_sys->device_list)
+ count = CFArrayGetCount(p_sys->device_list);
+
+ 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);
+ vlc_mutex_unlock(&p_sys->var_lock);
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);
static int VolumeSet(audio_output_t * p_aout, float volume)
{
struct aout_sys_t *p_sys = p_aout->sys;
- OSStatus ostatus;
+ OSStatus ostatus = 0;
+
+ if(p_sys->b_digital)
+ return VLC_EGENERIC;
+ p_sys->f_volume = volume;
aout_VolumeReport(p_aout, volume);
/* Set volume for output unit */
- ostatus = AudioUnitSetParameter(p_sys->au_unit,
- kHALOutputParam_Volume,
- kAudioUnitScope_Global,
- 0,
- volume * volume * volume,
- 0);
+ if(!p_sys->b_mute) {
+ ostatus = AudioUnitSetParameter(p_sys->au_unit,
+ kHALOutputParam_Volume,
+ kAudioUnitScope_Global,
+ 0,
+ volume * volume * volume,
+ 0);
+ }
if (var_InheritBool(p_aout, "volume-save"))
config_PutInt(p_aout, "auhal-volume", lroundf(volume * AOUT_VOLUME_DEFAULT));
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;
if (p_block->i_nb_samples > 0) {
- if (!p_sys->b_got_first_sample) {
- /* Start the AU */
- verify_noerr(AudioOutputUnitStart(p_sys->au_unit));
- p_sys->b_got_first_sample = true;
- }
-
/* Do the channel reordering */
if (p_sys->chans_to_reorder && !p_sys->b_digital) {
aout_ChannelReorder(p_block->p_buffer,
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);
- if (p_aout->sys->b_digital) {
- if (pause)
- AudioDeviceStop(p_sys->i_selected_dev, p_sys->i_procID);
- else
- AudioDeviceStart(p_sys->i_selected_dev, p_sys->i_procID);
- } else {
- if (pause)
- AudioOutputUnitStop(p_sys->au_unit);
- else
- AudioOutputUnitStart(p_sys->au_unit);
- }
+ vlc_mutex_lock(&p_sys->lock);
+ p_sys->b_paused = pause;
+ vlc_mutex_unlock(&p_sys->lock);
}
static void Flush(audio_output_t *p_aout, bool wait)
{
struct aout_sys_t *p_sys = p_aout->sys;
+ int32_t availableBytes;
+ vlc_mutex_lock(&p_sys->lock);
+ TPCircularBufferTail(&p_sys->circular_buffer, &availableBytes);
+
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);
-
} else {
- p_sys->b_got_first_sample = false;
-
- /* flush circular buffer */
- AudioOutputUnitStop(p_aout->sys->au_unit);
- TPCircularBufferClear(&p_aout->sys->circular_buffer);
+ /* flush circular buffer if data is left */
+ if (availableBytes > 0)
+ TPCircularBufferClear(&p_aout->sys->circular_buffer);
}
+
+ vlc_mutex_unlock(&p_sys->lock);
}
static int TimeGet(audio_output_t *p_aout, mtime_t *delay)
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);
Float32 *buffer = TPCircularBufferTail(&p_sys->circular_buffer, &availableBytes);
/* check if we have enough data */
- if (!availableBytes) {
+ if (!availableBytes || p_sys->b_paused) {
/* 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, bytesRequested);
} else {
- memcpy(targetBuffer, buffer, __MIN(bytesToCopy, availableBytes));
- TPCircularBufferConsume(&p_sys->circular_buffer, __MIN(bytesToCopy, availableBytes));
+ int32_t bytesToCopy = __MIN(bytesRequested, availableBytes);
+ assert(bytesToCopy > 0);
+
+ memcpy(targetBuffer, buffer, bytesToCopy);
+ TPCircularBufferConsume(&p_sys->circular_buffer, bytesToCopy);
+ ioData->mBuffers[0].mDataByteSize = bytesToCopy;
}
vlc_cond_signal(&p_sys->cond);
/*
* 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,
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;
+ 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);
char *buffer = TPCircularBufferTail(&p_sys->circular_buffer, &availableBytes);
/* check if we have enough data */
- if (!availableBytes) {
+ if (!availableBytes || p_sys->b_paused) {
/* return an empty buffer so silence is played until we have data */
- memset(targetBuffer, 0, outOutputData->mBuffers[p_sys->i_stream_index].mDataByteSize);
+ memset(targetBuffer, 0, bytesRequested);
} else {
- memcpy(targetBuffer, buffer, __MIN(bytesToCopy, availableBytes));
- TPCircularBufferConsume(&p_sys->circular_buffer, __MIN(bytesToCopy, availableBytes));
+ int32_t bytesToCopy = __MIN(bytesRequested, availableBytes);
+ assert(bytesToCopy > 0);
+
+ 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);
#pragma mark Stream / Hardware Listeners
/*
- * HardwareListener: Warns us of changes in the list of registered devices
+ * Callback when device list changed
*/
-static OSStatus HardwareListener(AudioObjectID inObjectID, UInt32 inNumberAddresses, const AudioObjectPropertyAddress inAddresses[], void*inClientData)
+static OSStatus DevicesListener(AudioObjectID inObjectID, UInt32 inNumberAddresses, const AudioObjectPropertyAddress inAddresses[], void *inClientData)
{
- OSStatus err = noErr;
- audio_output_t *p_aout = (audio_output_t *)inClientData;
VLC_UNUSED(inObjectID);
VLC_UNUSED(inNumberAddresses);
VLC_UNUSED(inAddresses);
+ audio_output_t *p_aout = (audio_output_t *)inClientData;
if (!p_aout)
return -1;
+ aout_sys_t *p_sys = p_aout->sys;
-#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");
- break;
+ msg_Dbg(p_aout, "audio device configuration changed, resetting cache");
+ RebuildDeviceList(p_aout);
- case kAudioDevicePropertyDeviceIsAlive:
- msg_Warn(p_aout, "audio device died, resetting aout");
- break;
+ vlc_mutex_lock(&p_sys->var_lock);
+ if(!CFArrayContainsValue(p_sys->device_list, CFRangeMake(0, CFArrayGetCount(p_sys->device_list)),CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &p_sys->i_selected_dev)))
+ aout_RestartRequest(p_aout, AOUT_RESTART_OUTPUT);
+ vlc_mutex_unlock(&p_sys->var_lock);
- case kAudioStreamPropertyAvailablePhysicalFormats:
- msg_Warn(p_aout, "available physical formats for audio device changed, resetting aout");
- break;
+ return noErr;
+}
- default:
- msg_Warn(p_aout, "device reset for unknown reason (%i)", inAddresses[i].mSelector);
- break;
- }
+/*
+ * Callback when current device is not alive anymore
+ */
+static OSStatus DeviceAliveListener(AudioObjectID inObjectID, UInt32 inNumberAddresses, const AudioObjectPropertyAddress inAddresses[], void *inClientData)
+{
+ VLC_UNUSED(inObjectID);
+ VLC_UNUSED(inNumberAddresses);
+ VLC_UNUSED(inAddresses);
+
+ audio_output_t *p_aout = (audio_output_t *)inClientData;
+ if (!p_aout)
+ return -1;
+
+ msg_Warn(p_aout, "audio device died, resetting aout");
+ aout_RestartRequest(p_aout, AOUT_RESTART_OUTPUT);
+
+ return noErr;
+}
+
+/*
+ * Callback when default audio device changed
+ */
+static OSStatus DefaultDeviceChangedListener(AudioObjectID inObjectID, UInt32 inNumberAddresses, const AudioObjectPropertyAddress inAddresses[], void *inClientData)
+{
+ VLC_UNUSED(inObjectID);
+ VLC_UNUSED(inNumberAddresses);
+ VLC_UNUSED(inAddresses);
+
+ audio_output_t *p_aout = (audio_output_t *)inClientData;
+ if (!p_aout)
+ return -1;
+
+ if (!p_aout->sys->b_selected_dev_is_default)
+ return noErr;
+
+ AudioObjectID defaultDeviceID = 0;
+ UInt32 propertySize = sizeof(AudioObjectID);
+ AudioObjectPropertyAddress defaultDeviceAddress = { kAudioHardwarePropertyDefaultOutputDevice, kAudioDevicePropertyScopeOutput, kAudioObjectPropertyElementMaster };
+ propertySize = sizeof(AudioObjectID);
+ OSStatus 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);
+ return -1;
}
-#endif
- RebuildDeviceList(p_aout);
+ msg_Dbg(p_aout, "default device changed to %i", defaultDeviceID);
+
+ /* Default device is changed by the os to allow other apps to play sound while in digital
+ mode. But this should not affect ourself. */
+ if (p_aout->sys->b_digital) {
+ msg_Dbg(p_aout, "ignore, as digital mode is active");
+ return noErr;
+ }
+
+ /* Also ignore events which announce the same device id */
+ if(defaultDeviceID == p_aout->sys->i_selected_dev)
+ return noErr;
+
+ msg_Dbg(p_aout, "default device actually changed, resetting aout");
aout_RestartRequest(p_aout, AOUT_RESTART_OUTPUT);
- return err;
+ return noErr;
+}
+
+/*
+ * Callback when physical formats for device change
+ */
+static OSStatus StreamsChangedListener(AudioObjectID inObjectID, UInt32 inNumberAddresses, const AudioObjectPropertyAddress inAddresses[], void *inClientData)
+{
+ OSStatus err = noErr;
+ UInt32 i_param_size = 0;
+ AudioStreamID *p_streams = NULL;
+ int i_streams = 0;
+
+ VLC_UNUSED(inNumberAddresses);
+ VLC_UNUSED(inAddresses);
+
+ audio_output_t *p_aout = (audio_output_t *)inClientData;
+ if (!p_aout)
+ return -1;
+
+ aout_sys_t *p_sys = p_aout->sys;
+ if(unlikely(p_sys->b_ignore_streams_changed_callback == true))
+ return 0;
+
+ msg_Dbg(p_aout, "available physical formats for audio device changed");
+ RebuildDeviceList(p_aout);
+
+ /* In this case audio has not yet started. Below code will not work and is not needed here. */
+ if (p_sys->i_selected_dev == 0)
+ return 0;
+
+ /*
+ * check if changed stream id belongs to current device
+ */
+ vlc_mutex_lock(&p_sys->var_lock);
+ 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 for device %i [%4.4s]", p_sys->i_selected_dev, (char *)&err);
+ vlc_mutex_unlock(&p_sys->var_lock);
+ return VLC_EGENERIC;
+ }
+
+ i_streams = i_param_size / sizeof(AudioStreamID);
+ p_streams = (AudioStreamID *)malloc(i_param_size);
+ if (p_streams == NULL) {
+ vlc_mutex_unlock(&p_sys->var_lock);
+ return VLC_ENOMEM;
+ }
+
+ 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 list of streams [%4.4s]", (char *)&err);
+ vlc_mutex_unlock(&p_sys->var_lock);
+ return VLC_EGENERIC;
+ }
+ vlc_mutex_unlock(&p_sys->var_lock);
+
+ for (int i = 0; i < i_streams; i++) {
+ if (p_streams[i] == inObjectID) {
+ msg_Dbg(p_aout, "Restart aout as this affects current device");
+ aout_RestartRequest(p_aout, AOUT_RESTART_OUTPUT);
+ break;
+ }
+ }
+ free(p_streams);
+
+ return noErr;
}
/*
- * StreamListener: check whether the device's physical format changes on-the-fly (unlikely)
+ * StreamListener: check whether the device's physical format change is complete
*/
-static OSStatus StreamListener(AudioObjectID inObjectID, UInt32 inNumberAddresses, const AudioObjectPropertyAddress inAddresses[], void*inClientData)
+static OSStatus StreamListener(AudioObjectID inObjectID, UInt32 inNumberAddresses, const AudioObjectPropertyAddress inAddresses[], void *inClientData)
{
OSStatus err = noErr;
struct { vlc_mutex_t lock; vlc_cond_t cond; } * w = inClientData;
#pragma mark -
#pragma mark helpers
-static int RegisterAudioStreamsCallback(audio_output_t *p_aout, AudioDeviceID i_dev_id)
+static int ManageAudioStreamsCallback(audio_output_t *p_aout, AudioDeviceID i_dev_id, bool b_register)
{
OSStatus err = noErr;
UInt32 i_param_size = 0;
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 for device id %i [%4.4s]", i_dev_id, (char *)&err);
return VLC_EGENERIC;
}
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 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, already have callback: %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);
+
+ if (b_register) {
+ err = AudioObjectAddPropertyListener(p_streams[i], &physicalFormatsAddress, StreamsChangedListener, (void *)p_aout);
+ if (err != noErr) {
+ // nope just means that we already have a callback
+ if (err == kAudioHardwareIllegalOperationError) {
+ msg_Warn(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_Err(p_aout, "could not set audio stream formats property callback on stream id %i [%4.4s]", p_streams[i],
+ (char *)&err);
+ }
}
+
+ } else { /* unregister callback */
+ err = AudioObjectRemovePropertyListener(p_streams[i], &physicalFormatsAddress, StreamsChangedListener, (void *)p_aout);
+ if (err != noErr)
+ msg_Err(p_aout, "failed to remove audio device property streams callback [%4.4s]", (char *)&err);
}
+
}
free(p_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: [%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;
}
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;
OSStatus err = noErr;
UInt32 i_param_size = 0;
+ int retValue = true;
+
AudioObjectPropertyAddress physicalFormatAddress = { kAudioStreamPropertyPhysicalFormat, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
struct { vlc_mutex_t lock; vlc_cond_t cond; } w;
/* 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);
- return false;
+ msg_Err(p_aout, "AudioObjectAddPropertyListener for kAudioStreamPropertyPhysicalFormat failed [%4.4s]", (char *)&err);
+ retValue = false;
+ goto out;
}
/* change the format */
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);
- return false;
+ msg_Err(p_aout, "could not set the stream format [%4.4s]", (char *)&err);
+ retValue = false;
+ goto out;
}
/* The AudioStreamSetProperty is not only asynchronious (requiring the locks)
/* We need to check again */
}
+out:
/* 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);
- return false;
+ msg_Err(p_aout, "AudioStreamRemovePropertyListener failed [%4.4s]", (char *)&err);
+ retValue = false;
}
/* Destroy the lock and condition */
vlc_mutex_destroy(&w.lock);
vlc_cond_destroy(&w.cond);
- return true;
+ return retValue;
}
projects / vlc / blobdiff