/*****************************************************************************
* auhal.c: AUHAL and Coreaudio output plugin
*****************************************************************************
- * Copyright (C) 2005, 2012 the VideoLAN team
+ * 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 General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-/*****************************************************************************
- * Preamble
- *****************************************************************************/
+#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
-/*
- * TODO:
- * - clean up the debug info
- * - be better at changing stream setup or devices setup changes while playing.
- * - fix 6.1 and 7.1
- */
+#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 */
- 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 */
+ AudioObjectID i_default_dev; /* DeviceID of defaultOutputDevice */
+ AudioObjectID i_selected_dev; /* DeviceID of the selected device */
+ bool b_selected_dev_is_digital;
+ 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 */
- Component au_component; /* The Audiocomponent we use */
- AudioUnit au_unit; /* The AudioUnit we use */
- uint8_t p_remainder_buffer[BUFSIZE];
- uint32_t i_read_bytes;
- uint32_t i_total_bytes;
+ AudioComponent au_component; /* The AudioComponent we use */
+ AudioUnit au_unit; /* The AudioUnit we use */
/* CoreAudio SPDIF mode 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; /* Wether we need to revert the stream format */
- bool b_changed_mixing; /* Wether we need to set the mixing mode back */
+ 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;
+
+ vlc_mutex_t lock;
+ vlc_cond_t cond;
};
-/*****************************************************************************
- * Local prototypes.
- *****************************************************************************/
-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 *);
+struct audio_device_t
+{
+ struct audio_device_t *next;
+ UInt32 deviceid;
+ char *name;
+};
-static void Probe (audio_output_t *);
-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);
+#pragma mark -
+#pragma mark local prototypes & module descriptor
+
+static int Open (vlc_object_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 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 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 *,
- unsigned int, unsigned int, AudioBufferList *);
+ UInt32 , UInt32, AudioBufferList *);
+
static OSStatus RenderCallbackSPDIF (AudioDeviceID, const AudioTimeStamp *, const void *, const AudioTimeStamp *,
- AudioBufferList *, const AudioTimeStamp *, void *);
+ 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);
+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);
-/*****************************************************************************
- * 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.")
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 *aout = (audio_output_t *)obj;
+ aout_sys_t *sys = malloc(sizeof (*sys));
+
+ if (unlikely(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;
+
+ RebuildDeviceList(aout);
+
+ /* remember the volume */
+ aout_VolumeReport(aout, var_InheritInteger(aout, "auhal-volume") / (float)AOUT_VOLUME_DEFAULT);
+ MuteSet(aout, var_InheritBool(aout, "mute"));
+
+ SwitchAudioDevice(aout, config_GetPsz(aout, "auhal-audio-device"));
+
+ return VLC_SUCCESS;
+}
+
+static void Close(vlc_object_t *obj)
+{
+ audio_output_t *aout = (audio_output_t *)obj;
+ aout_sys_t *sys = aout->sys;
+
+ config_PutPsz(aout, "auhal-audio-device", aout_DeviceGet(aout));
+
+ for (struct audio_device_t * device = sys->devices, *next; device != NULL; device = next) {
+ next = device->next;
+ free(device->name);
+ free(device);
+ }
+
+ vlc_mutex_destroy(&sys->lock);
+ vlc_cond_destroy(&sys->cond);
+
+ free(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->clock_diff = (mtime_t) 0;
- p_sys->i_read_bytes = 0;
- p_sys->i_total_bytes = 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;
- memset(p_sys->p_remainder_buffer, 0, sizeof(uint8_t) * BUFSIZE);
-
- p_aout->time_get = aout_PacketTimeGet;
- p_aout->play = aout_PacketPlay;
- p_aout->pause = aout_PacketPause;
- p_aout->flush = aout_PacketFlush;
+ 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);
-
- /* 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;
- }
-
- 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 (!b_alive) {
- msg_Warn(p_aout, "selected audio device is not alive, switching to default device");
+ 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;
}
+ // 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, "Use audio device for digital output");
+
/* 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) {
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);
+ 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;
AURenderCallbackStruct input;
+ p_aout->sys->chans_to_reorder = 0;
/* Lets go find our Component */
desc.componentType = kAudioUnitType_Output;
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");
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");
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");
err = AudioUnitGetProperty(p_sys->au_unit,
kAudioUnitProperty_StreamFormat,
- kAudioUnitScope_Input,
+ kAudioUnitScope_Output,
0,
&DeviceFormat,
&i_param_size);
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;
} else {
/* We want more than stereo and we can do that */
for (unsigned int i = 0; i < layout->mNumberChannelDescriptions; i++) {
+#ifndef NDEBUG
msg_Dbg(p_aout, "this is channel: %d", (int)layout->mChannelDescriptions[i].mChannelLabel);
+#endif
switch(layout->mChannelDescriptions[i].mChannelLabel) {
case kAudioChannelLabel_Left:
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;
new_layout.mChannelLayoutTag = kAudioChannelLayoutTag_AudioUnit_6_0; // L R Ls Rs C Cs
break;
case 7:
- /* FIXME: This is incorrect. VLC uses the internal ordering: L R Lm Rm Lr Rr C LFE but this is wrong */
- new_layout.mChannelLayoutTag = kAudioChannelLayoutTag_MPEG_6_1_A; // L R C LFE Ls Rs Cs
+ 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:
- /* FIXME: This is incorrect. VLC uses the internal ordering: L R Lm Rm Lr Rr C LFE but this is wrong */
- new_layout.mChannelLayoutTag = kAudioChannelLayoutTag_MPEG_7_1_A; // L R C LFE Ls Rs Lc Rc
+ 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;
DeviceFormat.mFormatID = kAudioFormatLinearPCM;
+ p_sys->i_rate = fmt->i_rate;
- /* We use float 32. It's the best supported format by both VLC and Coreaudio */
+ /* We use float 32 since this is VLC's endorsed format */
fmt->i_format = VLC_CODEC_FL32;
DeviceFormat.mFormatFlags = kAudioFormatFlagsNativeFloatPacked;
DeviceFormat.mBitsPerChannel = 32;
/* Do the last VLC aout setups */
aout_FormatPrepare(fmt);
- aout_PacketInit(p_aout, &p_sys->packet, FRAMESIZE, fmt);
/* set the IOproc callback */
input.inputProc = (AURenderCallback) RenderCallbackAnalog;
kAudioUnitScope_Input,
0, &input, sizeof(input)));
- input.inputProc = (AURenderCallback) RenderCallbackAnalog;
- input.inputProcRefCon = p_aout;
-
/* 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_Input,
+ kAudioUnitScope_Output,
0, &new_layout, sizeof(new_layout)));
if (new_layout.mNumberChannelDescriptions > 0)
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);
+
+ p_sys->b_got_first_sample = false;
+
+ /* 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));
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;
/* 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: [%s] (%i)", (char *)&err, (int32_t)err);
continue;
}
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,
&p_sys->i_procID);
if (err != noErr) {
msg_Err(p_aout, "AudioDeviceCreateIOProcID failed: [%4.4s]", (char *)&err);
- aout_PacketDestroy (p_aout);
return false;
}
if (err != noErr)
msg_Err(p_aout, "AudioDeviceDestroyIOProcID failed: [%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;
UInt32 i_param_size = 0;
AudioObjectPropertyAddress deviceAliveAddress = { kAudioDevicePropertyDeviceIsAlive, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
- err = AudioObjectRemovePropertyListener(p_sys->i_selected_dev, &deviceAliveAddress, HardwareListener, NULL);
+ err = AudioObjectRemovePropertyListener(p_sys->i_selected_dev, &deviceAliveAddress, HardwareListener, (void *)p_aout);
if (err != noErr)
msg_Err(p_aout, "failed to remove audio device life checker: [%4.4s]", (char *)&err);
if (p_sys->b_digital) {
AudioObjectPropertyAddress physicalFormatsAddress = { kAudioStreamPropertyAvailablePhysicalFormats, kAudioObjectPropertyScopeGlobal, 0 };
- err = AudioObjectRemovePropertyListener(p_sys->i_stream_id, &physicalFormatsAddress, HardwareListener, NULL);
+ err = AudioObjectRemovePropertyListener(p_sys->i_stream_id, &physicalFormatsAddress, HardwareListener, (void *)p_aout);
if (err != noErr)
msg_Err(p_aout, "failed to remove audio device property streams callback: [%4.4s]", (char *)&err);
}
if (p_sys->au_unit) {
verify_noerr(AudioOutputUnitStop(p_sys->au_unit));
verify_noerr(AudioUnitUninitialize(p_sys->au_unit));
- verify_noerr(CloseComponent(p_sys->au_unit));
+ verify_noerr(AudioComponentInstanceDispose(p_sys->au_unit));
}
if (p_sys->b_digital) {
}
AudioObjectPropertyAddress audioDevicesAddress = { kAudioHardwarePropertyDevices, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
- err = AudioObjectRemovePropertyListener(kAudioObjectSystemObject, &audioDevicesAddress, HardwareListener, NULL);
+ err = AudioObjectRemovePropertyListener(kAudioObjectSystemObject, &audioDevicesAddress, HardwareListener, (void *)p_aout);
if (err != noErr)
msg_Err(p_aout, "AudioHardwareRemovePropertyListener failed: [%4.4s]", (char *)&err);
msg_Err(p_aout, "Could not release hogmode: [%4.4s]", (char *)&err);
}
- var_DelCallback(p_aout, "audio-device", AudioDeviceCallback, NULL);
+ p_sys->i_bytes_per_sample = 0;
- aout_PacketDestroy(p_aout);
+ /* clean-up circular buffer */
+ TPCircularBufferCleanup(&p_sys->circular_buffer);
}
-/*****************************************************************************
- * Probe: Check which devices the OS has, and add them to our audio-device menu
- *****************************************************************************/
-static void Probe(audio_output_t * p_aout)
+#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)
+{
+ struct aout_sys_t *p_sys = p_aout->sys;
+
+ struct audio_device_t *device = malloc(sizeof(*device));
+ if (unlikely(device == NULL))
+ return;
+
+ device->next = p_sys->devices;
+ device->deviceid = i_id;
+ device->name = strdup(name);
+
+ p_sys->devices = device;
+}
+
+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 defaultDeviceID = 0;
+ AudioObjectID *deviceIDs;
+ UInt32 numberOfDevices;
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;
+
/* 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) {
+ if (numberOfDevices < 1) {
msg_Err(p_aout, "No audio output devices were found.");
- goto error;
+ 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);
+ err = AudioObjectGetPropertyData(kAudioObjectSystemObject, &audioDevicesAddress, 0, NULL, &propertySize, deviceIDs);
if (err != noErr) {
- msg_Err(p_aout, "could not get the device IDs: [%s]", (char *)&err);
- goto error;
+ 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 };
- i_param_size = sizeof(AudioDeviceID);
- err= AudioObjectGetPropertyData(kAudioObjectSystemObject, &defaultDeviceAddress, 0, NULL, &i_param_size, &devid_def);
+ propertySize = sizeof(AudioObjectID);
+ err= AudioObjectGetPropertyData(kAudioObjectSystemObject, &defaultDeviceAddress, 0, NULL, &propertySize, &defaultDeviceID);
if (err != noErr) {
- msg_Err(p_aout, "could not get default audio device: [%s]", (char *)&err);
- goto error;
+ msg_Err(p_aout, "could not get default audio device: [%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);
+ p_sys->i_default_dev = defaultDeviceID;
- AudioObjectPropertyAddress deviceNameAddress = { kAudioDevicePropertyDeviceName, kAudioDevicePropertyScopeOutput, kAudioObjectPropertyElementMaster };
+ AudioObjectPropertyAddress deviceNameAddress = { kAudioObjectPropertyName, kAudioObjectPropertyScopeGlobal, 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);
- }
+ add_device_to_list(p_aout, i_id, psz_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);
- }
- }
+ 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;
+ add_device_to_list(p_aout, i_id, psz_encoded_name);
+ free(psz_encoded_name);
}
+ 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);
- }
+ add_device_to_list(p_aout, 0, _("System Sound Output Device"));
/* 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) {
+ if (err != noErr)
msg_Warn(p_aout, "failed to add listener for audio device configuration (%i)", err);
- goto error;
+
+ free(deviceIDs);
+}
+
+static int SwitchAudioDevice(audio_output_t *p_aout, const char *name)
+{
+ struct aout_sys_t *p_sys = p_aout->sys;
+
+ if (name)
+ p_sys->i_selected_dev = atoi(name);
+ else
+ p_sys->i_selected_dev = 0;
+
+ bool b_supports_digital = (p_sys->i_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;
+
+ aout_DeviceReport(p_aout, name);
+ aout_RestartRequest(p_aout, AOUT_RESTART_OUTPUT);
+
+ return 0;
+}
+
+static int VolumeSet(audio_output_t * p_aout, float volume)
+{
+ struct aout_sys_t *p_sys = p_aout->sys;
+ OSStatus ostatus;
+
+ 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 (var_InheritBool(p_aout, "volume-save"))
+ config_PutInt(p_aout, "auhal-volume", lroundf(volume * AOUT_VOLUME_DEFAULT));
+
+ return ostatus;
+}
+
+static int MuteSet(audio_output_t * p_aout, bool mute)
+{
+ struct aout_sys_t *p_sys = p_aout->sys;
+ OSStatus ostatus;
+
+ aout_MuteReport(p_aout, mute);
+
+ float volume = .0;
+
+ if (!mute)
+ volume = var_InheritInteger(p_aout, "auhal-volume") / (float)AOUT_VOLUME_DEFAULT;
+
+ ostatus = AudioUnitSetParameter(p_sys->au_unit,
+ kHALOutputParam_Volume,
+ kAudioUnitScope_Global,
+ 0,
+ volume * volume * volume,
+ 0);
+
+ return ostatus;
+}
+
+#pragma mark -
+#pragma mark actual playback
+
+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,
+ p_block->i_buffer,
+ p_sys->chans_to_reorder,
+ p_sys->chan_table,
+ VLC_CODEC_FL32);
+ }
+
+ /* move data to buffer */
+ 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;
}
- free(p_devices);
- return;
+ block_Release(p_block);
+}
-error:
- msg_Warn(p_aout, "audio device already in use");
- free(p_devices);
- return;
+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);
+ }
+}
+
+static void Flush(audio_output_t *p_aout, bool wait)
+{
+ 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)
+{
+ 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);
+
+ *delay = (availableBytes / p_sys->i_bytes_per_sample) * CLOCK_FREQ / p_sys->i_rate;
+
+ return 0;
}
/*****************************************************************************
- * AudioDeviceHasOutput: Checks if the Device actually provides any outputs at all
+ * RenderCallbackAnalog: This function is called everytime the AudioUnit wants
+ * us to provide some more audio data.
+ * Don't print anything during normal playback, calling blocking function from
+ * this callback is not allowed.
*****************************************************************************/
+static OSStatus RenderCallbackAnalog(vlc_object_t *p_obj,
+ AudioUnitRenderActionFlags *ioActionFlags,
+ const AudioTimeStamp *inTimeStamp,
+ UInt32 inBusNumber,
+ UInt32 inNumberFrames,
+ AudioBufferList *ioData) {
+ VLC_UNUSED(ioActionFlags);
+ VLC_UNUSED(inTimeStamp);
+ VLC_UNUSED(inBusNumber);
+ VLC_UNUSED(inNumberFrames);
+
+ audio_output_t * p_aout = (audio_output_t *)p_obj;
+ struct aout_sys_t * p_sys = p_aout->sys;
+
+ int bytesToCopy = ioData->mBuffers[0].mDataByteSize;
+ Float32 *targetBuffer = (Float32*)ioData->mBuffers[0].mData;
+
+ vlc_mutex_lock(&p_sys->lock);
+ /* Pull audio from buffer */
+ int32_t availableBytes;
+ Float32 *buffer = TPCircularBufferTail(&p_sys->circular_buffer, &availableBytes);
+
+ /* check if we have enough data */
+ if (!availableBytes) {
+ /* return an empty buffer so silence is played until we have data */
+ for (UInt32 j = 0; j < inNumberFrames; j++)
+ targetBuffer[j] = 0.;
+ } else {
+ 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,
+ const AudioTimeStamp * inNow,
+ const void * inInputData,
+ const AudioTimeStamp * inInputTime,
+ AudioBufferList * outOutputData,
+ const AudioTimeStamp * inOutputTime,
+ void * threadGlobals)
+{
+ VLC_UNUSED(inNow);
+ VLC_UNUSED(inDevice);
+ VLC_UNUSED(inInputData);
+ VLC_UNUSED(inInputTime);
+ VLC_UNUSED(inOutputTime);
+
+ audio_output_t * p_aout = (audio_output_t *)threadGlobals;
+ struct aout_sys_t * p_sys = p_aout->sys;
+
+ int bytesToCopy = outOutputData->mBuffers[p_sys->i_stream_index].mDataByteSize;
+ char *targetBuffer = outOutputData->mBuffers[p_sys->i_stream_index].mData;
+
+ vlc_mutex_lock(&p_sys->lock);
+ /* Pull audio from buffer */
+ int32_t availableBytes;
+ char *buffer = TPCircularBufferTail(&p_sys->circular_buffer, &availableBytes);
+
+ /* check if we have enough data */
+ if (!availableBytes) {
+ /* return an empty buffer so silence is played until we have data */
+ memset(targetBuffer, 0, outOutputData->mBuffers[p_sys->i_stream_index].mDataByteSize);
+ } else {
+ memcpy(targetBuffer, buffer, __MIN(bytesToCopy, availableBytes));
+ TPCircularBufferConsume(&p_sys->circular_buffer, __MIN(bytesToCopy, availableBytes));
+ }
+
+ vlc_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;
+
+#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;
+
+ case kAudioDevicePropertyDeviceIsAlive:
+ msg_Warn(p_aout, "audio device died, resetting aout");
+ break;
+
+ case kAudioStreamPropertyAvailablePhysicalFormats:
+ msg_Warn(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;
+ }
+ }
+#endif
+
+ RebuildDeviceList(p_aout);
+ aout_RestartRequest(p_aout, AOUT_RESTART_OUTPUT);
+
+ return err;
+}
+
+/*
+ * 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;
+ struct { vlc_mutex_t lock; vlc_cond_t cond; } * w = inClientData;
+
+ VLC_UNUSED(inObjectID);
+
+ for (unsigned int i = 0; i < inNumberAddresses; i++) {
+ if (inAddresses[i].mSelector == kAudioStreamPropertyPhysicalFormat) {
+ vlc_mutex_lock(&w->lock);
+ vlc_cond_signal(&w->cond);
+ vlc_mutex_unlock(&w->lock);
+ break;
+ }
+ }
+ return err;
+}
+
+#pragma mark -
+#pragma mark helpers
+
+/*
+ * AudioDeviceHasOutput: Checks if the device is actually an output device
+ */
static int AudioDeviceHasOutput(AudioDeviceID i_dev_id)
{
- UInt32 dataSize;
+ UInt32 dataSize = 0;
+ OSStatus status;
AudioObjectPropertyAddress streamsAddress = { kAudioDevicePropertyStreams, kAudioDevicePropertyScopeOutput, kAudioObjectPropertyElementMaster };
- verify_noerr(AudioObjectGetPropertyDataSize(i_dev_id, &streamsAddress, 0, NULL, &dataSize));
- if (dataSize == 0)
+ status = AudioObjectGetPropertyDataSize(i_dev_id, &streamsAddress, 0, NULL, &dataSize);
+
+ if (dataSize == 0 || status != noErr)
return FALSE;
return TRUE;
}
-/*****************************************************************************
- * AudioDeviceSupportsDigital: Check i_dev_id for digital stream support.
- *****************************************************************************/
+/*
+ * AudioDeviceSupportsDigital: Checks if device supports raw bitstreams
+ */
static int AudioDeviceSupportsDigital(audio_output_t *p_aout, AudioDeviceID i_dev_id)
{
OSStatus err = noErr;
UInt32 i_param_size = 0;
AudioStreamID *p_streams = NULL;
int i_streams = 0;
- bool b_return = false;
+ bool b_return = false;
/* Retrieve all the output streams */
AudioObjectPropertyAddress streamsAddress = { kAudioDevicePropertyStreams, kAudioDevicePropertyScopeOutput, kAudioObjectPropertyElementMaster };
return b_return;
}
-/*****************************************************************************
- * AudioStreamSupportsDigital: Check i_stream_id for digital stream support.
- *****************************************************************************/
+/*
+ * AudioStreamSupportsDigital: Checks if audio stream is compatible with raw bitstreams
+ */
static int AudioStreamSupportsDigital(audio_output_t *p_aout, AudioStreamID i_stream_id)
{
OSStatus err = noErr;
}
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)
+ p_format_list[i].mFormat.mFormatID == 'iac3' ||
+ p_format_list[i].mFormat.mFormatID == kAudioFormat60958AC3 ||
+ p_format_list[i].mFormat.mFormatID == kAudioFormatAC3)
b_return = true;
}
return b_return;
}
-/*****************************************************************************
- * AudioStreamChangeFormat: Change i_stream_id to change_format
- *****************************************************************************/
+/*
+ * AudioStreamChangeFormat: switch stream format based on the provided description
+ */
static int AudioStreamChangeFormat(audio_output_t *p_aout, AudioStreamID i_stream_id, AudioStreamBasicDescription change_format)
{
OSStatus err = noErr;
return true;
}
-
-/*****************************************************************************
- * RenderCallbackAnalog: This function is called everytime the AudioUnit wants
- * us to provide some more audio data.
- * Don't print anything during normal playback, calling blocking function from
- * this callback is not allowed.
- *****************************************************************************/
-static OSStatus RenderCallbackAnalog(vlc_object_t *_p_aout,
- AudioUnitRenderActionFlags *ioActionFlags,
- const AudioTimeStamp *inTimeStamp,
- unsigned int inBusNumber,
- unsigned int inNumberFrames,
- AudioBufferList *ioData)
-{
- AudioTimeStamp host_time;
- mtime_t current_date = 0;
- uint32_t i_mData_bytes = 0;
-
- audio_output_t * p_aout = (audio_output_t *)_p_aout;
- struct aout_sys_t * p_sys = p_aout->sys;
-
- VLC_UNUSED(ioActionFlags);
- VLC_UNUSED(inBusNumber);
- VLC_UNUSED(inNumberFrames);
-
- host_time.mFlags = kAudioTimeStampHostTimeValid;
- AudioDeviceTranslateTime(p_sys->i_selected_dev, inTimeStamp, &host_time);
-
- /* Check for the difference between the Device clock and mdate */
- p_sys->clock_diff = - (mtime_t)
- AudioConvertHostTimeToNanos(AudioGetCurrentHostTime()) / 1000;
- p_sys->clock_diff += mdate();
-
- current_date = p_sys->clock_diff +
- AudioConvertHostTimeToNanos(host_time.mHostTime) / 1000;
- //- ((mtime_t) 1000000 / p_aout->format.i_rate * 31); // 31 = Latency in Frames. retrieve somewhere
-
- if (ioData == NULL || ioData->mNumberBuffers < 1) {
- msg_Err(p_aout, "no iodata or buffers");
- return 0;
- }
- if (ioData->mNumberBuffers > 1)
- msg_Err(p_aout, "well this is weird. seems like there is more than one buffer...");
-
-
- if (p_sys->i_total_bytes > 0) {
- i_mData_bytes = __MIN(p_sys->i_total_bytes - p_sys->i_read_bytes, ioData->mBuffers[0].mDataByteSize);
- memcpy(ioData->mBuffers[0].mData,
- &p_sys->p_remainder_buffer[p_sys->i_read_bytes],
- i_mData_bytes);
- p_sys->i_read_bytes += i_mData_bytes;
- current_date += (mtime_t) ((mtime_t) 1000000 / p_sys->packet.format.i_rate) *
- (i_mData_bytes / 4 / aout_FormatNbChannels(&p_sys->packet.format)); // 4 is fl32 specific
-
- if (p_sys->i_read_bytes >= p_sys->i_total_bytes)
- p_sys->i_read_bytes = p_sys->i_total_bytes = 0;
- }
-
- while(i_mData_bytes < ioData->mBuffers[0].mDataByteSize) {
- /* We don't have enough data yet */
- block_t * p_buffer;
- p_buffer = aout_PacketNext(p_aout, current_date);
-
- if (p_buffer != NULL)
- {
- uint32_t i_second_mData_bytes = __MIN(p_buffer->i_buffer, ioData->mBuffers[0].mDataByteSize - i_mData_bytes);
-
- memcpy((uint8_t *)ioData->mBuffers[0].mData + i_mData_bytes,
- p_buffer->p_buffer, i_second_mData_bytes);
- i_mData_bytes += i_second_mData_bytes;
-
- if (i_mData_bytes >= ioData->mBuffers[0].mDataByteSize)
- {
- p_sys->i_total_bytes = p_buffer->i_buffer - i_second_mData_bytes;
- memcpy(p_sys->p_remainder_buffer,
- &p_buffer->p_buffer[i_second_mData_bytes],
- p_sys->i_total_bytes);
- block_Release(p_buffer);
- break;
- } else
- /* update current_date */
- current_date += (mtime_t) ((mtime_t) 1000000 / p_sys->packet.format.i_rate) *
- (i_second_mData_bytes / 4 / aout_FormatNbChannels(&p_sys->packet.format)); // 4 is fl32 specific
- block_Release(p_buffer);
- } else {
- memset((uint8_t *)ioData->mBuffers[0].mData +i_mData_bytes,
- 0,ioData->mBuffers[0].mDataByteSize - i_mData_bytes);
- i_mData_bytes += ioData->mBuffers[0].mDataByteSize - i_mData_bytes;
- }
- }
- return noErr;
-}
-
-/*****************************************************************************
- * RenderCallbackSPDIF: callback for SPDIF audio output
- *****************************************************************************/
-static OSStatus RenderCallbackSPDIF (AudioDeviceID inDevice,
- const AudioTimeStamp * inNow,
- const void * inInputData,
- const AudioTimeStamp * inInputTime,
- AudioBufferList * outOutputData,
- 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(inDevice);
- VLC_UNUSED(inInputData);
- VLC_UNUSED(inInputTime);
-
- /* 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();
-
- 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
-
- p_buffer = aout_PacketNext(p_aout, current_date);
-
-#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);
-
- /* move data into output data buffer */
- memcpy(BUFFER.mData, p_buffer->p_buffer, p_buffer->i_buffer);
- block_Release(p_buffer);
- }
- else
- memset(BUFFER.mData, 0, BUFFER.mDataByteSize);
-#undef BUFFER
-
- return noErr;
-}
-
-/*****************************************************************************
- * 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);
-
- 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");
- }
- }
-
- return err;
-}
-
-/*****************************************************************************
- * StreamListener
- *****************************************************************************/
-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;
-
- VLC_UNUSED(inObjectID);
-
- for (unsigned int i = 0; i < inNumberAddresses; i++) {
- if (inAddresses[i].mSelector == kAudioStreamPropertyPhysicalFormat) {
- vlc_mutex_lock(&w->lock);
- vlc_cond_signal(&w->cond);
- vlc_mutex_unlock(&w->lock);
- break;
- }
- }
- 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)
-{
- 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);
-}
-
-
-/*****************************************************************************
- * 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;
-
- aout_VolumeReport(p_aout, volume);
-
- volume = volume * volume * volume; // cubic mapping from output.c
-
- /* Set volume for output unit */
- ostatus = AudioUnitSetParameter(p_sys->au_unit,
- kHALOutputParam_Volume,
- kAudioUnitScope_Global,
- 0,
- volume,
- 0);
-
- return ostatus;
-}
-
-static int MuteSet(audio_output_t * p_aout, bool mute)
-{
- aout_MuteReport(p_aout, mute);
-
- return 0;
-}
-
-static int Open(vlc_object_t *obj)
-{
- audio_output_t *aout = (audio_output_t *)obj;
- aout_sys_t *sys = malloc(sizeof (*sys));
-
- if (unlikely(sys == NULL))
- return VLC_ENOMEM;
- aout->sys = sys;
- aout->start = Start;
- aout->stop = Stop;
- aout->volume_set = VolumeSet;
- aout->mute_set = MuteSet;
- return VLC_SUCCESS;
-}
-
-static void Close(vlc_object_t *obj)
-{
- audio_output_t *aout = (audio_output_t *)obj;
- aout_sys_t *sys = aout->sys;
-
- free(sys);
-}
projects / vlc / blobdiff