/*****************************************************************************
* auhal.c: AUHAL and Coreaudio output plugin
*****************************************************************************
- * Copyright (C) 2005 - 2012 VLC authors and VideoLAN
+ * Copyright (C) 2005 - 2013 VLC authors and VideoLAN
* $Id$
*
* 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
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-/*****************************************************************************
- * Preamble
- *****************************************************************************/
+#pragma mark includes
#ifdef HAVE_CONFIG_H
# import "config.h"
#import <vlc_common.h>
#import <vlc_plugin.h>
-#import <vlc_dialog.h> // dialog_Fatal
-#import <vlc_aout.h> // aout_*
+#import <vlc_dialog.h> // dialog_Fatal
+#import <vlc_aout.h> // aout_*
-#import <AudioUnit/AudioUnit.h> // AudioUnit
-#import <CoreAudio/CoreAudio.h> // AudioDeviceID
-#import <AudioToolbox/AudioFormat.h> // AudioFormatGetProperty
+#import <AudioUnit/AudioUnit.h> // AudioUnit
+#import <CoreAudio/CoreAudio.h> // AudioDeviceID
+#import <AudioToolbox/AudioFormat.h> // AudioFormatGetProperty
#import <CoreServices/CoreServices.h>
#import "TPCircularBuffer.h"
+#pragma mark -
+#pragma mark private declarations
+
#ifndef verify_noerr
# define verify_noerr(a) assert((a) == noErr)
#endif
(unsigned int)sfm.mFramesPerPacket, (unsigned int)sfm.mBytesPerFrame, \
(unsigned int)sfm.mChannelsPerFrame, (unsigned int)sfm.mBitsPerChannel
-#define FRAMESIZE 2048
-#define BUFSIZE (FRAMESIZE * 8) * 8
#define AOUT_VAR_SPDIF_FLAG 0xf00000
-#define kBufferLength BUFSIZE
+#define AUDIO_BUFFER_SIZE_IN_SECONDS (AOUT_MAX_ADVANCE_TIME / CLOCK_FREQ)
+
#define AOUT_VOLUME_DEFAULT 256
#define AOUT_VOLUME_MAX 512
+#define VOLUME_TEXT N_("Audio volume")
+#define VOLUME_LONGTEXT VOLUME_TEXT
+
+#define DEVICE_TEXT N_("Last audio device")
+#define DEVICE_LONGTEXT DEVICE_TEXT
/*****************************************************************************
* aout_sys_t: private audio output method descriptor
*****************************************************************************/
struct aout_sys_t
{
- aout_packet_t packet;
- AudioDeviceID i_default_dev; /* DeviceID of defaultOutputDevice */
- AudioDeviceID i_selected_dev; /* DeviceID of the selected device */
+ 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 */
- UInt32 i_devices; /* Number of CoreAudio Devices */
bool b_digital; /* Are we running in digital mode? */
mtime_t clock_diff; /* Difference between VLC clock and Device clock */
TPCircularBuffer circular_buffer; /* circular buffer to swap the audio data */
/* AUHAL specific */
- Component au_component; /* The Audiocomponent we use */
+ AudioComponent au_component; /* The AudioComponent we use */
AudioUnit au_unit; /* The AudioUnit we use */
/* CoreAudio SPDIF mode specific */
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; /* Wether we need to revert the stream format */
- bool b_changed_mixing; /* Wether we need to set the mixing mode back */
+ 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;
+
+ CFArrayRef device_list;
+
+ float f_volume;
+ bool b_mute;
+
+ vlc_mutex_t lock;
+ vlc_cond_t cond;
};
-/*****************************************************************************
- * Local prototypes.
- *****************************************************************************/
+#pragma mark -
+#pragma mark local prototypes & module descriptor
+
static int Open (vlc_object_t *);
-static int OpenAnalog (audio_output_t *, audio_sample_format_t *);
-static int OpenSPDIF (audio_output_t *, audio_sample_format_t *);
static void Close (vlc_object_t *);
+static int Start (audio_output_t *, audio_sample_format_t *);
+static int StartAnalog (audio_output_t *, audio_sample_format_t *);
+static int StartSPDIF (audio_output_t *, audio_sample_format_t *);
+static void Stop (audio_output_t *);
-static void PlayAnalog (audio_output_t *, block_t *);
-static void FlushAnalog (audio_output_t *, bool);
-static void PauseAnalog (audio_output_t *, bool, mtime_t);
+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 int MuteSet (audio_output_t *, bool);
+
+static void Play (audio_output_t *, block_t *);
+static void Pause (audio_output_t *, bool, mtime_t);
+static void Flush (audio_output_t *, bool);
static int TimeGet (audio_output_t *, mtime_t *);
+static OSStatus RenderCallbackAnalog (vlc_object_t *, AudioUnitRenderActionFlags *, const AudioTimeStamp *,
+ UInt32 , UInt32, AudioBufferList *);
+
+static OSStatus RenderCallbackSPDIF (AudioDeviceID, const AudioTimeStamp *, const void *, const AudioTimeStamp *,
+ AudioBufferList *, const AudioTimeStamp *, void *);
-static void Probe (audio_output_t *);
+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 AudioStreamChangeFormat (audio_output_t *, AudioStreamID, AudioStreamBasicDescription);
-static OSStatus RenderCallbackAnalog (vlc_object_t *, AudioUnitRenderActionFlags *, const AudioTimeStamp *, unsigned int, unsigned int, AudioBufferList *);
-
-static OSStatus RenderCallbackSPDIF (AudioDeviceID, const AudioTimeStamp *, const void *, const AudioTimeStamp *,
- AudioBufferList *, const AudioTimeStamp *, void *);
-static OSStatus HardwareListener (AudioObjectID, UInt32, const AudioObjectPropertyAddress *, void *);
-static OSStatus StreamListener (AudioObjectID, UInt32, const AudioObjectPropertyAddress *, void *);
-static int AudioDeviceCallback (vlc_object_t *, const char *,
- vlc_value_t, vlc_value_t, void *);
-
-static int VolumeSet (audio_output_t *, float);
-static int MuteSet (audio_output_t *, bool);
-
-
-/*****************************************************************************
- * Module descriptor
- *****************************************************************************/
-#define ADEV_TEXT N_("Audio Device")
-#define ADEV_LONGTEXT N_("Choose a number corresponding to the number of an " \
- "audio device, as listed in your 'Audio Device' menu. This device will " \
- "then be used by default for audio playback.")
-
-#define VOLUME_TEXT N_("Audio volume")
-#define VOLUME_LONGTEXT VOLUME_TEXT
vlc_module_begin ()
set_shortname("auhal")
set_category(CAT_AUDIO)
set_subcategory(SUBCAT_AUDIO_AOUT)
set_callbacks(Open, Close)
- add_integer("macosx-audio-device", 0, ADEV_TEXT, ADEV_LONGTEXT, false)
add_integer("auhal-volume", AOUT_VOLUME_DEFAULT,
VOLUME_TEXT, VOLUME_LONGTEXT, true)
change_integer_range(0, AOUT_VOLUME_MAX)
+ add_string("auhal-audio-device", "", DEVICE_TEXT, DEVICE_LONGTEXT, true)
+ add_obsolete_integer("macosx-audio-device") /* since 2.1.0 */
vlc_module_end ()
-/*****************************************************************************
- * Open: open macosx audio output
- *****************************************************************************/
+#pragma mark -
+#pragma mark initialization
+
+static int Open(vlc_object_t *obj)
+{
+ 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;
+
+ OSStatus err = noErr;
+
+ vlc_mutex_init(&p_sys->lock);
+ vlc_cond_init(&p_sys->cond);
+ p_sys->b_digital = 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);
+
+ /* 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 */
+ 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(p_aout, config_GetPsz(p_aout, "auhal-audio-device"));
+
+ return VLC_SUCCESS;
+}
+
+static void Close(vlc_object_t *obj)
+{
+ audio_output_t *p_aout = (audio_output_t *)obj;
+ aout_sys_t *p_sys = p_aout->sys;
+
+ OSStatus err = noErr;
+
+ /* 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);
+ }
+
+ 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(p_sys);
+}
+
static int Start(audio_output_t *p_aout, audio_sample_format_t *restrict fmt)
{
OSStatus err = noErr;
UInt32 i_param_size = 0;
struct aout_sys_t *p_sys = NULL;
- vlc_value_t val;
/* Use int here, to match kAudioDevicePropertyDeviceIsAlive
* property size */
int b_alive = false;
+ bool b_start_digital = false;
+
p_sys = p_aout->sys;
- p_sys->i_default_dev = 0;
- p_sys->i_selected_dev = 0;
- p_sys->i_devices = 0;
p_sys->b_digital = false;
p_sys->au_component = NULL;
p_sys->au_unit = 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);
-
- /* Persistent device variable */
- if (var_Type(p_aout->p_libvlc, "macosx-audio-device") == 0)
- var_Create(p_aout->p_libvlc, "macosx-audio-device", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
-
- /* Build a list of devices */
- if (var_Type(p_aout, "audio-device") == 0)
- Probe(p_aout);
+ p_sys->i_selected_dev = p_sys->i_new_selected_dev;
- /* What device do we want? */
- if (var_Get(p_aout, "audio-device", &val) < 0) {
- msg_Err(p_aout, "audio-device var does not exist. device probe failed.");
- goto error;
- }
+ aout_FormatPrint(p_aout, "VLC is looking for:", fmt);
- p_sys->i_selected_dev = val.i_int & ~AOUT_VAR_SPDIF_FLAG; /* remove SPDIF flag to get the true DeviceID */
- bool b_supports_digital = (val.i_int & AOUT_VAR_SPDIF_FLAG);
- if (b_supports_digital)
- msg_Dbg(p_aout, "audio device supports digital output");
+ 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);
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;
}
goto error;
}
- /* If we change the device we want to use, we should renegotiate the audio chain */
- var_AddCallback(p_aout, "audio-device", AudioDeviceCallback, NULL);
-
- /* setup circular buffer */
- TPCircularBufferInit(&p_sys->circular_buffer, kBufferLength);
+ bool b_success = false;
/* Check for Digital mode or Analog output mode */
- if (AOUT_FMT_SPDIF (fmt) && b_supports_digital) {
- if (OpenSPDIF (p_aout, fmt)) {
+ if (AOUT_FMT_SPDIF (fmt) && b_start_digital) {
+ if (StartSPDIF (p_aout, fmt)) {
msg_Dbg(p_aout, "digital output successfully opened");
- return VLC_SUCCESS;
+ b_success = true;
}
} else {
- if (OpenAnalog(p_aout, fmt)) {
+ if (StartAnalog(p_aout, fmt)) {
msg_Dbg(p_aout, "analog output successfully opened");
- return VLC_SUCCESS;
+ b_success = true;
}
}
+ if (b_success) {
+ p_aout->play = Play;
+ p_aout->flush = Flush;
+ p_aout->time_get = TimeGet;
+ p_aout->pause = Pause;
+ return VLC_SUCCESS;
+ }
+
error:
/* If we reach this, this aout has failed */
- msg_Err(p_aout, "opening the auhal output failed");
- var_Destroy(p_aout, "audio-device");
+ msg_Err(p_aout, "opening auhal output failed");
return VLC_EGENERIC;
}
-/*****************************************************************************
- * Open: open and setup a HAL AudioUnit to do analog (multichannel) audio output
- *****************************************************************************/
-static int OpenAnalog(audio_output_t *p_aout, audio_sample_format_t *fmt)
+/*
+ * StartAnalog: open and setup a HAL AudioUnit to do PCM audio output
+ */
+static int StartAnalog(audio_output_t *p_aout, audio_sample_format_t *fmt)
{
struct aout_sys_t *p_sys = p_aout->sys;
OSStatus err = noErr;
UInt32 i_param_size = 0;
int i_original;
- ComponentDescription desc;
+ AudioComponentDescription desc;
AudioStreamBasicDescription DeviceFormat;
AudioChannelLayout *layout;
AudioChannelLayout new_layout;
desc.componentFlags = 0;
desc.componentFlagsMask = 0;
- p_sys->au_component = FindNextComponent(NULL, &desc);
+ 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 = OpenAComponent(p_sys->au_component, &p_sys->au_unit);
+ 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;
}
kAudioUnitScope_Global,
0,
&p_sys->i_selected_dev,
- sizeof(AudioDeviceID));
+ 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;
}
err = AudioUnitGetProperty(p_sys->au_unit,
kAudioUnitProperty_StreamFormat,
- kAudioUnitScope_Input,
+ kAudioUnitScope_Output,
0,
&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) */
layout));
}
- msg_Dbg(p_aout, "layout of AUHAL has %d channels" , (int)layout->mNumberChannelDescriptions);
+ msg_Dbg(p_aout, "layout of AUHAL has %i channels" , layout->mNumberChannelDescriptions);
+
+ if (layout->mNumberChannelDescriptions == 0) {
+ msg_Err(p_aout, "insufficient number of output channels");
+ return false;
+ }
/* Initialize the VLC core channel count */
fmt->i_physical_channels = 0;
}
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;
}
/* Set up the format to be used */
DeviceFormat.mSampleRate = fmt->i_rate;
DeviceFormat.mFormatID = kAudioFormatLinearPCM;
+ p_sys->i_rate = fmt->i_rate;
/* We use float 32 since this is VLC's endorsed format */
fmt->i_format = VLC_CODEC_FL32;
/* Calculate framesizes and stuff */
DeviceFormat.mFramesPerPacket = 1;
DeviceFormat.mBytesPerFrame = DeviceFormat.mBitsPerChannel * DeviceFormat.mChannelsPerFrame / 8;
- msg_Dbg(p_aout, "bytes per frame %i", DeviceFormat.mBytesPerFrame);
DeviceFormat.mBytesPerPacket = DeviceFormat.mBytesPerFrame * DeviceFormat.mFramesPerPacket;
/* Set the desired format */
AudioConvertHostTimeToNanos(AudioGetCurrentHostTime()) / 1000;
p_sys->clock_diff += mdate();
- /* Start the AU */
- verify_noerr(AudioOutputUnitStart(p_sys->au_unit));
+ /* setup circular buffer */
+ TPCircularBufferInit(&p_sys->circular_buffer, AUDIO_BUFFER_SIZE_IN_SECONDS *
+ fmt->i_rate * fmt->i_bytes_per_frame);
- /* Set volume for output unit */
- float volume = var_InheritInteger(p_aout, "auhal-volume") / (float)AOUT_VOLUME_DEFAULT;
- verify_noerr(AudioUnitSetParameter(p_sys->au_unit,
- kHALOutputParam_Volume,
- kAudioUnitScope_Global,
- 0,
- volume * volume * volume,
- 0));
+ p_sys->b_got_first_sample = false;
- p_aout->time_get = TimeGet;
- p_aout->play = PlayAnalog;
- p_aout->pause = PauseAnalog;
- p_aout->flush = FlushAnalog;
+ /* Set volume for output unit */
+ VolumeSet(p_aout, p_sys->f_volume);
+ MuteSet(p_aout, p_sys->b_mute);
return true;
}
-/*****************************************************************************
- * Setup a encoded digital stream (SPDIF)
- *****************************************************************************/
-static int OpenSPDIF (audio_output_t * p_aout, audio_sample_format_t *fmt)
+/*
+ * StartSPDIF: Setup an encoded digital stream (SPDIF) output
+ */
+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, "OpenSPDIF: 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)
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;
+ p_sys->i_rate = fmt->i_rate;
aout_FormatPrepare(fmt);
- aout_PacketInit(p_aout, &p_sys->packet, A52_FRAME_NB, fmt);
/* Add IOProc callback */
err = AudioDeviceCreateIOProcID(p_sys->i_selected_dev,
(void *)p_aout,
&p_sys->i_procID);
if (err != noErr) {
- msg_Err(p_aout, "AudioDeviceCreateIOProcID failed: [%4.4s]", (char *)&err);
- aout_PacketDestroy (p_aout);
+ 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);
- aout_PacketDestroy (p_aout);
return false;
}
+ /* setup circular buffer */
+ TPCircularBufferInit(&p_sys->circular_buffer, 200 * AOUT_SPDIF_SIZE);
+
return true;
}
-
-/*****************************************************************************
- * Close: Close HAL AudioUnit
- *****************************************************************************/
static void Stop(audio_output_t *p_aout)
{
struct aout_sys_t *p_sys = p_aout->sys;
OSStatus err = noErr;
UInt32 i_param_size = 0;
- AudioObjectPropertyAddress deviceAliveAddress = { kAudioDevicePropertyDeviceIsAlive, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
- err = AudioObjectRemovePropertyListener(p_sys->i_selected_dev, &deviceAliveAddress, HardwareListener, NULL);
- 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, NULL);
- 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));
- verify_noerr(CloseComponent(p_sys->au_unit));
+ verify_noerr(AudioComponentInstanceDispose(p_sys->au_unit));
}
if (p_sys->b_digital) {
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, NULL);
-
- 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);
}
- var_DelCallback(p_aout, "audio-device", AudioDeviceCallback, NULL);
+ 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 void ReportDevice(audio_output_t *p_aout, UInt32 i_id, char *name)
+{
+ char deviceid[10];
+ sprintf(deviceid, "%i", i_id);
- if (p_sys->b_digital)
- aout_PacketDestroy(p_aout);
+ aout_HotplugReport(p_aout, deviceid, name);
}
-/*****************************************************************************
- * Probe: Check which devices the OS has, and add them to our audio-device menu
- *****************************************************************************/
-static void Probe(audio_output_t * p_aout)
+static void RebuildDeviceList(audio_output_t * p_aout)
{
OSStatus err = noErr;
- UInt32 i_param_size = 0;
- AudioDeviceID devid_def = 0;
- AudioDeviceID *p_devices = NULL;
- vlc_value_t val, text;
+ UInt32 propertySize = 0;
+ AudioObjectID *deviceIDs;
+ UInt32 numberOfDevices;
+ CFMutableArrayRef currentListOfDevices;
struct aout_sys_t *p_sys = p_aout->sys;
+ /* setup local array */
+ currentListOfDevices = CFArrayCreateMutable(kCFAllocatorDefault, 0, NULL);
+
/* Get number of devices */
AudioObjectPropertyAddress audioDevicesAddress = { kAudioHardwarePropertyDevices, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
- err = AudioObjectGetPropertyDataSize(kAudioObjectSystemObject, &audioDevicesAddress, 0, NULL, &i_param_size);
+ err = AudioObjectGetPropertyDataSize(kAudioObjectSystemObject, &audioDevicesAddress, 0, NULL, &propertySize);
if (err != noErr) {
- msg_Err(p_aout, "Could not get number of devices: [%s]", (char *)&err);
- goto error;
+ msg_Err(p_aout, "Could not get number of devices: [%4.4s]", (char *)&err);
+ return;
}
- p_sys->i_devices = i_param_size / sizeof(AudioDeviceID);
+ numberOfDevices = propertySize / sizeof(AudioDeviceID);
- if (p_sys->i_devices < 1) {
- msg_Err(p_aout, "No audio output devices were found.");
- goto error;
+ if (numberOfDevices < 1) {
+ msg_Err(p_aout, "No audio output devices found.");
+ return;
}
- msg_Dbg(p_aout, "found %u audio device(s)", (unsigned)p_sys->i_devices);
+ msg_Dbg(p_aout, "found %i audio device(s)", numberOfDevices);
/* Allocate DeviceID array */
- p_devices = (AudioDeviceID*)malloc(sizeof(AudioDeviceID) * p_sys->i_devices);
- if (p_devices == NULL)
- goto error;
+ deviceIDs = (AudioDeviceID *)calloc(numberOfDevices, sizeof(AudioDeviceID));
+ if (deviceIDs == NULL)
+ return;
/* Populate DeviceID array */
- err = AudioObjectGetPropertyData(kAudioObjectSystemObject, &audioDevicesAddress, 0, NULL, &i_param_size, p_devices);
- if (err != noErr) {
- msg_Err(p_aout, "could not get the device IDs: [%s]", (char *)&err);
- goto error;
- }
-
- /* Find the ID of the default Device */
- AudioObjectPropertyAddress defaultDeviceAddress = { kAudioHardwarePropertyDefaultOutputDevice, kAudioDevicePropertyScopeOutput, kAudioObjectPropertyElementMaster };
- i_param_size = sizeof(AudioDeviceID);
- err= AudioObjectGetPropertyData(kAudioObjectSystemObject, &defaultDeviceAddress, 0, NULL, &i_param_size, &devid_def);
+ err = AudioObjectGetPropertyData(kAudioObjectSystemObject, &audioDevicesAddress, 0, NULL, &propertySize, deviceIDs);
if (err != noErr) {
- msg_Err(p_aout, "could not get default audio device: [%s]", (char *)&err);
- goto error;
+ msg_Err(p_aout, "could not get the device IDs [%4.4s]", (char *)&err);
+ return;
}
- p_sys->i_default_dev = devid_def;
- var_Create(p_aout, "audio-device", VLC_VAR_INTEGER|VLC_VAR_HASCHOICE);
- text.psz_string = (char*)_("Audio Device");
- var_Change(p_aout, "audio-device", VLC_VAR_SETTEXT, &text, NULL);
+ AudioObjectPropertyAddress deviceNameAddress = { kAudioObjectPropertyName, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
- AudioObjectPropertyAddress deviceNameAddress = { kAudioDevicePropertyDeviceName, kAudioDevicePropertyScopeOutput, kAudioObjectPropertyElementMaster };
-
- for (unsigned int i = 0; i < p_sys->i_devices; i++) {
+ for (unsigned int i = 0; i < numberOfDevices; i++) {
+ CFStringRef device_name_ref;
char *psz_name;
- i_param_size = 0;
+ CFIndex length;
+ bool b_digital = false;
+ UInt32 i_id = deviceIDs[i];
/* Retrieve the length of the device name */
- err = AudioObjectGetPropertyDataSize(p_devices[i], &deviceNameAddress, 0, NULL, &i_param_size);
- if (err != noErr)
- goto error;
+ err = AudioObjectGetPropertyDataSize(deviceIDs[i], &deviceNameAddress, 0, NULL, &propertySize);
+ if (err != noErr) {
+ msg_Dbg(p_aout, "failed to get name size for device %i", deviceIDs[i]);
+ continue;
+ }
/* Retrieve the name of the device */
- psz_name = (char *)malloc(i_param_size);
- err = AudioObjectGetPropertyData(p_devices[i], &deviceNameAddress, 0, NULL, &i_param_size, psz_name);
- if (err != noErr)
- goto error;
+ err = AudioObjectGetPropertyData(deviceIDs[i], &deviceNameAddress, 0, NULL, &propertySize, &device_name_ref);
+ if (err != noErr) {
+ msg_Dbg(p_aout, "failed to get name for device %i", deviceIDs[i]);
+ continue;
+ }
+ length = CFStringGetLength(device_name_ref);
+ length++;
+ psz_name = (char *)malloc(length);
+ CFStringGetCString(device_name_ref, psz_name, length, kCFStringEncodingUTF8);
- msg_Dbg(p_aout, "DevID: %u DevName: %s", (unsigned)p_devices[i], psz_name);
+ msg_Dbg(p_aout, "DevID: %i DevName: %s", deviceIDs[i], psz_name);
- if (!AudioDeviceHasOutput(p_devices[i])) {
- msg_Dbg(p_aout, "this device is INPUT only. skipping...");
+ if (!AudioDeviceHasOutput(deviceIDs[i])) {
+ msg_Dbg(p_aout, "this '%s' is INPUT only. skipping...", psz_name);
free(psz_name);
continue;
}
- /* Add the menu entries */
- val.i_int = (int)p_devices[i];
- text.psz_string = psz_name;
- var_Change(p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val, &text);
- text.psz_string = NULL;
- if (p_sys->i_default_dev == p_devices[i]) {
- /* The default device is the selected device normally */
- var_Change(p_aout, "audio-device", VLC_VAR_SETDEFAULT, &val, NULL);
- var_Set(p_aout, "audio-device", val);
+ ReportDevice(p_aout, i_id, psz_name);
+ CFArrayAppendValue(currentListOfDevices, CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &i_id));
+
+ if (AudioDeviceSupportsDigital(p_aout, deviceIDs[i])) {
+ b_digital = true;
+ msg_Dbg(p_aout, "'%s' supports digital output", psz_name);
+ char *psz_encoded_name = nil;
+ asprintf(&psz_encoded_name, _("%s (Encoded Output)"), psz_name);
+ i_id = i_id | AOUT_VAR_SPDIF_FLAG;
+ ReportDevice(p_aout, i_id, psz_encoded_name);
+ CFArrayAppendValue(currentListOfDevices, CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &i_id));
+ free(psz_encoded_name);
}
- if (AudioDeviceSupportsDigital(p_aout, p_devices[i])) {
- val.i_int = (int)p_devices[i] | AOUT_VAR_SPDIF_FLAG;
- if (asprintf(&text.psz_string, _("%s (Encoded Output)"), psz_name) != -1) {
- var_Change(p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val, &text);
- free(text.psz_string);
- if (p_sys->i_default_dev == p_devices[i] && var_InheritBool(p_aout, "spdif")) {
- /* We selected to prefer SPDIF output if available
- * then this "dummy" entry should be selected */
- var_Change(p_aout, "audio-device", VLC_VAR_SETDEFAULT, &val, NULL);
- var_Set(p_aout, "audio-device", val);
- }
- }
- }
+ // TODO: only register once for each device
+ RegisterAudioStreamsCallback(p_aout, deviceIDs[i]);
+ CFRelease(device_name_ref);
free(psz_name);
}
- /* If a device is already "preselected", then use this device */
- var_Get(p_aout->p_libvlc, "macosx-audio-device", &val);
- if (val.i_int > 0) {
- msg_Dbg(p_aout, "using preselected output device %#"PRIx64, val.i_int);
- var_Change(p_aout, "audio-device", VLC_VAR_SETDEFAULT, &val, NULL);
- var_Set(p_aout, "audio-device", val);
- }
+ 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);
- goto error;
+ 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);
- free(p_devices);
- return;
+ ReportDevice(p_aout, 0, _("System Sound Output Device"));
-error:
- msg_Warn(p_aout, "audio device already in use");
- free(p_devices);
- return;
+ free(deviceIDs);
}
-/*****************************************************************************
- * AudioDeviceHasOutput: Checks if the Device actually provides any outputs at all
- *****************************************************************************/
-static int AudioDeviceHasOutput(AudioDeviceID i_dev_id)
+static int SwitchAudioDevice(audio_output_t *p_aout, const char *name)
{
- UInt32 dataSize;
+ struct aout_sys_t *p_sys = p_aout->sys;
- AudioObjectPropertyAddress streamsAddress = { kAudioDevicePropertyStreams, kAudioDevicePropertyScopeOutput, kAudioObjectPropertyElementMaster };
- verify_noerr(AudioObjectGetPropertyDataSize(i_dev_id, &streamsAddress, 0, NULL, &dataSize));
- if (dataSize == 0)
- return FALSE;
+ if (name)
+ p_sys->i_new_selected_dev = atoi(name);
+ else
+ p_sys->i_new_selected_dev = 0;
- return TRUE;
+ 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_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);
+
+ return 0;
}
-/*****************************************************************************
- * AudioDeviceSupportsDigital: Check i_dev_id for digital stream support.
- *****************************************************************************/
-static int AudioDeviceSupportsDigital(audio_output_t *p_aout, AudioDeviceID i_dev_id)
+static int VolumeSet(audio_output_t * p_aout, float volume)
{
- OSStatus err = noErr;
- UInt32 i_param_size = 0;
- AudioStreamID *p_streams = NULL;
- int i_streams = 0;
- bool b_return = false;
+ struct aout_sys_t *p_sys = p_aout->sys;
+ OSStatus ostatus;
- /* 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: [%s] (%i)", (char *)&err, (int32_t)err);
- return false;
- }
+ if(p_sys->b_digital)
+ return VLC_EGENERIC;
- i_streams = i_param_size / sizeof(AudioStreamID);
- p_streams = (AudioStreamID *)malloc(i_param_size);
- if (p_streams == NULL)
- return VLC_ENOMEM;
+ p_sys->f_volume = volume;
+ aout_VolumeReport(p_aout, volume);
- 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);
- return false;
- }
+ /* Set volume for output unit */
+ ostatus = AudioUnitSetParameter(p_sys->au_unit,
+ kHALOutputParam_Volume,
+ kAudioUnitScope_Global,
+ 0,
+ volume * volume * volume,
+ 0);
- for (int i = 0; i < i_streams; i++) {
- if (AudioStreamSupportsDigital(p_aout, p_streams[i]))
- b_return = true;
- }
+ if (var_InheritBool(p_aout, "volume-save"))
+ config_PutInt(p_aout, "auhal-volume", lroundf(volume * AOUT_VOLUME_DEFAULT));
- free(p_streams);
- return b_return;
+ return ostatus;
}
-/*****************************************************************************
- * AudioStreamSupportsDigital: Check i_stream_id for digital stream support.
- *****************************************************************************/
-static int AudioStreamSupportsDigital(audio_output_t *p_aout, AudioStreamID i_stream_id)
+static int MuteSet(audio_output_t * p_aout, bool mute)
{
- OSStatus err = noErr;
- UInt32 i_param_size = 0;
- AudioStreamRangedDescription *p_format_list = NULL;
- int i_formats = 0;
- bool b_return = false;
+ struct aout_sys_t *p_sys = p_aout->sys;
+ OSStatus ostatus;
- /* Retrieve all the stream formats supported by each output stream */
- 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);
- return false;
- }
+ if(p_sys->b_digital)
+ return VLC_EGENERIC;
- i_formats = i_param_size / sizeof(AudioStreamRangedDescription);
- msg_Dbg(p_aout, "found %i stream formats", i_formats);
-
- p_format_list = (AudioStreamRangedDescription *)malloc(i_param_size);
- if (p_format_list == NULL)
- 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);
- free(p_format_list);
- p_format_list = NULL;
- return false;
- }
+ p_sys->b_mute = mute;
+ aout_MuteReport(p_aout, mute);
- for (int i = 0; i < i_formats; i++) {
-#ifndef NDEBUG
- msg_Dbg(p_aout, STREAM_FORMAT_MSG("supported format: ", p_format_list[i].mFormat));
-#endif
+ float volume = .0;
+ if (!mute)
+ volume = p_sys->f_volume;
- if (p_format_list[i].mFormat.mFormatID == 'IAC3' ||
- p_format_list[i].mFormat.mFormatID == 'iac3' ||
- p_format_list[i].mFormat.mFormatID == kAudioFormat60958AC3 ||
- p_format_list[i].mFormat.mFormatID == kAudioFormatAC3)
- b_return = true;
- }
+ ostatus = AudioUnitSetParameter(p_sys->au_unit,
+ kHALOutputParam_Volume,
+ kAudioUnitScope_Global,
+ 0,
+ volume * volume * volume,
+ 0);
- free(p_format_list);
- return b_return;
+ return ostatus;
}
-/*****************************************************************************
- * AudioStreamChangeFormat: Change i_stream_id to change_format
- *****************************************************************************/
-static int AudioStreamChangeFormat(audio_output_t *p_aout, AudioStreamID i_stream_id, AudioStreamBasicDescription change_format)
-{
- OSStatus err = noErr;
- UInt32 i_param_size = 0;
-
- AudioObjectPropertyAddress physicalFormatAddress = { kAudioStreamPropertyPhysicalFormat, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
-
- struct { vlc_mutex_t lock; vlc_cond_t cond; } w;
-
- msg_Dbg(p_aout, STREAM_FORMAT_MSG("setting stream format: ", change_format));
-
- /* Condition because SetProperty is asynchronious */
- vlc_cond_init(&w.cond);
- vlc_mutex_init(&w.lock);
- vlc_mutex_lock(&w.lock);
-
- /* 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;
- }
-
- /* 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;
- }
-
- /* The AudioStreamSetProperty is not only asynchronious (requiring the locks)
- * it is also not atomic in its behaviour.
- * Therefore we check 5 times before we really give up.
- * FIXME: failing isn't actually implemented yet. */
- for (int i = 0; i < 5; i++) {
- AudioStreamBasicDescription actual_format;
- mtime_t timeout = mdate() + 500000;
-
- if (vlc_cond_timedwait(&w.cond, &w.lock, timeout))
- msg_Dbg(p_aout, "reached timeout");
-
- i_param_size = sizeof(AudioStreamBasicDescription);
- err = AudioObjectGetPropertyData(i_stream_id, &physicalFormatAddress, 0, NULL, &i_param_size, &actual_format);
-
- msg_Dbg(p_aout, STREAM_FORMAT_MSG("actual format in use: ", actual_format));
- if (actual_format.mSampleRate == change_format.mSampleRate &&
- actual_format.mFormatID == change_format.mFormatID &&
- actual_format.mFramesPerPacket == change_format.mFramesPerPacket) {
- /* The right format is now active */
- break;
- }
- /* We need to check again */
- }
-
- /* 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;
- }
-
- /* Destroy the lock and condition */
- vlc_mutex_unlock(&w.lock);
- vlc_mutex_destroy(&w.lock);
- vlc_cond_destroy(&w.cond);
+#pragma mark -
+#pragma mark actual playback
- return true;
-}
-
-static void PlayAnalog (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)
- {
+ if (p_sys->chans_to_reorder && !p_sys->b_digital) {
aout_ChannelReorder(p_block->p_buffer,
p_block->i_buffer,
p_sys->chans_to_reorder,
VLC_CODEC_FL32);
}
- /* Render audio into buffer */
- AudioBufferList bufferList;
- bufferList.mNumberBuffers = 1;
- bufferList.mBuffers[0].mNumberChannels = p_sys->i_numberOfChannels;
- bufferList.mBuffers[0].mData = malloc(p_block->i_nb_samples * sizeof(Float32) * p_sys->i_numberOfChannels);
- bufferList.mBuffers[0].mDataByteSize = p_block->i_nb_samples * sizeof(Float32) * p_sys->i_numberOfChannels;
-
- memcpy(bufferList.mBuffers[0].mData, p_block->p_buffer, p_block->i_buffer);
-
/* move data to buffer */
- TPCircularBufferProduceBytes(&p_sys->circular_buffer, bufferList.mBuffers[0].mData, bufferList.mBuffers[0].mDataByteSize);
+ 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 PauseAnalog (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 (pause)
- AudioOutputUnitStop(p_aout->sys->au_unit);
- else
- AudioOutputUnitStart(p_aout->sys->au_unit);
+ 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);
+ }
}
-static void FlushAnalog(audio_output_t *p_aout, bool wait)
+static void Flush(audio_output_t *p_aout, bool wait)
{
- /* we just flush the device, no need to flush the circular buffer, since this will lead to noise only */
- AudioUnitReset(p_aout->sys->au_unit, kAudioUnitScope_Global, 0);
+ struct aout_sys_t *p_sys = p_aout->sys;
+
+ 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);
+ }
}
static int TimeGet(audio_output_t *p_aout, mtime_t *delay)
{
- VLC_UNUSED(p_aout);
- VLC_UNUSED(delay);
+ struct aout_sys_t * p_sys = p_aout->sys;
+
+ if (!p_sys->i_bytes_per_sample)
+ return -1;
+
+ int32_t availableBytes;
+ TPCircularBufferTail(&p_sys->circular_buffer, &availableBytes);
- return -1;
+ *delay = (availableBytes / p_sys->i_bytes_per_sample) * CLOCK_FREQ / p_sys->i_rate;
+
+ return 0;
}
/*****************************************************************************
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 noErr;
+ if (!availableBytes) {
+ /* return an empty buffer so silence is played until we have data */
+ memset(targetBuffer, 0, ioData->mBuffers[0].mDataByteSize);
+ } else {
+ int32_t bytesToCopy = __MIN(bytesRequested, availableBytes);
+
+ memcpy(targetBuffer, buffer, bytesToCopy);
+ TPCircularBufferConsume(&p_sys->circular_buffer, bytesToCopy);
+ ioData->mBuffers[0].mDataByteSize = bytesToCopy;
+ }
- memcpy(targetBuffer, buffer, __MIN(bytesToCopy, availableBytes));
- TPCircularBufferConsume(&p_sys->circular_buffer, __MIN(bytesToCopy, availableBytes));
+ 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,
const AudioTimeStamp * inOutputTime,
void * threadGlobals)
{
- block_t * p_buffer;
- mtime_t current_date;
-
- audio_output_t * p_aout = (audio_output_t *)threadGlobals;
- struct aout_sys_t * p_sys = p_aout->sys;
-
+ VLC_UNUSED(inNow);
VLC_UNUSED(inDevice);
VLC_UNUSED(inInputData);
VLC_UNUSED(inInputTime);
+ VLC_UNUSED(inOutputTime);
- /* Check for the difference between the Device clock and mdate */
- p_sys->clock_diff = - (mtime_t)
- AudioConvertHostTimeToNanos(inNow->mHostTime) / 1000;
- p_sys->clock_diff += mdate();
+ audio_output_t * p_aout = (audio_output_t *)threadGlobals;
+ struct aout_sys_t * p_sys = p_aout->sys;
- current_date = p_sys->clock_diff +
- AudioConvertHostTimeToNanos(inOutputTime->mHostTime) / 1000;
- //- ((mtime_t) 1000000 / p_aout->format.i_rate * 31); // 31 = Latency in Frames. retrieve somewhere
+ int bytesRequested = outOutputData->mBuffers[p_sys->i_stream_index].mDataByteSize;
+ char *targetBuffer = outOutputData->mBuffers[p_sys->i_stream_index].mData;
- p_buffer = aout_PacketNext(p_aout, current_date);
+ vlc_mutex_lock(&p_sys->lock);
+ /* Pull audio from buffer */
+ int32_t availableBytes;
+ char *buffer = TPCircularBufferTail(&p_sys->circular_buffer, &availableBytes);
-#define BUFFER outOutputData->mBuffers[p_sys->i_stream_index]
- if (p_buffer != NULL) {
- if ((int)BUFFER.mDataByteSize != (int)p_buffer->i_buffer)
- msg_Warn(p_aout, "bytesize: %d nb_bytes: %d", (int)BUFFER.mDataByteSize, (int)p_buffer->i_buffer);
+ /* 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 {
+ int32_t bytesToCopy = __MIN(bytesRequested, availableBytes);
- /* move data into output data buffer */
- memcpy(BUFFER.mData, p_buffer->p_buffer, p_buffer->i_buffer);
- block_Release(p_buffer);
+ memcpy(targetBuffer, buffer, bytesToCopy);
+ TPCircularBufferConsume(&p_sys->circular_buffer, bytesToCopy);
+ outOutputData->mBuffers[p_sys->i_stream_index].mDataByteSize = bytesToCopy;
}
- else
- memset(BUFFER.mData, 0, BUFFER.mDataByteSize);
-#undef BUFFER
+
+ vlc_cond_signal(&p_sys->cond);
+ vlc_mutex_unlock(&p_sys->lock);
return noErr;
}
-/*****************************************************************************
+#pragma mark -
+#pragma mark Stream / Hardware Listeners
+
+/*
* HardwareListener: Warns us of changes in the list of registered devices
- *****************************************************************************/
+ */
static OSStatus HardwareListener(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);
+
+ if (!p_aout)
+ return -1;
for (unsigned int i = 0; i < inNumberAddresses; i++) {
- if (inAddresses[i].mSelector == kAudioHardwarePropertyDevices) {
- /* something changed in the list of devices */
- /* We trigger the audio-device's aout_ChannelsRestart callback */
- msg_Warn(p_aout, "audio device configuration changed, resetting cache");
- var_TriggerCallback(p_aout, "audio-device");
- var_Destroy(p_aout, "audio-device");
- } else if (inAddresses[i].mSelector == kAudioDevicePropertyDeviceIsAlive) {
- msg_Warn(p_aout, "audio device died, resetting aout");
- var_TriggerCallback(p_aout, "audio-device");
- var_Destroy(p_aout, "audio-device");
- } else if (inAddresses[i].mSelector == kAudioStreamPropertyAvailablePhysicalFormats) {
- msg_Warn(p_aout, "available physical formats for audio device changed, resetting aout");
- var_TriggerCallback(p_aout, "audio-device");
- var_Destroy(p_aout, "audio-device");
+ switch (inAddresses[i].mSelector) {
+ case kAudioHardwarePropertyDevices:
+ msg_Dbg(p_aout, "audio device configuration changed, resetting cache");
+ break;
+
+ case kAudioDevicePropertyDeviceIsAlive:
+ msg_Warn(p_aout, "audio device died, resetting aout");
+ break;
+
+ case kAudioStreamPropertyAvailablePhysicalFormats:
+ msg_Dbg(p_aout, "available physical formats for audio device changed, resetting aout");
+ break;
+
+ default:
+ msg_Warn(p_aout, "device reset for unknown reason (%i)", inAddresses[i].mSelector);
+ break;
}
}
+ RebuildDeviceList(p_aout);
+ aout_RestartRequest(p_aout, AOUT_RESTART_OUTPUT);
+
return err;
}
-/*****************************************************************************
- * StreamListener
- *****************************************************************************/
+/*
+ * StreamListener: check whether the device's physical format changes on-the-fly (unlikely)
+ */
static OSStatus StreamListener(AudioObjectID inObjectID, UInt32 inNumberAddresses, const AudioObjectPropertyAddress inAddresses[], void*inClientData)
{
OSStatus err = noErr;
return err;
}
-/*****************************************************************************
- * AudioDeviceCallback: Callback triggered when the audio-device variable is changed
- *****************************************************************************/
-static int AudioDeviceCallback(vlc_object_t *p_this, const char *psz_variable,
- vlc_value_t old_val, vlc_value_t new_val, void *param)
+#pragma mark -
+#pragma mark helpers
+
+static int RegisterAudioStreamsCallback(audio_output_t *p_aout, AudioDeviceID i_dev_id)
{
- audio_output_t *p_aout = (audio_output_t *)p_this;
- var_Set(p_aout->p_libvlc, "macosx-audio-device", new_val);
- msg_Dbg(p_aout, "Set Device: %#"PRIx64, new_val.i_int);
- return aout_ChannelsRestart(p_this, psz_variable, old_val, new_val, param);
-}
+ 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;
+ }
-/*****************************************************************************
- * VolumeSet: Implements volume_set(). Update the CoreAudio AU volume immediately.
- *****************************************************************************/
-static int VolumeSet(audio_output_t * p_aout, float volume)
-{
- struct aout_sys_t *p_sys = p_aout->sys;
- OSStatus ostatus;
+ i_streams = i_param_size / sizeof(AudioStreamID);
+ p_streams = (AudioStreamID *)malloc(i_param_size);
+ if (p_streams == NULL)
+ return VLC_ENOMEM;
- aout_VolumeReport(p_aout, volume);
+ 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;
+ }
- /* Set volume for output unit */
- ostatus = AudioUnitSetParameter(p_sys->au_unit,
- kHALOutputParam_Volume,
- kAudioUnitScope_Global,
- 0,
- volume * volume * volume,
- 0);
+ 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);
+ }
+ }
+ }
- if (var_InheritBool(p_aout, "volume-save"))
- config_PutInt(p_aout, "auhal-volume", lroundf(volume * AOUT_VOLUME_DEFAULT));
+ free(p_streams);
+ return VLC_SUCCESS;
+}
- return ostatus;
+/*
+ * AudioDeviceHasOutput: Checks if the device is actually an output device
+ */
+static int AudioDeviceHasOutput(AudioDeviceID i_dev_id)
+{
+ UInt32 dataSize = 0;
+ OSStatus status;
+
+ AudioObjectPropertyAddress streamsAddress = { kAudioDevicePropertyStreams, kAudioDevicePropertyScopeOutput, kAudioObjectPropertyElementMaster };
+ status = AudioObjectGetPropertyDataSize(i_dev_id, &streamsAddress, 0, NULL, &dataSize);
+
+ if (dataSize == 0 || status != noErr)
+ return FALSE;
+
+ return TRUE;
}
-static int MuteSet(audio_output_t * p_aout, bool mute)
+/*
+ * AudioDeviceSupportsDigital: Checks if device supports raw bitstreams
+ */
+static int AudioDeviceSupportsDigital(audio_output_t *p_aout, AudioDeviceID i_dev_id)
{
- struct aout_sys_t *p_sys = p_aout->sys;
- OSStatus ostatus;
+ OSStatus err = noErr;
+ UInt32 i_param_size = 0;
+ AudioStreamID *p_streams = NULL;
+ int i_streams = 0;
+ bool b_return = false;
- aout_MuteReport(p_aout, mute);
+ /* 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 false;
+ }
- float volume = .0;
+ i_streams = i_param_size / sizeof(AudioStreamID);
+ p_streams = (AudioStreamID *)malloc(i_param_size);
+ if (p_streams == NULL)
+ return VLC_ENOMEM;
- if (!mute)
- volume = var_InheritInteger(p_aout, "auhal-volume") / (float)AOUT_VOLUME_DEFAULT;
+ 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 false;
+ }
- ostatus = AudioUnitSetParameter(p_sys->au_unit,
- kHALOutputParam_Volume,
- kAudioUnitScope_Global,
- 0,
- volume * volume * volume,
- 0);
+ for (int i = 0; i < i_streams; i++) {
+ if (AudioStreamSupportsDigital(p_aout, p_streams[i]))
+ b_return = true;
+ }
- return ostatus;
+ free(p_streams);
+ return b_return;
}
-static int Open(vlc_object_t *obj)
+/*
+ * AudioStreamSupportsDigital: Checks if audio stream is compatible with raw bitstreams
+ */
+static int AudioStreamSupportsDigital(audio_output_t *p_aout, AudioStreamID i_stream_id)
{
- audio_output_t *aout = (audio_output_t *)obj;
- aout_sys_t *sys = malloc(sizeof (*sys));
+ OSStatus err = noErr;
+ UInt32 i_param_size = 0;
+ AudioStreamRangedDescription *p_format_list = NULL;
+ int i_formats = 0;
+ bool b_return = false;
- if (unlikely(sys == NULL))
- return VLC_ENOMEM;
- aout->sys = sys;
- aout->start = Start;
- aout->stop = Stop;
- aout->volume_set = VolumeSet;
- aout->mute_set = MuteSet;
+ /* Retrieve all the stream formats supported by each output stream */
+ 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 [%4.4s] (%i)", (char *)&err, (int32_t)err);
+ return false;
+ }
- /* remember the volume */
- aout_VolumeReport(aout, var_InheritInteger(aout, "auhal-volume") / (float)AOUT_VOLUME_DEFAULT);
- MuteSet(aout, var_InheritBool(aout, "mute"));
+ i_formats = i_param_size / sizeof(AudioStreamRangedDescription);
+ msg_Dbg(p_aout, "found %i stream formats for stream id %i", i_formats, i_stream_id);
- return VLC_SUCCESS;
+ p_format_list = (AudioStreamRangedDescription *)malloc(i_param_size);
+ if (p_format_list == NULL)
+ 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);
+ free(p_format_list);
+ p_format_list = NULL;
+ return false;
+ }
+
+ for (int i = 0; i < i_formats; i++) {
+#ifndef NDEBUG
+ msg_Dbg(p_aout, STREAM_FORMAT_MSG("supported format: ", p_format_list[i].mFormat));
+#endif
+
+ if (p_format_list[i].mFormat.mFormatID == 'IAC3' ||
+ p_format_list[i].mFormat.mFormatID == 'iac3' ||
+ p_format_list[i].mFormat.mFormatID == kAudioFormat60958AC3 ||
+ p_format_list[i].mFormat.mFormatID == kAudioFormatAC3)
+ b_return = true;
+ }
+
+ free(p_format_list);
+ return b_return;
}
-static void Close(vlc_object_t *obj)
+/*
+ * AudioStreamChangeFormat: switch stream format based on the provided description
+ */
+static int AudioStreamChangeFormat(audio_output_t *p_aout, AudioStreamID i_stream_id, AudioStreamBasicDescription change_format)
{
- audio_output_t *aout = (audio_output_t *)obj;
- aout_sys_t *sys = aout->sys;
+ OSStatus err = noErr;
+ UInt32 i_param_size = 0;
+
+ AudioObjectPropertyAddress physicalFormatAddress = { kAudioStreamPropertyPhysicalFormat, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
+
+ struct { vlc_mutex_t lock; vlc_cond_t cond; } w;
+
+ msg_Dbg(p_aout, STREAM_FORMAT_MSG("setting stream format: ", change_format));
+
+ /* Condition because SetProperty is asynchronious */
+ vlc_cond_init(&w.cond);
+ vlc_mutex_init(&w.lock);
+ vlc_mutex_lock(&w.lock);
+
+ /* 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;
+ }
+
+ /* 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;
+ }
+
+ /* The AudioStreamSetProperty is not only asynchronious (requiring the locks)
+ * it is also not atomic in its behaviour.
+ * Therefore we check 5 times before we really give up.
+ * FIXME: failing isn't actually implemented yet. */
+ for (int i = 0; i < 5; i++) {
+ AudioStreamBasicDescription actual_format;
+ mtime_t timeout = mdate() + 500000;
+
+ if (vlc_cond_timedwait(&w.cond, &w.lock, timeout))
+ msg_Dbg(p_aout, "reached timeout");
+
+ i_param_size = sizeof(AudioStreamBasicDescription);
+ err = AudioObjectGetPropertyData(i_stream_id, &physicalFormatAddress, 0, NULL, &i_param_size, &actual_format);
- free(sys);
+ msg_Dbg(p_aout, STREAM_FORMAT_MSG("actual format in use: ", actual_format));
+ if (actual_format.mSampleRate == change_format.mSampleRate &&
+ actual_format.mFormatID == change_format.mFormatID &&
+ actual_format.mFramesPerPacket == change_format.mFramesPerPacket) {
+ /* The right format is now active */
+ break;
+ }
+ /* We need to check again */
+ }
+
+ /* 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;
+ }
+
+ /* Destroy the lock and condition */
+ vlc_mutex_unlock(&w.lock);
+ vlc_mutex_destroy(&w.lock);
+ vlc_cond_destroy(&w.cond);
+
+ return true;
}
projects / vlc / blobdiff