CFArrayRef device_list;
+ float f_volume;
+ bool b_mute;
+
vlc_mutex_t lock;
vlc_cond_t cond;
};
RebuildDeviceList(p_aout);
/* remember the volume */
- aout_VolumeReport(p_aout, var_InheritInteger(p_aout, "auhal-volume") / (float)AOUT_VOLUME_DEFAULT);
- MuteSet(p_aout, var_InheritBool(p_aout, "mute"));
+ p_sys->f_volume = var_InheritInteger(p_aout, "auhal-volume") / (float)AOUT_VOLUME_DEFAULT;
+ aout_VolumeReport(p_aout, p_sys->f_volume);
+ p_sys->b_mute = var_InheritBool(p_aout, "mute");
+ aout_MuteReport(p_aout, p_sys->b_mute);
SwitchAudioDevice(p_aout, config_GetPsz(p_aout, "auhal-audio-device"));
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);
+ 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);
+ 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);
+ 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));
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) {
- 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;
+ if (!b_alive || p_sys->i_selected_dev == 0) {
+ msg_Warn(p_aout, "selected audio device is not alive, switching to default device");
+
+ 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 = false;
if (b_start_digital)
- msg_Dbg(p_aout, "Use audio device for digital output");
+ msg_Dbg(p_aout, "Using audio device for digital output");
+ else
+ msg_Dbg(p_aout, "Audio device supports PCM mode only");
/* add a callback to see if the device dies later on */
err = AudioObjectAddPropertyListener(p_sys->i_selected_dev, &audioDeviceAliveAddress, HardwareListener, (void *)p_aout);
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;
}
AURenderCallbackStruct input;
p_aout->sys->chans_to_reorder = 0;
+ SInt32 currentMinorSystemVersion;
+ if(Gestalt(gestaltSystemVersionMinor, ¤tMinorSystemVersion) != noErr)
+ msg_Err(p_aout, "failed to check OSX version");
+
/* Lets go find our Component */
desc.componentType = kAudioUnitType_Output;
desc.componentSubType = kAudioUnitSubType_HALOutput;
p_sys->au_component = AudioComponentFindNext(NULL, &desc);
if (p_sys->au_component == NULL) {
- msg_Warn(p_aout, "we cannot find our HAL component");
+ msg_Err(p_aout, "cannot find any HAL component, PCM output failed");
return false;
}
err = AudioComponentInstanceNew(p_sys->au_component, &p_sys->au_unit);
if (err != noErr) {
- msg_Warn(p_aout, "we cannot open our HAL component");
+ msg_Err(p_aout, "cannot open HAL component, PCM output failed [%4.4s]", (char *)&err);
return false;
}
sizeof(AudioObjectID));
if (err != noErr) {
- msg_Warn(p_aout, "we cannot select the audio device");
+ msg_Err(p_aout, "cannot select audio output device, PCM output failed [%4.4s]", (char *)&err);
return false;
}
&DeviceFormat,
&i_param_size);
- if (err != noErr)
+ if (err != noErr) {
+ msg_Err(p_aout, "failed to detect supported stream formats [%4.4s]", (char *)&err);
return false;
- else
+ } else
msg_Dbg(p_aout, STREAM_FORMAT_MSG("current format is: ", DeviceFormat));
/* Get the channel layout of the device side of the unit (vlc -> unit -> device) */
}
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;
}
memset (&new_layout, 0, sizeof(new_layout));
uint32_t chans_out[AOUT_CHAN_MAX];
+ /* Some channel abbreviations used below:
+ * L - left
+ * R - right
+ * C - center
+ * Ls - left surround
+ * Rs - right surround
+ * Cs - center surround
+ * Rls - rear left surround
+ * Rrs - rear right surround
+ * Lw - left wide
+ * Rw - right wide
+ * Lsd - left surround direct
+ * Rsd - right surround direct
+ * Lc - left center
+ * Rc - right center
+ * Ts - top surround
+ * Vhl - vertical height left
+ * Vhc - vertical height center
+ * Vhr - vertical height right
+ * Lt - left matrix total. for matrix encoded stereo.
+ * Rt - right matrix total. for matrix encoded stereo. */
+
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:
- new_layout.mChannelLayoutTag = kAudioChannelLayoutTag_MPEG_6_1_A;
+ new_layout.mChannelLayoutTag = kAudioChannelLayoutTag_MPEG_6_1_A; // L R C LFE Ls Rs Cs
chans_out[0] = AOUT_CHAN_LEFT;
chans_out[1] = AOUT_CHAN_RIGHT;
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:
- new_layout.mChannelLayoutTag = kAudioChannelLayoutTag_MPEG_7_1_A;
+ if (fmt->i_physical_channels & (AOUT_CHAN_LFE) || currentMinorSystemVersion < 7) {
+ new_layout.mChannelLayoutTag = kAudioChannelLayoutTag_MPEG_7_1_A; // L R C LFE Ls Rs Lc Rc
+
+ 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;
+
+ if (!(fmt->i_physical_channels & (AOUT_CHAN_LFE)))
+ msg_Warn(p_aout, "8.0 audio output not supported on OS X 10.%i, layout will be incorrect", currentMinorSystemVersion);
+ }
+#ifdef MAC_OS_X_VERSION_10_7
+ else {
+ new_layout.mChannelLayoutTag = kAudioChannelLayoutTag_DTS_8_0_B; // Lc C Rc L R Ls Cs Rs
+
+ chans_out[0] = AOUT_CHAN_MIDDLELEFT;
+ chans_out[1] = AOUT_CHAN_CENTER;
+ chans_out[2] = AOUT_CHAN_MIDDLERIGHT;
+ chans_out[3] = AOUT_CHAN_LEFT;
+ chans_out[4] = AOUT_CHAN_RIGHT;
+ chans_out[5] = AOUT_CHAN_REARLEFT;
+ chans_out[6] = AOUT_CHAN_REARCENTER;
+ chans_out[7] = AOUT_CHAN_REARRIGHT;
+ }
+#endif
+ 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 for 7.1 / 8.0 output");
- 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;
+ break;
+ case 9:
+ if (currentMinorSystemVersion < 7) {
+ msg_Warn(p_aout, "8.1 audio output not supported on OS X 10.%i", currentMinorSystemVersion);
+ break;
+ }
+
+#ifdef MAC_OS_X_VERSION_10_7
+ new_layout.mChannelLayoutTag = kAudioChannelLayoutTag_DTS_8_1_B; // Lc C Rc L R Ls Cs Rs LFE
+ chans_out[0] = AOUT_CHAN_MIDDLELEFT;
+ chans_out[1] = AOUT_CHAN_CENTER;
+ chans_out[2] = AOUT_CHAN_MIDDLERIGHT;
+ chans_out[3] = AOUT_CHAN_LEFT;
+ chans_out[4] = AOUT_CHAN_RIGHT;
+ chans_out[5] = AOUT_CHAN_REARLEFT;
+ chans_out[6] = AOUT_CHAN_REARCENTER;
chans_out[7] = AOUT_CHAN_REARRIGHT;
+ chans_out[8] = AOUT_CHAN_LFE;
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 8.1 output");
+#endif
break;
}
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));
+ VolumeSet(p_aout, p_sys->f_volume);
+ MuteSet(p_aout, p_sys->b_mute);
return true;
}
err = AudioObjectSetPropertyData(p_sys->i_selected_dev, &audioDeviceHogModeAddress, 0, NULL, i_param_size, &p_sys->i_hog_pid);
if (err != noErr) {
- msg_Err(p_aout, "failed to set hogmode: [%4.4s]", (char *)&err);
+ msg_Err(p_aout, "failed to set hogmode [%4.4s]", (char *)&err);
return false;
}
}
if (err != noErr) {
- msg_Err(p_aout, "failed to set mixmode: [%4.4s]", (char *)&err);
+ msg_Err(p_aout, "failed to set mixmode [%4.4s]", (char *)&err);
return false;
}
}
AudioObjectPropertyAddress streamsAddress = { kAudioDevicePropertyStreams, kAudioDevicePropertyScopeOutput, kAudioObjectPropertyElementMaster };
err = AudioObjectGetPropertyDataSize(p_sys->i_selected_dev, &streamsAddress, 0, NULL, &i_param_size);
if (err != noErr) {
- msg_Err(p_aout, "could not get number of streams: [%4.4s]", (char *)&err);
+ msg_Err(p_aout, "could not get size of stream description packet [%4.4s]", (char *)&err);
return false;
}
err = AudioObjectGetPropertyData(p_sys->i_selected_dev, &streamsAddress, 0, NULL, &i_param_size, p_streams);
if (err != noErr) {
- msg_Err(p_aout, "could not get number of streams: [%4.4s]", (char *)&err);
+ msg_Err(p_aout, "could not fetch stream descriptions [%4.4s]", (char *)&err);
free(p_streams);
return false;
}
/* Retrieve all the stream formats supported by each output stream */
err = AudioObjectGetPropertyDataSize(p_streams[i], &physicalFormatsAddress, 0, NULL, &i_param_size);
if (err != noErr) {
- msg_Err(p_aout, "could not get number of streamformats: [%s] (%i)", (char *)&err, (int32_t)err);
+ msg_Err(p_aout, "could not get number of streamformats: [%4.4s] (%i)", (char *)&err, (int32_t)err);
continue;
}
i_param_size = sizeof(p_sys->sfmt_revert);
err = AudioObjectGetPropertyData(p_sys->i_stream_id, ¤tPhysicalFormatAddress, 0, NULL, &i_param_size, &p_sys->sfmt_revert);
if (err != noErr) {
- msg_Err(p_aout, "could not retrieve the original streamformat: [%4.4s]", (char *)&err);
+ msg_Err(p_aout, "could not retrieve the original streamformat [%4.4s]", (char *)&err);
continue;
}
p_sys->b_revert = true;
msg_Dbg(p_aout, STREAM_FORMAT_MSG("original stream format: ", p_sys->sfmt_revert));
- if (!AudioStreamChangeFormat(p_aout, p_sys->i_stream_id, p_sys->stream_format))
+ if (!AudioStreamChangeFormat(p_aout, p_sys->i_stream_id, p_sys->stream_format)) {
+ msg_Err(p_aout, "failed to change stream format for SPDIF output");
return false;
+ }
/* Set the format flags */
if (p_sys->stream_format.mFormatFlags & kAudioFormatFlagIsBigEndian)
(void *)p_aout,
&p_sys->i_procID);
if (err != noErr) {
- msg_Err(p_aout, "AudioDeviceCreateIOProcID failed: [%4.4s]", (char *)&err);
+ msg_Err(p_aout, "Failed to create Process ID [%4.4s]", (char *)&err);
return false;
}
/* Start device */
err = AudioDeviceStart(p_sys->i_selected_dev, p_sys->i_procID);
if (err != noErr) {
- msg_Err(p_aout, "AudioDeviceStart failed: [%4.4s]", (char *)&err);
+ msg_Err(p_aout, "Failed to start audio device [%4.4s]", (char *)&err);
err = AudioDeviceDestroyIOProcID(p_sys->i_selected_dev, p_sys->i_procID);
if (err != noErr)
- msg_Err(p_aout, "AudioDeviceDestroyIOProcID failed: [%4.4s]", (char *)&err);
+ msg_Err(p_aout, "Failed to destroy process ID [%4.4s]", (char *)&err);
return false;
}
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);
}
}
kAudioObjectPropertyElementMaster };
err = AudioObjectSetPropertyData(p_sys->i_selected_dev, &audioDeviceHogModeAddress, 0, NULL, i_param_size, &p_sys->i_hog_pid);
if (err != noErr)
- msg_Err(p_aout, "Could not release hogmode: [%4.4s]", (char *)&err);
+ msg_Err(p_aout, "Failed to release hogmode [%4.4s]", (char *)&err);
}
p_sys->i_bytes_per_sample = 0;
static void ReportDevice(audio_output_t *p_aout, UInt32 i_id, char *name)
{
- char deviceid[100];
+ char deviceid[10];
sprintf(deviceid, "%i", i_id);
aout_HotplugReport(p_aout, deviceid, name);
{
OSStatus err = noErr;
UInt32 propertySize = 0;
- AudioObjectID defaultDeviceID = 0;
AudioObjectID *deviceIDs;
UInt32 numberOfDevices;
CFMutableArrayRef currentListOfDevices;
numberOfDevices = propertySize / sizeof(AudioDeviceID);
if (numberOfDevices < 1) {
- msg_Err(p_aout, "No audio output devices were found.");
+ msg_Err(p_aout, "No audio output devices found.");
return;
}
msg_Dbg(p_aout, "found %i audio device(s)", numberOfDevices);
/* Populate DeviceID array */
err = AudioObjectGetPropertyData(kAudioObjectSystemObject, &audioDevicesAddress, 0, NULL, &propertySize, deviceIDs);
if (err != noErr) {
- msg_Err(p_aout, "could not get the device IDs: [%4.4s]", (char *)&err);
+ msg_Err(p_aout, "could not get the device IDs [%4.4s]", (char *)&err);
return;
}
- /* Find the ID of the default Device */
- AudioObjectPropertyAddress defaultDeviceAddress = { kAudioHardwarePropertyDefaultOutputDevice, kAudioDevicePropertyScopeOutput, kAudioObjectPropertyElementMaster };
- propertySize = sizeof(AudioObjectID);
- err = AudioObjectGetPropertyData(kAudioObjectSystemObject, &defaultDeviceAddress, 0, NULL, &propertySize, &defaultDeviceID);
- if (err != noErr) {
- msg_Err(p_aout, "could not get default audio device: [%4.4s]", (char *)&err);
- return;
- }
- p_sys->i_default_dev = defaultDeviceID;
-
AudioObjectPropertyAddress deviceNameAddress = { kAudioObjectPropertyName, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
for (unsigned int i = 0; i < numberOfDevices; i++) {
count = CFArrayGetCount(p_sys->device_list);
if (count > 0) {
- CFShow(currentListOfDevices);
- CFShow(p_sys->device_list);
CFNumberRef cfn_device_id;
int i_device_id = 0;
for (CFIndex x = 0; x < count; x++) {
struct aout_sys_t *p_sys = p_aout->sys;
OSStatus ostatus;
- if(p_sys->b_digital) {
+ if(p_sys->b_digital)
return VLC_EGENERIC;
- }
+ p_sys->f_volume = volume;
aout_VolumeReport(p_aout, volume);
/* Set volume for output unit */
struct aout_sys_t *p_sys = p_aout->sys;
OSStatus ostatus;
- if(p_sys->b_digital) {
+ if(p_sys->b_digital)
return VLC_EGENERIC;
- }
+ p_sys->b_mute = mute;
aout_MuteReport(p_aout, mute);
float volume = .0;
-
if (!mute)
- volume = var_InheritInteger(p_aout, "auhal-volume") / (float)AOUT_VOLUME_DEFAULT;
+ volume = p_sys->f_volume;
ostatus = AudioUnitSetParameter(p_sys->au_unit,
kHALOutputParam_Volume,
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);
/* check if we have enough data */
if (!availableBytes) {
/* return an empty buffer so silence is played until we have data */
- for (UInt32 j = 0; j < inNumberFrames; j++)
- targetBuffer[j] = 0.;
+ memset(targetBuffer, 0, ioData->mBuffers[0].mDataByteSize);
} else {
- memcpy(targetBuffer, buffer, __MIN(bytesToCopy, availableBytes));
- TPCircularBufferConsume(&p_sys->circular_buffer, __MIN(bytesToCopy, availableBytes));
+ int32_t bytesToCopy = __MIN(bytesRequested, availableBytes);
+
+ memcpy(targetBuffer, buffer, bytesToCopy);
+ TPCircularBufferConsume(&p_sys->circular_buffer, bytesToCopy);
+ ioData->mBuffers[0].mDataByteSize = bytesToCopy;
}
vlc_cond_signal(&p_sys->cond);
audio_output_t * p_aout = (audio_output_t *)threadGlobals;
struct aout_sys_t * p_sys = p_aout->sys;
- int bytesToCopy = outOutputData->mBuffers[p_sys->i_stream_index].mDataByteSize;
+ int bytesRequested = outOutputData->mBuffers[p_sys->i_stream_index].mDataByteSize;
char *targetBuffer = outOutputData->mBuffers[p_sys->i_stream_index].mData;
vlc_mutex_lock(&p_sys->lock);
/* 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));
+ int32_t bytesToCopy = __MIN(bytesRequested, availableBytes);
+
+ memcpy(targetBuffer, buffer, bytesToCopy);
+ TPCircularBufferConsume(&p_sys->circular_buffer, bytesToCopy);
+ outOutputData->mBuffers[p_sys->i_stream_index].mDataByteSize = bytesToCopy;
}
vlc_cond_signal(&p_sys->cond);
if (!p_aout)
return -1;
-#ifndef NDEBUG
for (unsigned int i = 0; i < inNumberAddresses; i++) {
switch (inAddresses[i].mSelector) {
case kAudioHardwarePropertyDevices:
- msg_Warn(p_aout, "audio device configuration changed, resetting cache");
+ msg_Dbg(p_aout, "audio device configuration changed, resetting cache");
break;
case kAudioDevicePropertyDeviceIsAlive:
break;
case kAudioStreamPropertyAvailablePhysicalFormats:
- msg_Warn(p_aout, "available physical formats for audio device changed, resetting aout");
+ msg_Dbg(p_aout, "available physical formats for audio device changed, resetting aout");
break;
default:
break;
}
}
-#endif
RebuildDeviceList(p_aout);
aout_RestartRequest(p_aout, AOUT_RESTART_OUTPUT);
AudioObjectPropertyAddress streamsAddress = { kAudioDevicePropertyStreams, kAudioDevicePropertyScopeOutput, kAudioObjectPropertyElementMaster };
err = AudioObjectGetPropertyDataSize(i_dev_id, &streamsAddress, 0, NULL, &i_param_size);
if (err != noErr) {
- msg_Err(p_aout, "could not get number of streams: [%s] (%i)", (char *)&err, (int32_t)err);
+ msg_Err(p_aout, "could not get number of streams [%4.4s] (%i)", (char *)&err, (int32_t)err);
return VLC_EGENERIC;
}
err = AudioObjectGetPropertyData(i_dev_id, &streamsAddress, 0, NULL, &i_param_size, p_streams);
if (err != noErr) {
- msg_Err(p_aout, "could not get list of streams: [%s]", (char *)&err);
+ msg_Err(p_aout, "could not get list of streams [%4.4s]", (char *)&err);
return VLC_EGENERIC;
}
if (err != noErr) {
// nope just means that we already have a callback
if (err == kAudioHardwareIllegalOperationError) {
- msg_Dbg(p_aout, "could not set audio stream formats property callback on stream id %i, already have callback: %4.4s", p_streams[i],
+ 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],
+ msg_Warn(p_aout, "could not set audio stream formats property callback on stream id %i [%4.4s]", p_streams[i],
(char *)&err);
}
}
AudioObjectPropertyAddress streamsAddress = { kAudioDevicePropertyStreams, kAudioDevicePropertyScopeOutput, kAudioObjectPropertyElementMaster };
err = AudioObjectGetPropertyDataSize(i_dev_id, &streamsAddress, 0, NULL, &i_param_size);
if (err != noErr) {
- msg_Err(p_aout, "could not get number of streams: [%s] (%i)", (char *)&err, (int32_t)err);
+ msg_Err(p_aout, "could not get number of streams [%4.4s] (%i)", (char *)&err, (int32_t)err);
return false;
}
err = AudioObjectGetPropertyData(i_dev_id, &streamsAddress, 0, NULL, &i_param_size, p_streams);
if (err != noErr) {
- msg_Err(p_aout, "could not get list of streams: [%s]", (char *)&err);
+ msg_Err(p_aout, "could not get list of streams [%4.4s]", (char *)&err);
return false;
}
AudioObjectPropertyAddress physicalFormatsAddress = { kAudioStreamPropertyAvailablePhysicalFormats, kAudioObjectPropertyScopeGlobal, 0 };
err = AudioObjectGetPropertyDataSize(i_stream_id, &physicalFormatsAddress, 0, NULL, &i_param_size);
if (err != noErr) {
- msg_Err(p_aout, "could not get number of streamformats: [%s] (%i)", (char *)&err, (int32_t)err);
+ msg_Err(p_aout, "could not get number of streamformats [%4.4s] (%i)", (char *)&err, (int32_t)err);
return false;
}
err = AudioObjectGetPropertyData(i_stream_id, &physicalFormatsAddress, 0, NULL, &i_param_size, p_format_list);
if (err != noErr) {
- msg_Err(p_aout, "could not get the list of streamformats: [%4.4s]", (char *)&err);
+ msg_Err(p_aout, "could not get the list of streamformats [%4.4s]", (char *)&err);
free(p_format_list);
p_format_list = NULL;
return false;
/* Install the callback */
err = AudioObjectAddPropertyListener(i_stream_id, &physicalFormatAddress, StreamListener, (void *)&w);
if (err != noErr) {
- msg_Err(p_aout, "AudioObjectAddPropertyListener for kAudioStreamPropertyPhysicalFormat failed: [%4.4s]", (char *)&err);
+ msg_Err(p_aout, "AudioObjectAddPropertyListener for kAudioStreamPropertyPhysicalFormat failed [%4.4s]", (char *)&err);
return false;
}
err = AudioObjectSetPropertyData(i_stream_id, &physicalFormatAddress, 0, NULL, sizeof(AudioStreamBasicDescription),
&change_format);
if (err != noErr) {
- msg_Err(p_aout, "could not set the stream format: [%4.4s]", (char *)&err);
+ msg_Err(p_aout, "could not set the stream format [%4.4s]", (char *)&err);
return false;
}
/* Removing the property listener */
err = AudioObjectRemovePropertyListener(i_stream_id, &physicalFormatAddress, StreamListener, (void *)&w);
if (err != noErr) {
- msg_Err(p_aout, "AudioStreamRemovePropertyListener failed: [%4.4s]", (char *)&err);
+ msg_Err(p_aout, "AudioStreamRemovePropertyListener failed [%4.4s]", (char *)&err);
return false;
}