Skip to content

V
vlc-1.1
Commit 6471e0ed authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

auhal: updated to the latest API 

the newly used API was introduced in OS X 10.5, while we still tried to use an older one

note that optical audio output is completely untested
parent 925b2255
Hide whitespace changes
Inline Side-by-side
Showing with 193 additions and 228 deletions
modules/audio_output/auhal.c
View file @ 6471e0ed
/***************************************************************************** /*****************************************************************************
* auhal.c: AUHAL and Coreaudio output plugin * auhal.c: AUHAL and Coreaudio output plugin
***************************************************************************** *****************************************************************************
* Copyright (C) 2005 the VideoLAN team * Copyright (C) 2005, 2011 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Derk-Jan Hartman <hartman at videolan dot org> * Authors: Derk-Jan Hartman <hartman at videolan dot org>
* Felix Paul Kühne <fkuehne -at- videolan dot org>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
...@@ -35,33 +36,16 @@ ...@@ -35,33 +36,16 @@
#include <vlc_dialog.h> #include <vlc_dialog.h>
#include <vlc_aout.h> #include <vlc_aout.h>
// By pass part of header which compile with some warnings,
// and that we don't require.
#define __MACHINEEXCEPTIONS__
#include <CoreAudio/CoreAudio.h> #include <CoreAudio/CoreAudio.h>
#include <AudioUnit/AudioUnit.h> #include <AudioUnit/AudioUnit.h>
#include <AudioUnit/AudioUnitProperties.h>
#include <AudioUnit/AudioUnitParameters.h>
#include <AudioUnit/AudioOutputUnit.h>
#include <AudioToolbox/AudioFormat.h> #include <AudioToolbox/AudioFormat.h>
#include <CoreServices/CoreServices.h>
#ifndef verify_noerr #ifndef verify_noerr
#define verify_noerr(a) assert((a) == noErr) #define verify_noerr(a) assert((a) == noErr)
#endif #endif
#if AUDIO_UNIT_VERSION < 1060
#define AudioComponent Component
#define AudioComponentDescription ComponentDescription
#define AudioComponentFindNext FindNextComponent
#define AudioComponentInstanceNew OpenAComponent
#define AudioComponentInstanceDispose CloseComponent
#define AudioComponentInstanceNew OpenAComponent
#define AudioComponentInstanceNew OpenAComponent
#else
#include <AudioUnit/AudioComponent.h>
#endif
#define STREAM_FORMAT_MSG( pre, sfm ) \ #define STREAM_FORMAT_MSG( pre, sfm ) \
pre "[%u][%4.4s][%u][%u][%u][%u][%u][%u]", \ pre "[%u][%4.4s][%u][%u][%u][%u][%u][%u]", \
(UInt32)sfm.mSampleRate, (char *)&sfm.mFormatID, \ (UInt32)sfm.mSampleRate, (char *)&sfm.mFormatID, \
...@@ -83,7 +67,6 @@ ...@@ -83,7 +67,6 @@
/* /*
* TODO: * TODO:
* - clean up the debug info * - clean up the debug info
* - clean up C99'isms
* - be better at changing stream setup or devices setup changes while playing. * - be better at changing stream setup or devices setup changes while playing.
* - fix 6.1 and 7.1 * - fix 6.1 and 7.1
*/ */
...@@ -98,13 +81,14 @@ struct aout_sys_t ...@@ -98,13 +81,14 @@ struct aout_sys_t
{ {
AudioDeviceID i_default_dev; /* Keeps DeviceID of defaultOutputDevice */ AudioDeviceID i_default_dev; /* Keeps DeviceID of defaultOutputDevice */
AudioDeviceID i_selected_dev; /* Keeps DeviceID of the selected device */ AudioDeviceID i_selected_dev; /* Keeps DeviceID of the selected device */
AudioDeviceIOProcID i_procID; /* DeviceID of current device */
UInt32 i_devices; /* Number of CoreAudio Devices */ UInt32 i_devices; /* Number of CoreAudio Devices */
bool b_supports_digital;/* Does the currently selected device support digital mode? */ bool b_supports_digital;/* Does the currently selected device support digital mode? */
bool b_digital; /* Are we running in digital mode? */ bool b_digital; /* Are we running in digital mode? */
mtime_t clock_diff; /* Difference between VLC clock and Device clock */ mtime_t clock_diff; /* Difference between VLC clock and Device clock */
/* AUHAL specific */ /* AUHAL specific */
AudioComponent au_component; /* The Audiocomponent we use */ Component au_component; /* The Audiocomponent we use */
AudioUnit au_unit; /* The AudioUnit we use */ AudioUnit au_unit; /* The AudioUnit we use */
uint8_t p_remainder_buffer[BUFSIZE]; uint8_t p_remainder_buffer[BUFSIZE];
uint32_t i_read_bytes; uint32_t i_read_bytes;
...@@ -116,8 +100,8 @@ struct aout_sys_t ...@@ -116,8 +100,8 @@ struct aout_sys_t
int i_stream_index; /* The index of i_stream_id in an AudioBufferList */ int i_stream_index; /* The index of i_stream_id in an AudioBufferList */
AudioStreamBasicDescription stream_format; /* The format we changed the stream to */ AudioStreamBasicDescription stream_format; /* The format we changed the stream to */
AudioStreamBasicDescription sfmt_revert; /* The original format of the stream */ AudioStreamBasicDescription sfmt_revert; /* The original format of the stream */
bool b_revert; /* Wether we need to revert the stream format */ 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_changed_mixing;/* Wether we need to set the mixing mode back */
}; };
/***************************************************************************** /*****************************************************************************
...@@ -140,9 +124,8 @@ static OSStatus RenderCallbackAnalog ( vlc_object_t *, AudioUnitRenderActionF ...@@ -140,9 +124,8 @@ static OSStatus RenderCallbackAnalog ( vlc_object_t *, AudioUnitRenderActionF
unsigned int, unsigned int, AudioBufferList *); unsigned int, unsigned int, AudioBufferList *);
static OSStatus RenderCallbackSPDIF ( AudioDeviceID, const AudioTimeStamp *, const void *, const AudioTimeStamp *, static OSStatus RenderCallbackSPDIF ( AudioDeviceID, const AudioTimeStamp *, const void *, const AudioTimeStamp *,
AudioBufferList *, const AudioTimeStamp *, void * ); AudioBufferList *, const AudioTimeStamp *, void * );
static OSStatus HardwareListener ( AudioHardwarePropertyID, void *); static OSStatus HardwareListener ( AudioObjectID, UInt32, const AudioObjectPropertyAddress *, void * );
static OSStatus StreamListener ( AudioStreamID, UInt32, static OSStatus StreamListener ( AudioObjectID, UInt32, const AudioObjectPropertyAddress *, void * );
AudioDevicePropertyID, void * );
static int AudioDeviceCallback ( vlc_object_t *, const char *, static int AudioDeviceCallback ( vlc_object_t *, const char *,
vlc_value_t, vlc_value_t, void * ); vlc_value_t, vlc_value_t, void * );
...@@ -179,7 +162,7 @@ static int Open( vlc_object_t * p_this ) ...@@ -179,7 +162,7 @@ static int Open( vlc_object_t * p_this )
/* Use int here, to match kAudioDevicePropertyDeviceIsAlive /* Use int here, to match kAudioDevicePropertyDeviceIsAlive
* property size */ * property size */
int b_alive = false; int b_alive = false;
/* Allocate structure */ /* Allocate structure */
p_aout->output.p_sys = malloc( sizeof( aout_sys_t ) ); p_aout->output.p_sys = malloc( sizeof( aout_sys_t ) );
...@@ -205,9 +188,9 @@ static int Open( vlc_object_t * p_this ) ...@@ -205,9 +188,9 @@ static int Open( vlc_object_t * p_this )
memset( p_sys->p_remainder_buffer, 0, sizeof(uint8_t) * BUFSIZE ); memset( p_sys->p_remainder_buffer, 0, sizeof(uint8_t) * BUFSIZE );
p_aout->output.pf_play = Play; p_aout->output.pf_play = Play;
aout_FormatPrint( p_aout, "VLC is looking for:", (audio_sample_format_t *)&p_aout->output.output ); aout_FormatPrint( p_aout, "VLC is looking for:", (audio_sample_format_t *)&p_aout->output.output );
/* Persistent device variable */ /* Persistent device variable */
if( var_Type( p_aout->p_libvlc, "macosx-audio-device" ) == 0 ) if( var_Type( p_aout->p_libvlc, "macosx-audio-device" ) == 0 )
{ {
...@@ -229,13 +212,18 @@ static int Open( vlc_object_t * p_this ) ...@@ -229,13 +212,18 @@ static int Open( vlc_object_t * p_this )
p_sys->i_selected_dev = val.i_int & ~AOUT_VAR_SPDIF_FLAG; /* remove SPDIF flag to get the true DeviceID */ p_sys->i_selected_dev = val.i_int & ~AOUT_VAR_SPDIF_FLAG; /* remove SPDIF flag to get the true DeviceID */
p_sys->b_supports_digital = ( val.i_int & AOUT_VAR_SPDIF_FLAG ) ? true : false; p_sys->b_supports_digital = ( val.i_int & AOUT_VAR_SPDIF_FLAG ) ? true : false;
if( p_sys->b_supports_digital )
msg_Dbg( p_aout, "audio-device supports digital output" );
else
msg_Dbg( p_aout, "audio-device does not support digital output" );
/* Check if the desired device is alive and usable */ /* Check if the desired device is alive and usable */
/* TODO: add a callback to the device to alert us if the device dies */ /* TODO: add a callback to the device to alert us if the device dies */
i_param_size = sizeof( b_alive ); i_param_size = sizeof( b_alive );
err = AudioDeviceGetProperty( p_sys->i_selected_dev, 0, FALSE, AudioObjectPropertyAddress audioDeviceAliveAddress = { kAudioDevicePropertyDeviceIsAlive,
kAudioDevicePropertyDeviceIsAlive, kAudioDevicePropertyScopeOutput,
&i_param_size, &b_alive ); kAudioObjectPropertyElementMaster };
err = AudioObjectGetPropertyData( p_sys->i_selected_dev, &audioDeviceAliveAddress, 0, NULL, &i_param_size, &b_alive );
if( err != noErr ) if( err != noErr )
{ {
...@@ -244,17 +232,19 @@ static int Open( vlc_object_t * p_this ) ...@@ -244,17 +232,19 @@ static int Open( vlc_object_t * p_this )
b_alive = false; b_alive = false;
} }
if( b_alive == false ) 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" );
p_sys->i_selected_dev = p_sys->i_default_dev; p_sys->i_selected_dev = p_sys->i_default_dev;
} }
else
msg_Dbg( p_aout, "selected audio device is alive" );
AudioObjectPropertyAddress audioDeviceHogModeAddress = { kAudioDevicePropertyHogMode,
kAudioDevicePropertyScopeOutput,
kAudioObjectPropertyElementMaster };
i_param_size = sizeof( p_sys->i_hog_pid ); i_param_size = sizeof( p_sys->i_hog_pid );
err = AudioDeviceGetProperty( p_sys->i_selected_dev, 0, FALSE, err = AudioObjectGetPropertyData( p_sys->i_selected_dev, &audioDeviceHogModeAddress, 0, NULL, &i_param_size, &p_sys->i_hog_pid );
kAudioDevicePropertyHogMode,
&i_param_size, &p_sys->i_hog_pid );
if( err != noErr ) if( err != noErr )
{ {
/* This is not a fatal error. Some drivers simply don't support this property */ /* This is not a fatal error. Some drivers simply don't support this property */
...@@ -271,21 +261,30 @@ static int Open( vlc_object_t * p_this ) ...@@ -271,21 +261,30 @@ static int Open( vlc_object_t * p_this )
"use by another program.") ); "use by another program.") );
goto error; goto error;
} }
else
msg_Dbg( p_aout, "device is free for us to use" );
/* Check for Digital mode or Analog output mode */ /* Check for Digital mode or Analog output mode */
if( AOUT_FMT_NON_LINEAR( &p_aout->output.output ) && p_sys->b_supports_digital ) if( AOUT_FMT_NON_LINEAR( &p_aout->output.output ) && p_sys->b_supports_digital )
{ {
if( OpenSPDIF( p_aout ) ) if( OpenSPDIF( p_aout ) )
{
msg_Dbg( p_aout, "digital output successfully opened" );
return VLC_SUCCESS; return VLC_SUCCESS;
}
} }
else else
{ {
if( OpenAnalog( p_aout ) ) if( OpenAnalog( p_aout ) )
{
msg_Dbg( p_aout, "analog output successfully opened" );
return VLC_SUCCESS; return VLC_SUCCESS;
}
} }
error: error:
/* If we reach this, this aout has failed */ /* If we reach this, this aout has failed */
msg_Err( p_aout, "opening the auhal output failed" );
var_Destroy( p_aout, "audio-device" ); var_Destroy( p_aout, "audio-device" );
free( p_sys ); free( p_sys );
return VLC_EGENERIC; return VLC_EGENERIC;
...@@ -300,7 +299,7 @@ static int OpenAnalog( aout_instance_t *p_aout ) ...@@ -300,7 +299,7 @@ static int OpenAnalog( aout_instance_t *p_aout )
OSStatus err = noErr; OSStatus err = noErr;
UInt32 i_param_size = 0, i = 0; UInt32 i_param_size = 0, i = 0;
int i_original; int i_original;
AudioComponentDescription desc; ComponentDescription desc;
AudioStreamBasicDescription DeviceFormat; AudioStreamBasicDescription DeviceFormat;
AudioChannelLayout *layout; AudioChannelLayout *layout;
AudioChannelLayout new_layout; AudioChannelLayout new_layout;
...@@ -313,20 +312,20 @@ static int OpenAnalog( aout_instance_t *p_aout ) ...@@ -313,20 +312,20 @@ static int OpenAnalog( aout_instance_t *p_aout )
desc.componentFlags = 0; desc.componentFlags = 0;
desc.componentFlagsMask = 0; desc.componentFlagsMask = 0;
p_sys->au_component = AudioComponentFindNext( NULL, &desc ); p_sys->au_component = FindNextComponent( NULL, &desc );
if( p_sys->au_component == NULL ) if( p_sys->au_component == NULL )
{ {
msg_Warn( p_aout, "we cannot find our HAL component" ); msg_Warn( p_aout, "we cannot find our HAL component" );
return false; return false;
} }
err = AudioComponentInstanceNew( p_sys->au_component, &p_sys->au_unit ); err = OpenAComponent( p_sys->au_component, &p_sys->au_unit );
if( err != noErr ) if( err != noErr )
{ {
msg_Warn( p_aout, "we cannot open our HAL component" ); msg_Warn( p_aout, "we cannot open our HAL component" );
return false; return false;
} }
/* Set the device we will use for this output unit */ /* Set the device we will use for this output unit */
err = AudioUnitSetProperty( p_sys->au_unit, err = AudioUnitSetProperty( p_sys->au_unit,
kAudioOutputUnitProperty_CurrentDevice, kAudioOutputUnitProperty_CurrentDevice,
...@@ -334,13 +333,13 @@ static int OpenAnalog( aout_instance_t *p_aout ) ...@@ -334,13 +333,13 @@ static int OpenAnalog( aout_instance_t *p_aout )
0, 0,
&p_sys->i_selected_dev, &p_sys->i_selected_dev,
sizeof( AudioDeviceID )); sizeof( AudioDeviceID ));
if( err != noErr ) if( err != noErr )
{ {
msg_Warn( p_aout, "we cannot select the audio device" ); msg_Warn( p_aout, "we cannot select the audio device" );
return false; return false;
} }
/* Get the current format */ /* Get the current format */
i_param_size = sizeof(AudioStreamBasicDescription); i_param_size = sizeof(AudioStreamBasicDescription);
...@@ -350,7 +349,7 @@ static int OpenAnalog( aout_instance_t *p_aout ) ...@@ -350,7 +349,7 @@ static int OpenAnalog( aout_instance_t *p_aout )
0, 0,
&DeviceFormat, &DeviceFormat,
&i_param_size ); &i_param_size );
if( err != noErr ) return false; if( err != noErr ) return false;
else msg_Dbg( p_aout, STREAM_FORMAT_MSG( "current format is: ", DeviceFormat ) ); else msg_Dbg( p_aout, STREAM_FORMAT_MSG( "current format is: ", DeviceFormat ) );
...@@ -372,7 +371,7 @@ static int OpenAnalog( aout_instance_t *p_aout ) ...@@ -372,7 +371,7 @@ static int OpenAnalog( aout_instance_t *p_aout )
0, 0,
layout, layout,
&i_param_size )); &i_param_size ));
/* We need to "fill out" the ChannelLayout, because there are multiple ways that it can be set */ /* We need to "fill out" the ChannelLayout, because there are multiple ways that it can be set */
if( layout->mChannelLayoutTag == kAudioChannelLayoutTag_UseChannelBitmap) if( layout->mChannelLayoutTag == kAudioChannelLayoutTag_UseChannelBitmap)
{ {
...@@ -392,11 +391,11 @@ static int OpenAnalog( aout_instance_t *p_aout ) ...@@ -392,11 +391,11 @@ static int OpenAnalog( aout_instance_t *p_aout )
} }
msg_Dbg( p_aout, "layout of AUHAL has %d channels" , (int)layout->mNumberChannelDescriptions ); msg_Dbg( p_aout, "layout of AUHAL has %d channels" , (int)layout->mNumberChannelDescriptions );
/* Initialize the VLC core channel count */ /* Initialize the VLC core channel count */
p_aout->output.output.i_physical_channels = 0; p_aout->output.output.i_physical_channels = 0;
i_original = p_aout->output.output.i_original_channels & AOUT_CHAN_PHYSMASK; i_original = p_aout->output.output.i_original_channels & AOUT_CHAN_PHYSMASK;
if( i_original == AOUT_CHAN_CENTER || layout->mNumberChannelDescriptions < 2 ) if( i_original == AOUT_CHAN_CENTER || layout->mNumberChannelDescriptions < 2 )
{ {
/* We only need Mono or cannot output more than 1 channel */ /* We only need Mono or cannot output more than 1 channel */
...@@ -540,7 +539,7 @@ static int OpenAnalog( aout_instance_t *p_aout ) ...@@ -540,7 +539,7 @@ static int OpenAnalog( aout_instance_t *p_aout )
DeviceFormat.mFormatFlags = kAudioFormatFlagsNativeFloatPacked; DeviceFormat.mFormatFlags = kAudioFormatFlagsNativeFloatPacked;
DeviceFormat.mBitsPerChannel = 32; DeviceFormat.mBitsPerChannel = 32;
DeviceFormat.mChannelsPerFrame = aout_FormatNbChannels( &p_aout->output.output ); DeviceFormat.mChannelsPerFrame = aout_FormatNbChannels( &p_aout->output.output );
/* Calculate framesizes and stuff */ /* Calculate framesizes and stuff */
DeviceFormat.mFramesPerPacket = 1; DeviceFormat.mFramesPerPacket = 1;
DeviceFormat.mBytesPerFrame = DeviceFormat.mBitsPerChannel * DeviceFormat.mChannelsPerFrame / 8; DeviceFormat.mBytesPerFrame = DeviceFormat.mBitsPerChannel * DeviceFormat.mChannelsPerFrame / 8;
...@@ -554,9 +553,9 @@ static int OpenAnalog( aout_instance_t *p_aout ) ...@@ -554,9 +553,9 @@ static int OpenAnalog( aout_instance_t *p_aout )
0, 0,
&DeviceFormat, &DeviceFormat,
i_param_size )); i_param_size ));
msg_Dbg( p_aout, STREAM_FORMAT_MSG( "we set the AU format: " , DeviceFormat ) ); msg_Dbg( p_aout, STREAM_FORMAT_MSG( "we set the AU format: " , DeviceFormat ) );
/* Retrieve actual format */ /* Retrieve actual format */
verify_noerr( AudioUnitGetProperty( p_sys->au_unit, verify_noerr( AudioUnitGetProperty( p_sys->au_unit,
kAudioUnitProperty_StreamFormat, kAudioUnitProperty_StreamFormat,
...@@ -564,7 +563,7 @@ static int OpenAnalog( aout_instance_t *p_aout ) ...@@ -564,7 +563,7 @@ static int OpenAnalog( aout_instance_t *p_aout )
0, 0,
&DeviceFormat, &DeviceFormat,
&i_param_size )); &i_param_size ));
msg_Dbg( p_aout, STREAM_FORMAT_MSG( "the actual set AU format is " , DeviceFormat ) ); msg_Dbg( p_aout, STREAM_FORMAT_MSG( "the actual set AU format is " , DeviceFormat ) );
/* Do the last VLC aout setups */ /* Do the last VLC aout setups */
...@@ -575,7 +574,7 @@ static int OpenAnalog( aout_instance_t *p_aout ) ...@@ -575,7 +574,7 @@ static int OpenAnalog( aout_instance_t *p_aout )
/* set the IOproc callback */ /* set the IOproc callback */
input.inputProc = (AURenderCallback) RenderCallbackAnalog; input.inputProc = (AURenderCallback) RenderCallbackAnalog;
input.inputProcRefCon = p_aout; input.inputProcRefCon = p_aout;
verify_noerr( AudioUnitSetProperty( p_sys->au_unit, verify_noerr( AudioUnitSetProperty( p_sys->au_unit,
kAudioUnitProperty_SetRenderCallback, kAudioUnitProperty_SetRenderCallback,
kAudioUnitScope_Input, kAudioUnitScope_Input,
...@@ -583,16 +582,16 @@ static int OpenAnalog( aout_instance_t *p_aout ) ...@@ -583,16 +582,16 @@ static int OpenAnalog( aout_instance_t *p_aout )
input.inputProc = (AURenderCallback) RenderCallbackAnalog; input.inputProc = (AURenderCallback) RenderCallbackAnalog;
input.inputProcRefCon = p_aout; input.inputProcRefCon = p_aout;
/* Set the new_layout as the layout VLC will use to feed the AU unit */ /* Set the new_layout as the layout VLC will use to feed the AU unit */
verify_noerr( AudioUnitSetProperty( p_sys->au_unit, verify_noerr( AudioUnitSetProperty( p_sys->au_unit,
kAudioUnitProperty_AudioChannelLayout, kAudioUnitProperty_AudioChannelLayout,
kAudioUnitScope_Input, kAudioUnitScope_Input,
0, &new_layout, sizeof(new_layout) ) ); 0, &new_layout, sizeof(new_layout) ) );
if( new_layout.mNumberChannelDescriptions > 0 ) if( new_layout.mNumberChannelDescriptions > 0 )
free( new_layout.mChannelDescriptions ); free( new_layout.mChannelDescriptions );
/* AU initiliaze */ /* AU initiliaze */
verify_noerr( AudioUnitInitialize(p_sys->au_unit) ); verify_noerr( AudioUnitInitialize(p_sys->au_unit) );
...@@ -603,7 +602,7 @@ static int OpenAnalog( aout_instance_t *p_aout ) ...@@ -603,7 +602,7 @@ static int OpenAnalog( aout_instance_t *p_aout )
/* Start the AU */ /* Start the AU */
verify_noerr( AudioOutputUnitStart(p_sys->au_unit) ); verify_noerr( AudioOutputUnitStart(p_sys->au_unit) );
return true; return true;
} }
...@@ -623,12 +622,12 @@ static int OpenSPDIF( aout_instance_t * p_aout ) ...@@ -623,12 +622,12 @@ static int OpenSPDIF( aout_instance_t * p_aout )
p_sys->b_digital = true; p_sys->b_digital = true;
/* Hog the device */ /* Hog the device */
AudioObjectPropertyAddress audioDeviceHogModeAddress = { kAudioDevicePropertyHogMode, kAudioDevicePropertyScopeOutput, kAudioObjectPropertyElementMaster };
i_param_size = sizeof( p_sys->i_hog_pid ); i_param_size = sizeof( p_sys->i_hog_pid );
p_sys->i_hog_pid = getpid() ; p_sys->i_hog_pid = getpid() ;
err = AudioDeviceSetProperty( p_sys->i_selected_dev, 0, 0, FALSE, err = AudioObjectSetPropertyData( p_sys->i_selected_dev, &audioDeviceHogModeAddress, 0, NULL, i_param_size, &p_sys->i_hog_pid );
kAudioDevicePropertyHogMode, i_param_size, &p_sys->i_hog_pid );
if( err != noErr ) 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 );
...@@ -636,20 +635,18 @@ static int OpenSPDIF( aout_instance_t * p_aout ) ...@@ -636,20 +635,18 @@ static int OpenSPDIF( aout_instance_t * p_aout )
} }
/* Set mixable to false if we are allowed to */ /* Set mixable to false if we are allowed to */
err = AudioDeviceGetPropertyInfo( p_sys->i_selected_dev, 0, FALSE, kAudioDevicePropertySupportsMixing, AudioObjectPropertyAddress audioDeviceSupportsMixingAddress = { kAudioDevicePropertySupportsMixing , kAudioDevicePropertyScopeOutput, kAudioObjectPropertyElementMaster };
&i_param_size, &b_writeable ); b_writeable = AudioObjectHasProperty( p_sys->i_selected_dev, &audioDeviceSupportsMixingAddress );
err = AudioObjectGetPropertyDataSize( p_sys->i_selected_dev, &audioDeviceSupportsMixingAddress, 0, NULL, &i_param_size );
err = AudioObjectGetPropertyData( p_sys->i_selected_dev, &audioDeviceSupportsMixingAddress, 0, NULL, &i_param_size, &b_mix );
err = AudioDeviceGetProperty( p_sys->i_selected_dev, 0, FALSE, kAudioDevicePropertySupportsMixing,
&i_param_size, &b_mix );
if( !err && b_writeable ) if( !err && b_writeable )
{ {
b_mix = 0; b_mix = 0;
err = AudioDeviceSetProperty( p_sys->i_selected_dev, 0, 0, FALSE, err = AudioObjectSetPropertyData( p_sys->i_selected_dev, &audioDeviceSupportsMixingAddress, 0, NULL, i_param_size, &b_mix );
kAudioDevicePropertySupportsMixing, i_param_size, &b_mix );
p_sys->b_changed_mixing = true; p_sys->b_changed_mixing = true;
} }
if( err != noErr ) 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 );
...@@ -657,24 +654,21 @@ static int OpenSPDIF( aout_instance_t * p_aout ) ...@@ -657,24 +654,21 @@ static int OpenSPDIF( aout_instance_t * p_aout )
} }
/* Get a list of all the streams on this device */ /* Get a list of all the streams on this device */
err = AudioDeviceGetPropertyInfo( p_sys->i_selected_dev, 0, FALSE, AudioObjectPropertyAddress streamsAddress = { kAudioDevicePropertyStreams, kAudioDevicePropertyScopeOutput, kAudioObjectPropertyElementMaster };
kAudioDevicePropertyStreams, err = AudioObjectGetPropertyDataSize( p_sys->i_selected_dev, &streamsAddress, 0, NULL, &i_param_size );
&i_param_size, NULL );
if( err != noErr ) if( err != noErr )
{ {
msg_Err( p_aout, "could not get number of streams: [%4.4s]", (char *)&err ); msg_Err( p_aout, "could not get number of streams: [%4.4s]", (char *)&err );
return false; return false;
} }
i_streams = i_param_size / sizeof( AudioStreamID ); i_streams = i_param_size / sizeof( AudioStreamID );
p_streams = (AudioStreamID *)malloc( i_param_size ); p_streams = (AudioStreamID *)malloc( i_param_size );
if( p_streams == NULL ) if( p_streams == NULL )
return false; return false;
err = AudioDeviceGetProperty( p_sys->i_selected_dev, 0, FALSE, err = AudioObjectGetPropertyData( p_sys->i_selected_dev, &streamsAddress, 0, NULL, &i_param_size, p_streams );
kAudioDevicePropertyStreams,
&i_param_size, p_streams );
if( err != noErr ) if( err != noErr )
{ {
msg_Err( p_aout, "could not get number of streams: [%4.4s]", (char *)&err ); msg_Err( p_aout, "could not get number of streams: [%4.4s]", (char *)&err );
...@@ -682,31 +676,28 @@ static int OpenSPDIF( aout_instance_t * p_aout ) ...@@ -682,31 +676,28 @@ static int OpenSPDIF( aout_instance_t * p_aout )
return false; return false;
} }
AudioObjectPropertyAddress physicalFormatsAddress = { kAudioStreamPropertyPhysicalFormats, kAudioDevicePropertyScopeOutput, kAudioObjectPropertyElementMaster };
for( i = 0; i < i_streams && p_sys->i_stream_index < 0 ; i++ ) for( i = 0; i < i_streams && p_sys->i_stream_index < 0 ; i++ )
{ {
/* Find a stream with a cac3 stream */ /* Find a stream with a cac3 stream */
AudioStreamBasicDescription *p_format_list = NULL; AudioStreamBasicDescription *p_format_list = NULL;
int i_formats = 0, j = 0; int i_formats = 0, j = 0;
bool b_digital = false; bool b_digital = false;
/* Retrieve all the stream formats supported by each output stream */ /* Retrieve all the stream formats supported by each output stream */
err = AudioStreamGetPropertyInfo( p_streams[i], 0, err = AudioObjectGetPropertyDataSize( p_streams[i], &physicalFormatsAddress, 0, NULL, &i_param_size );
kAudioStreamPropertyPhysicalFormats,
&i_param_size, NULL );
if( err != noErr ) if( err != noErr )
{ {
msg_Err( p_aout, "could not get number of streamformats: [%4.4s]", (char *)&err ); msg_Err( p_aout, "OpenSPDIF: could not get number of streamformats: [%s] (%i)", (char *)&err, err );
continue; continue;
} }
i_formats = i_param_size / sizeof( AudioStreamBasicDescription ); i_formats = i_param_size / sizeof( AudioStreamBasicDescription );
p_format_list = (AudioStreamBasicDescription *)malloc( i_param_size ); p_format_list = (AudioStreamBasicDescription *)malloc( i_param_size );
if( p_format_list == NULL ) if( p_format_list == NULL )
continue; continue;
err = AudioStreamGetProperty( p_streams[i], 0, err = AudioObjectGetPropertyData( p_streams[i], &physicalFormatsAddress, 0, NULL, &i_param_size, p_format_list );
kAudioStreamPropertyPhysicalFormats,
&i_param_size, p_format_list );
if( err != noErr ) 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 );
...@@ -724,7 +715,7 @@ static int OpenSPDIF( aout_instance_t * p_aout ) ...@@ -724,7 +715,7 @@ static int OpenSPDIF( aout_instance_t * p_aout )
break; break;
} }
} }
if( b_digital ) if( b_digital )
{ {
/* if this stream supports a digital (cac3) format, then go set it. */ /* if this stream supports a digital (cac3) format, then go set it. */
...@@ -735,14 +726,11 @@ static int OpenSPDIF( aout_instance_t * p_aout ) ...@@ -735,14 +726,11 @@ static int OpenSPDIF( aout_instance_t * p_aout )
p_sys->i_stream_id = p_streams[i]; p_sys->i_stream_id = p_streams[i];
p_sys->i_stream_index = i; p_sys->i_stream_index = i;
if( p_sys->b_revert == false ) if( !p_sys->b_revert )
{ {
/* Retrieve the original format of this stream first if not done so already */ /* Retrieve the original format of this stream first if not done so already */
i_param_size = sizeof( p_sys->sfmt_revert ); i_param_size = sizeof( p_sys->sfmt_revert );
err = AudioStreamGetProperty( p_sys->i_stream_id, 0, err = AudioObjectGetPropertyData( p_sys->i_stream_id, &physicalFormatsAddress, 0, NULL, &i_param_size, &p_sys->sfmt_revert );
kAudioStreamPropertyPhysicalFormat,
&i_param_size,
&p_sys->sfmt_revert );
if( err != noErr ) 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 );
...@@ -771,9 +759,9 @@ static int OpenSPDIF( aout_instance_t * p_aout ) ...@@ -771,9 +759,9 @@ static int OpenSPDIF( aout_instance_t * p_aout )
i_backup_rate_format = j; i_backup_rate_format = j;
} }
} }
} }
if( i_requested_rate_format >= 0 ) /* We prefer to output at the samplerate of the original audio */ if( i_requested_rate_format >= 0 ) /* We prefer to output at the samplerate of the original audio */
p_sys->stream_format = p_format_list[i_requested_rate_format]; p_sys->stream_format = p_format_list[i_requested_rate_format];
else if( i_current_rate_format >= 0 ) /* If not possible, we will try to use the current samplerate of the device */ else if( i_current_rate_format >= 0 ) /* If not possible, we will try to use the current samplerate of the device */
...@@ -802,13 +790,13 @@ static int OpenSPDIF( aout_instance_t * p_aout ) ...@@ -802,13 +790,13 @@ static int OpenSPDIF( aout_instance_t * p_aout )
aout_VolumeNoneInit( p_aout ); aout_VolumeNoneInit( p_aout );
/* Add IOProc callback */ /* Add IOProc callback */
err = AudioDeviceAddIOProc( p_sys->i_selected_dev, err = AudioDeviceCreateIOProcID( p_sys->i_selected_dev,
(AudioDeviceIOProc)RenderCallbackSPDIF, (AudioDeviceIOProc)RenderCallbackSPDIF,
(void *)p_aout ); (void *)p_aout,
&p_sys->i_procID );
if( err != noErr ) if( err != noErr )
{ {
msg_Err( p_aout, "AudioDeviceAddIOProc failed: [%4.4s]", (char *)&err ); msg_Err( p_aout, "AudioDeviceCreateIOProcID failed: [%4.4s]", (char *)&err );
return false; return false;
} }
...@@ -816,18 +804,18 @@ static int OpenSPDIF( aout_instance_t * p_aout ) ...@@ -816,18 +804,18 @@ static int OpenSPDIF( aout_instance_t * p_aout )
p_sys->clock_diff = - (mtime_t) p_sys->clock_diff = - (mtime_t)
AudioConvertHostTimeToNanos( AudioGetCurrentHostTime() ) / 1000; AudioConvertHostTimeToNanos( AudioGetCurrentHostTime() ) / 1000;
p_sys->clock_diff += mdate(); p_sys->clock_diff += mdate();
/* Start device */ /* Start device */
err = AudioDeviceStart( p_sys->i_selected_dev, (AudioDeviceIOProc)RenderCallbackSPDIF ); err = AudioDeviceStart( p_sys->i_selected_dev, p_sys->i_procID );
if( err != noErr ) if( err != noErr )
{ {
msg_Err( p_aout, "AudioDeviceStart failed: [%4.4s]", (char *)&err ); msg_Err( p_aout, "AudioDeviceStart failed: [%4.4s]", (char *)&err );
err = AudioDeviceRemoveIOProc( p_sys->i_selected_dev, err = AudioDeviceDestroyIOProcID( p_sys->i_selected_dev,
(AudioDeviceIOProc)RenderCallbackSPDIF ); p_sys->i_procID );
if( err != noErr ) if( err != noErr )
{ {
msg_Err( p_aout, "AudioDeviceRemoveIOProc failed: [%4.4s]", (char *)&err ); msg_Err( p_aout, "AudioDeviceDestroyIOProcID failed: [%4.4s]", (char *)&err );
} }
return false; return false;
} }
...@@ -845,32 +833,32 @@ static void Close( vlc_object_t * p_this ) ...@@ -845,32 +833,32 @@ static void Close( vlc_object_t * p_this )
struct aout_sys_t *p_sys = p_aout->output.p_sys; struct aout_sys_t *p_sys = p_aout->output.p_sys;
OSStatus err = noErr; OSStatus err = noErr;
UInt32 i_param_size = 0; UInt32 i_param_size = 0;
if( p_sys->au_unit ) if( p_sys->au_unit )
{ {
verify_noerr( AudioOutputUnitStop( p_sys->au_unit ) ); verify_noerr( AudioOutputUnitStop( p_sys->au_unit ) );
verify_noerr( AudioUnitUninitialize( p_sys->au_unit ) ); verify_noerr( AudioUnitUninitialize( p_sys->au_unit ) );
verify_noerr( AudioComponentInstanceDispose( p_sys->au_unit ) ); verify_noerr( CloseComponent( p_sys->au_unit ) );
} }
if( p_sys->b_digital ) if( p_sys->b_digital )
{ {
/* Stop device */ /* Stop device */
err = AudioDeviceStop( p_sys->i_selected_dev, err = AudioDeviceStop( p_sys->i_selected_dev,
(AudioDeviceIOProc)RenderCallbackSPDIF ); p_sys->i_procID );
if( err != noErr ) if( err != noErr )
{ {
msg_Err( p_aout, "AudioDeviceStop failed: [%4.4s]", (char *)&err ); msg_Err( p_aout, "AudioDeviceStop failed: [%4.4s]", (char *)&err );
} }
/* Remove IOProc callback */ /* Remove IOProc callback */
err = AudioDeviceRemoveIOProc( p_sys->i_selected_dev, err = AudioDeviceDestroyIOProcID( p_sys->i_selected_dev,
(AudioDeviceIOProc)RenderCallbackSPDIF ); p_sys->i_procID );
if( err != noErr ) if( err != noErr )
{ {
msg_Err( p_aout, "AudioDeviceRemoveIOProc failed: [%4.4s]", (char *)&err ); msg_Err( p_aout, "AudioDeviceDestroyIOProcID failed: [%4.4s]", (char *)&err );
} }
if( p_sys->b_revert ) if( p_sys->b_revert )
{ {
AudioStreamChangeFormat( p_aout, p_sys->i_stream_id, p_sys->sfmt_revert ); AudioStreamChangeFormat( p_aout, p_sys->i_stream_id, p_sys->sfmt_revert );
...@@ -881,18 +869,15 @@ static void Close( vlc_object_t * p_this ) ...@@ -881,18 +869,15 @@ static void Close( vlc_object_t * p_this )
int b_mix; int b_mix;
Boolean b_writeable; Boolean b_writeable;
/* Revert mixable to true if we are allowed to */ /* Revert mixable to true if we are allowed to */
err = AudioDeviceGetPropertyInfo( p_sys->i_selected_dev, 0, FALSE, kAudioDevicePropertySupportsMixing, AudioObjectPropertyAddress audioDeviceSupportsMixingAddress = { kAudioDevicePropertySupportsMixing , kAudioDevicePropertyScopeOutput, kAudioObjectPropertyElementMaster };
&i_param_size, &b_writeable ); b_writeable = AudioObjectHasProperty( p_sys->i_selected_dev, &audioDeviceSupportsMixingAddress );
err = AudioObjectGetPropertyData( p_sys->i_selected_dev, &audioDeviceSupportsMixingAddress, 0, NULL, &i_param_size, &b_mix );
err = AudioDeviceGetProperty( p_sys->i_selected_dev, 0, FALSE, kAudioDevicePropertySupportsMixing,
&i_param_size, &b_mix );
if( !err && b_writeable ) if( !err && b_writeable )
{ {
msg_Dbg( p_aout, "mixable is: %d", b_mix ); msg_Dbg( p_aout, "mixable is: %d", b_mix );
b_mix = 1; b_mix = 1;
err = AudioDeviceSetProperty( p_sys->i_selected_dev, 0, 0, FALSE, err = AudioObjectSetPropertyData( p_sys->i_selected_dev, &audioDeviceSupportsMixingAddress, 0, NULL, i_param_size, &b_mix );
kAudioDevicePropertySupportsMixing, i_param_size, &b_mix );
} }
if( err != noErr ) if( err != noErr )
...@@ -902,23 +887,25 @@ static void Close( vlc_object_t * p_this ) ...@@ -902,23 +887,25 @@ static void Close( vlc_object_t * p_this )
} }
} }
err = AudioHardwareRemovePropertyListener( kAudioHardwarePropertyDevices, AudioObjectPropertyAddress audioDevicesAddress = { kAudioHardwarePropertyDevices, kAudioDevicePropertyScopeOutput, kAudioObjectPropertyElementMaster };
HardwareListener ); err = AudioObjectRemovePropertyListener( kAudioObjectSystemObject, &audioDevicesAddress, HardwareListener, NULL );
if( err != noErr ) if( err != noErr )
{ {
msg_Err( p_aout, "AudioHardwareRemovePropertyListener failed: [%4.4s]", (char *)&err ); msg_Err( p_aout, "AudioHardwareRemovePropertyListener failed: [%4.4s]", (char *)&err );
} }
if( p_sys->i_hog_pid == getpid() ) if( p_sys->i_hog_pid == getpid() )
{ {
p_sys->i_hog_pid = -1; p_sys->i_hog_pid = -1;
i_param_size = sizeof( p_sys->i_hog_pid ); i_param_size = sizeof( p_sys->i_hog_pid );
err = AudioDeviceSetProperty( p_sys->i_selected_dev, 0, 0, FALSE, AudioObjectPropertyAddress audioDeviceHogModeAddress = { kAudioDevicePropertyHogMode,
kAudioDevicePropertyHogMode, i_param_size, &p_sys->i_hog_pid ); kAudioDevicePropertyScopeOutput,
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 ); if( err != noErr ) msg_Err( p_aout, "Could not release hogmode: [%4.4s]", (char *)&err );
} }
free( p_sys ); free( p_sys );
} }
...@@ -945,11 +932,11 @@ static void Probe( aout_instance_t * p_aout ) ...@@ -945,11 +932,11 @@ static void Probe( aout_instance_t * p_aout )
struct aout_sys_t *p_sys = p_aout->output.p_sys; struct aout_sys_t *p_sys = p_aout->output.p_sys;
/* Get number of devices */ /* Get number of devices */
err = AudioHardwareGetPropertyInfo( kAudioHardwarePropertyDevices, AudioObjectPropertyAddress audioDevicesAddress = { kAudioHardwarePropertyDevices, kAudioDevicePropertyScopeOutput, kAudioObjectPropertyElementMaster };
&i_param_size, NULL ); err = AudioObjectGetPropertyDataSize(kAudioObjectSystemObject, &audioDevicesAddress, 0, NULL, &i_param_size);
if( err != noErr ) if( err != noErr )
{ {
msg_Err( p_aout, "Could not get number of devices: [%4.4s]", (char *)&err ); msg_Err( p_aout, "Could not get number of devices: [%s]", (char *)&err );
goto error; goto error;
} }
...@@ -969,47 +956,42 @@ static void Probe( aout_instance_t * p_aout ) ...@@ -969,47 +956,42 @@ static void Probe( aout_instance_t * p_aout )
goto error; goto error;
/* Populate DeviceID array */ /* Populate DeviceID array */
err = AudioHardwareGetProperty( kAudioHardwarePropertyDevices, err = AudioObjectGetPropertyData( kAudioObjectSystemObject, &audioDevicesAddress, 0, NULL, &i_param_size, p_devices );
&i_param_size, p_devices );
if( err != noErr ) 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: [%s]", (char *)&err );
goto error; goto error;
} }
/* Find the ID of the default Device */ /* Find the ID of the default Device */
AudioObjectPropertyAddress defaultDeviceAddress = { kAudioHardwarePropertyDefaultOutputDevice, kAudioDevicePropertyScopeOutput, kAudioObjectPropertyElementMaster };
i_param_size = sizeof( AudioDeviceID ); i_param_size = sizeof( AudioDeviceID );
err = AudioHardwareGetProperty( kAudioHardwarePropertyDefaultOutputDevice, err= AudioObjectGetPropertyData( kAudioObjectSystemObject, &defaultDeviceAddress, 0, NULL, &i_param_size, &devid_def );
&i_param_size, &devid_def );
if( err != noErr ) if( err != noErr )
{ {
msg_Err( p_aout, "could not get default audio device: [%4.4s]", (char *)&err ); msg_Err( p_aout, "could not get default audio device: [%s]", (char *)&err );
goto error; goto error;
} }
p_sys->i_default_dev = devid_def; p_sys->i_default_dev = devid_def;
var_Create( p_aout, "audio-device", VLC_VAR_INTEGER|VLC_VAR_HASCHOICE ); var_Create( p_aout, "audio-device", VLC_VAR_INTEGER|VLC_VAR_HASCHOICE );
text.psz_string = (char*)_("Audio Device"); text.psz_string = (char*)_("Audio Device");
var_Change( p_aout, "audio-device", VLC_VAR_SETTEXT, &text, NULL ); var_Change( p_aout, "audio-device", VLC_VAR_SETTEXT, &text, NULL );
AudioObjectPropertyAddress deviceNameAddress = { kAudioDevicePropertyDeviceName, kAudioDevicePropertyScopeOutput, kAudioObjectPropertyElementMaster };
for( i = 0; i < p_sys->i_devices; i++ ) for( i = 0; i < p_sys->i_devices; i++ )
{ {
char *psz_name; char *psz_name;
i_param_size = 0; i_param_size = 0;
/* Retrieve the length of the device name */ /* Retrieve the length of the device name */
err = AudioDeviceGetPropertyInfo( err = AudioObjectGetPropertyDataSize( p_devices[i], &deviceNameAddress, 0, NULL, &i_param_size );
p_devices[i], 0, false,
kAudioDevicePropertyDeviceName,
&i_param_size, NULL);
if( err ) goto error; if( err ) goto error;
/* Retrieve the name of the device */ /* Retrieve the name of the device */
psz_name = (char *)malloc( i_param_size ); psz_name = (char *)malloc( i_param_size );
err = AudioDeviceGetProperty( err = AudioObjectGetPropertyData( p_devices[i], &deviceNameAddress, 0, NULL, &i_param_size, psz_name );
p_devices[i], 0, false,
kAudioDevicePropertyDeviceName,
&i_param_size, psz_name);
if( err ) goto error; if( err ) goto error;
msg_Dbg( p_aout, "DevID: %u DevName: %s", p_devices[i], psz_name ); msg_Dbg( p_aout, "DevID: %u DevName: %s", p_devices[i], psz_name );
...@@ -1050,10 +1032,10 @@ static void Probe( aout_instance_t * p_aout ) ...@@ -1050,10 +1032,10 @@ static void Probe( aout_instance_t * p_aout )
} }
} }
} }
free( psz_name); free( psz_name);
} }
/* If a device is already "preselected", then use this device */ /* If a device is already "preselected", then use this device */
var_Get( p_aout->p_libvlc, "macosx-audio-device", &val ); var_Get( p_aout->p_libvlc, "macosx-audio-device", &val );
if( val.i_int > 0 ) if( val.i_int > 0 )
...@@ -1061,14 +1043,12 @@ static void Probe( aout_instance_t * p_aout ) ...@@ -1061,14 +1043,12 @@ static void Probe( aout_instance_t * p_aout )
var_Change( p_aout, "audio-device", VLC_VAR_SETDEFAULT, &val, NULL ); var_Change( p_aout, "audio-device", VLC_VAR_SETDEFAULT, &val, NULL );
var_Set( p_aout, "audio-device", val ); var_Set( p_aout, "audio-device", val );
} }
/* If we change the device we want to use, we should renegotiate the audio chain */ /* If we change the device we want to use, we should renegotiate the audio chain */
var_AddCallback( p_aout, "audio-device", AudioDeviceCallback, NULL ); var_AddCallback( p_aout, "audio-device", AudioDeviceCallback, NULL );
/* Attach a Listener so that we are notified of a change in the Device setup */ /* Attach a Listener so that we are notified of a change in the Device setup */
err = AudioHardwareAddPropertyListener( kAudioHardwarePropertyDevices, err = AudioObjectAddPropertyListener( kAudioObjectSystemObject, &audioDevicesAddress, HardwareListener, (void *)p_aout );
HardwareListener,
(void *)p_aout );
if( err ) if( err )
goto error; goto error;
...@@ -1087,11 +1067,11 @@ error: ...@@ -1087,11 +1067,11 @@ error:
static int AudioDeviceHasOutput( AudioDeviceID i_dev_id ) static int AudioDeviceHasOutput( AudioDeviceID i_dev_id )
{ {
UInt32 dataSize; UInt32 dataSize;
Boolean isWritable;
AudioObjectPropertyAddress streamsAddress = { kAudioDevicePropertyStreams, kAudioDevicePropertyScopeOutput, kAudioObjectPropertyElementMaster };
verify_noerr( AudioDeviceGetPropertyInfo( i_dev_id, 0, FALSE, kAudioDevicePropertyStreams, &dataSize, &isWritable) ); verify_noerr( AudioObjectGetPropertyDataSize( i_dev_id, &streamsAddress, 0, NULL, &dataSize ) );
if (dataSize == 0) return FALSE; if (dataSize == 0) return FALSE;
return TRUE; return TRUE;
} }
...@@ -1105,29 +1085,27 @@ static int AudioDeviceSupportsDigital( aout_instance_t *p_aout, AudioDeviceID i_ ...@@ -1105,29 +1085,27 @@ static int AudioDeviceSupportsDigital( aout_instance_t *p_aout, AudioDeviceID i_
AudioStreamID *p_streams = NULL; AudioStreamID *p_streams = NULL;
int i = 0, i_streams = 0; int i = 0, i_streams = 0;
bool b_return = false; bool b_return = false;
/* Retrieve all the output streams */ /* Retrieve all the output streams */
err = AudioDeviceGetPropertyInfo( i_dev_id, 0, FALSE, AudioObjectPropertyAddress streamsAddress = { kAudioDevicePropertyStreams, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
kAudioDevicePropertyStreams, err = AudioObjectGetPropertyDataSize( i_dev_id, &streamsAddress, 0, NULL, &i_param_size );
&i_param_size, NULL );
if( err != noErr ) if( err != noErr )
{ {
msg_Err( p_aout, "could not get number of streams: [%4.4s]", (char *)&err ); msg_Err( p_aout, "could not get number of streams: [%s] (%i)", (char *)&err, err );
return false; return false;
} }
i_streams = i_param_size / sizeof( AudioStreamID ); i_streams = i_param_size / sizeof( AudioStreamID );
p_streams = (AudioStreamID *)malloc( i_param_size ); p_streams = (AudioStreamID *)malloc( i_param_size );
if( p_streams == NULL ) if( p_streams == NULL )
return VLC_ENOMEM; return VLC_ENOMEM;
err = AudioDeviceGetProperty( i_dev_id, 0, FALSE, err = AudioObjectGetPropertyData( i_dev_id, &streamsAddress, 0, NULL, &i_param_size, p_streams );
kAudioDevicePropertyStreams,
&i_param_size, p_streams );
if( err != noErr ) if( err != noErr )
{ {
msg_Err( p_aout, "could not get number of streams: [%4.4s]", (char *)&err ); msg_Err( p_aout, "could not get list of streams: [%s]", (char *)&err );
return false; return false;
} }
...@@ -1136,7 +1114,7 @@ static int AudioDeviceSupportsDigital( aout_instance_t *p_aout, AudioDeviceID i_ ...@@ -1136,7 +1114,7 @@ static int AudioDeviceSupportsDigital( aout_instance_t *p_aout, AudioDeviceID i_
if( AudioStreamSupportsDigital( p_aout, p_streams[i] ) ) if( AudioStreamSupportsDigital( p_aout, p_streams[i] ) )
b_return = true; b_return = true;
} }
free( p_streams ); free( p_streams );
return b_return; return b_return;
} }
...@@ -1151,25 +1129,27 @@ static int AudioStreamSupportsDigital( aout_instance_t *p_aout, AudioStreamID i_ ...@@ -1151,25 +1129,27 @@ static int AudioStreamSupportsDigital( aout_instance_t *p_aout, AudioStreamID i_
AudioStreamBasicDescription *p_format_list = NULL; AudioStreamBasicDescription *p_format_list = NULL;
int i = 0, i_formats = 0; int i = 0, i_formats = 0;
bool b_return = false; bool b_return = false;
/* Retrieve all the stream formats supported by each output stream */ /* Retrieve all the stream formats supported by each output stream */
err = AudioStreamGetPropertyInfo( i_stream_id, 0, AudioObjectPropertyAddress physicalFormatsAddress = { kAudioStreamPropertyAvailablePhysicalFormats, kAudioDevicePropertyScopeOutput, kAudioObjectPropertyElementMaster };
kAudioStreamPropertyPhysicalFormats, err = AudioObjectGetPropertyDataSize( i_stream_id, &physicalFormatsAddress, 0, NULL, &i_param_size );
&i_param_size, NULL ); if( err == kAudioHardwareUnknownPropertyError )
if( err != noErr )
{ {
msg_Err( p_aout, "could not get number of streamformats: [%4.4s]", (char *)&err ); msg_Err( p_aout, "audio stream doesn't support query kAudioStreamPropertyAvailablePhysicalFormats" );
return false; return false;
} }
else if( err != noErr )
{
msg_Err( p_aout, "AudioStreamSupportsDigital: could not get number of streamformats: [%s] (%i)", (char *)&err, err );
return false;
}
i_formats = i_param_size / sizeof( AudioStreamBasicDescription ); i_formats = i_param_size / sizeof( AudioStreamBasicDescription );
p_format_list = (AudioStreamBasicDescription *)malloc( i_param_size ); p_format_list = (AudioStreamBasicDescription *)malloc( i_param_size );
if( p_format_list == NULL ) if( p_format_list == NULL )
return false; return false;
err = AudioStreamGetProperty( i_stream_id, 0, err = AudioObjectGetPropertyData( i_stream_id, &physicalFormatsAddress, 0, NULL, &i_param_size, p_format_list );
kAudioStreamPropertyPhysicalFormats,
&i_param_size, p_format_list );
if( err != noErr ) 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 );
...@@ -1181,14 +1161,14 @@ static int AudioStreamSupportsDigital( aout_instance_t *p_aout, AudioStreamID i_ ...@@ -1181,14 +1161,14 @@ static int AudioStreamSupportsDigital( aout_instance_t *p_aout, AudioStreamID i_
for( i = 0; i < i_formats; i++ ) for( i = 0; i < i_formats; i++ )
{ {
msg_Dbg( p_aout, STREAM_FORMAT_MSG( "supported format: ", p_format_list[i] ) ); msg_Dbg( p_aout, STREAM_FORMAT_MSG( "supported format: ", p_format_list[i] ) );
if( p_format_list[i].mFormatID == 'IAC3' || if( p_format_list[i].mFormatID == 'IAC3' ||
p_format_list[i].mFormatID == kAudioFormat60958AC3 ) p_format_list[i].mFormatID == kAudioFormat60958AC3 )
{ {
b_return = true; b_return = true;
} }
} }
free( p_format_list ); free( p_format_list );
return b_return; return b_return;
} }
...@@ -1201,9 +1181,11 @@ static int AudioStreamChangeFormat( aout_instance_t *p_aout, AudioStreamID i_str ...@@ -1201,9 +1181,11 @@ static int AudioStreamChangeFormat( aout_instance_t *p_aout, AudioStreamID i_str
OSStatus err = noErr; OSStatus err = noErr;
UInt32 i_param_size = 0; UInt32 i_param_size = 0;
int i; int i;
AudioObjectPropertyAddress physicalFormatAddress = { kAudioStreamPropertyPhysicalFormat, kAudioDevicePropertyScopeOutput, kAudioObjectPropertyElementMaster };
struct { vlc_mutex_t lock; vlc_cond_t cond; } w; struct { vlc_mutex_t lock; vlc_cond_t cond; } w;
msg_Dbg( p_aout, STREAM_FORMAT_MSG( "setting stream format: ", change_format ) ); msg_Dbg( p_aout, STREAM_FORMAT_MSG( "setting stream format: ", change_format ) );
/* Condition because SetProperty is asynchronious */ /* Condition because SetProperty is asynchronious */
...@@ -1212,20 +1194,16 @@ static int AudioStreamChangeFormat( aout_instance_t *p_aout, AudioStreamID i_str ...@@ -1212,20 +1194,16 @@ static int AudioStreamChangeFormat( aout_instance_t *p_aout, AudioStreamID i_str
vlc_mutex_lock( &w.lock ); vlc_mutex_lock( &w.lock );
/* Install the callback */ /* Install the callback */
err = AudioStreamAddPropertyListener( i_stream_id, 0, err = AudioObjectAddPropertyListener( i_stream_id, &physicalFormatAddress, StreamListener, (void *)&w );
kAudioStreamPropertyPhysicalFormat,
StreamListener, (void *)&w );
if( err != noErr ) if( err != noErr )
{ {
msg_Err( p_aout, "AudioStreamAddPropertyListener failed: [%4.4s]", (char *)&err ); msg_Err( p_aout, "AudioObjectAddPropertyListener for kAudioStreamPropertyPhysicalFormat failed: [%4.4s]", (char *)&err );
return false; return false;
} }
/* change the format */ /* change the format */
err = AudioStreamSetProperty( i_stream_id, 0, 0, err = AudioObjectSetPropertyData( i_stream_id, &physicalFormatAddress, 0, NULL, sizeof( AudioStreamBasicDescription ),
kAudioStreamPropertyPhysicalFormat, &change_format );
sizeof( AudioStreamBasicDescription ),
&change_format );
if( err != noErr ) 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 );
...@@ -1247,10 +1225,7 @@ static int AudioStreamChangeFormat( aout_instance_t *p_aout, AudioStreamID i_str ...@@ -1247,10 +1225,7 @@ static int AudioStreamChangeFormat( aout_instance_t *p_aout, AudioStreamID i_str
} }
i_param_size = sizeof( AudioStreamBasicDescription ); i_param_size = sizeof( AudioStreamBasicDescription );
err = AudioStreamGetProperty( i_stream_id, 0, err = AudioObjectGetPropertyData( i_stream_id, &physicalFormatAddress, 0, NULL, &i_param_size, &actual_format );
kAudioStreamPropertyPhysicalFormat,
&i_param_size,
&actual_format );
msg_Dbg( p_aout, STREAM_FORMAT_MSG( "actual format in use: ", actual_format ) ); msg_Dbg( p_aout, STREAM_FORMAT_MSG( "actual format in use: ", actual_format ) );
if( actual_format.mSampleRate == change_format.mSampleRate && if( actual_format.mSampleRate == change_format.mSampleRate &&
...@@ -1262,22 +1237,20 @@ static int AudioStreamChangeFormat( aout_instance_t *p_aout, AudioStreamID i_str ...@@ -1262,22 +1237,20 @@ static int AudioStreamChangeFormat( aout_instance_t *p_aout, AudioStreamID i_str
} }
/* We need to check again */ /* We need to check again */
} }
/* Removing the property listener */ /* Removing the property listener */
err = AudioStreamRemovePropertyListener( i_stream_id, 0, err = AudioObjectRemovePropertyListener( i_stream_id, &physicalFormatAddress, StreamListener, NULL );
kAudioStreamPropertyPhysicalFormat,
StreamListener );
if( err != noErr ) 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; return false;
} }
/* Destroy the lock and condition */ /* Destroy the lock and condition */
vlc_mutex_unlock( &w.lock ); vlc_mutex_unlock( &w.lock );
vlc_mutex_destroy( &w.lock ); vlc_mutex_destroy( &w.lock );
vlc_cond_destroy( &w.cond ); vlc_cond_destroy( &w.cond );
return true; return true;
} }
...@@ -1335,11 +1308,11 @@ static OSStatus RenderCallbackAnalog( vlc_object_t *_p_aout, ...@@ -1335,11 +1308,11 @@ static OSStatus RenderCallbackAnalog( vlc_object_t *_p_aout,
p_sys->i_read_bytes += i_mData_bytes; p_sys->i_read_bytes += i_mData_bytes;
current_date += (mtime_t) ( (mtime_t) 1000000 / p_aout->output.output.i_rate ) * current_date += (mtime_t) ( (mtime_t) 1000000 / p_aout->output.output.i_rate ) *
( i_mData_bytes / 4 / aout_FormatNbChannels( &p_aout->output.output ) ); // 4 is fl32 specific ( i_mData_bytes / 4 / aout_FormatNbChannels( &p_aout->output.output ) ); // 4 is fl32 specific
if( p_sys->i_read_bytes >= p_sys->i_total_bytes ) if( p_sys->i_read_bytes >= p_sys->i_total_bytes )
p_sys->i_read_bytes = p_sys->i_total_bytes = 0; p_sys->i_read_bytes = p_sys->i_total_bytes = 0;
} }
while( i_mData_bytes < ioData->mBuffers[0].mDataByteSize ) while( i_mData_bytes < ioData->mBuffers[0].mDataByteSize )
{ {
/* We don't have enough data yet */ /* We don't have enough data yet */
...@@ -1349,7 +1322,7 @@ static OSStatus RenderCallbackAnalog( vlc_object_t *_p_aout, ...@@ -1349,7 +1322,7 @@ static OSStatus RenderCallbackAnalog( vlc_object_t *_p_aout,
if( p_buffer != NULL ) if( p_buffer != NULL )
{ {
uint32_t i_second_mData_bytes = __MIN( p_buffer->i_buffer, ioData->mBuffers[0].mDataByteSize - i_mData_bytes ); uint32_t i_second_mData_bytes = __MIN( p_buffer->i_buffer, ioData->mBuffers[0].mDataByteSize - i_mData_bytes );
vlc_memcpy( (uint8_t *)ioData->mBuffers[0].mData + i_mData_bytes, vlc_memcpy( (uint8_t *)ioData->mBuffers[0].mData + i_mData_bytes,
p_buffer->p_buffer, i_second_mData_bytes ); p_buffer->p_buffer, i_second_mData_bytes );
i_mData_bytes += i_second_mData_bytes; i_mData_bytes += i_second_mData_bytes;
...@@ -1418,7 +1391,7 @@ static OSStatus RenderCallbackSPDIF( AudioDeviceID inDevice, ...@@ -1418,7 +1391,7 @@ static OSStatus RenderCallbackSPDIF( AudioDeviceID inDevice,
{ {
if( (int)BUFFER.mDataByteSize != (int)p_buffer->i_buffer) 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 ); msg_Warn( p_aout, "bytesize: %d nb_bytes: %d", (int)BUFFER.mDataByteSize, (int)p_buffer->i_buffer );
/* move data into output data buffer */ /* move data into output data buffer */
vlc_memcpy( BUFFER.mData, p_buffer->p_buffer, p_buffer->i_buffer ); vlc_memcpy( BUFFER.mData, p_buffer->p_buffer, p_buffer->i_buffer );
aout_BufferFree( p_buffer ); aout_BufferFree( p_buffer );
...@@ -1435,22 +1408,21 @@ static OSStatus RenderCallbackSPDIF( AudioDeviceID inDevice, ...@@ -1435,22 +1408,21 @@ static OSStatus RenderCallbackSPDIF( AudioDeviceID inDevice,
/***************************************************************************** /*****************************************************************************
* HardwareListener: Warns us of changes in the list of registered devices * HardwareListener: Warns us of changes in the list of registered devices
*****************************************************************************/ *****************************************************************************/
static OSStatus HardwareListener( AudioHardwarePropertyID inPropertyID, static OSStatus HardwareListener( AudioObjectID inObjectID, UInt32 inNumberAddresses, const AudioObjectPropertyAddress inAddresses[], void*inClientData)
void * inClientData )
{ {
OSStatus err = noErr; OSStatus err = noErr;
aout_instance_t *p_aout = (aout_instance_t *)inClientData; aout_instance_t *p_aout = (aout_instance_t *)inClientData;
VLC_UNUSED(inObjectID);
switch( inPropertyID ) for ( unsigned int i = 0; i < inNumberAddresses; i++ )
{ {
case kAudioHardwarePropertyDevices: if( inAddresses[i].mSelector == kAudioHardwarePropertyDevices )
{ {
/* something changed in the list of devices */ /* something changed in the list of devices */
/* We trigger the audio-device's aout_ChannelsRestart callback */ /* We trigger the audio-device's aout_ChannelsRestart callback */
var_TriggerCallback( p_aout, "audio-device" ); var_TriggerCallback( p_aout, "audio-device" );
var_Destroy( p_aout, "audio-device" ); var_Destroy( p_aout, "audio-device" );
} }
break;
} }
return( err ); return( err );
...@@ -1459,27 +1431,20 @@ static OSStatus HardwareListener( AudioHardwarePropertyID inPropertyID, ...@@ -1459,27 +1431,20 @@ static OSStatus HardwareListener( AudioHardwarePropertyID inPropertyID,
/***************************************************************************** /*****************************************************************************
* StreamListener * StreamListener
*****************************************************************************/ *****************************************************************************/
static OSStatus StreamListener( AudioStreamID inStream, static OSStatus StreamListener( AudioObjectID inObjectID, UInt32 inNumberAddresses, const AudioObjectPropertyAddress inAddresses[], void*inClientData)
UInt32 inChannel,
AudioDevicePropertyID inPropertyID,
void * inClientData )
{ {
OSStatus err = noErr; OSStatus err = noErr;
struct { vlc_mutex_t lock; vlc_cond_t cond; } * w = inClientData; struct { vlc_mutex_t lock; vlc_cond_t cond; } * w = inClientData;
VLC_UNUSED(inStream); VLC_UNUSED(inObjectID);
VLC_UNUSED(inChannel);
for ( unsigned int i = 0; i < inNumberAddresses; i++ )
switch( inPropertyID )
{ {
case kAudioStreamPropertyPhysicalFormat: if( inAddresses[i].mSelector == kAudioStreamPropertyPhysicalFormat )
{
vlc_mutex_lock( &w->lock ); vlc_mutex_lock( &w->lock );
vlc_cond_signal( &w->cond ); vlc_cond_signal( &w->cond );
vlc_mutex_unlock( &w->lock ); }
break;
default:
break;
} }
return( err ); return( err );
} }
...@@ -1492,7 +1457,7 @@ static int AudioDeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -1492,7 +1457,7 @@ static int AudioDeviceCallback( vlc_object_t *p_this, const char *psz_variable,
{ {
aout_instance_t *p_aout = (aout_instance_t *)p_this; aout_instance_t *p_aout = (aout_instance_t *)p_this;
var_Set( p_aout->p_libvlc, "macosx-audio-device", new_val ); var_Set( p_aout->p_libvlc, "macosx-audio-device", new_val );
msg_Dbg( p_aout, "Set Device: %#x", new_val.i_int ); msg_Dbg( p_aout, "Set Device: %i", new_val.i_int );
return aout_ChannelsRestart( p_this, psz_variable, old_val, new_val, param ); return aout_ChannelsRestart( p_this, psz_variable, old_val, new_val, param );
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment