X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_output%2Fauhal.c;h=15f25878de0db9e9d2c11d0b1acf7b8021aebfb3;hb=1de44b7c8ade27148d90aec2b095424a66b3e64d;hp=cb35ab95dd3b188a32f31c6736da48307accea9c;hpb=efacf7b59b10eace643aec90a54f10674e5c4712;p=vlc diff --git a/modules/audio_output/auhal.c b/modules/audio_output/auhal.c index cb35ab95dd..15f25878de 100644 --- a/modules/audio_output/auhal.c +++ b/modules/audio_output/auhal.c @@ -10,7 +10,7 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 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 @@ -18,42 +18,66 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include -#include -#include +#include +#include +#include +#include -#include "aout_internal.h" +// By pass part of header which compile with some warnings, +// and that we don't require. +#define __MACHINEEXCEPTIONS__ #include +#include #include #include #include #include +#ifndef verify_noerr +#define verify_noerr(a) assert((a) == noErr) +#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 +#endif + #define STREAM_FORMAT_MSG( pre, sfm ) \ - pre "[%ld][%4.4s][%ld][%ld][%ld][%ld][%ld][%ld]", \ + pre "[%u][%4.4s][%u][%u][%u][%u][%u][%u]", \ (UInt32)sfm.mSampleRate, (char *)&sfm.mFormatID, \ sfm.mFormatFlags, sfm.mBytesPerPacket, \ sfm.mFramesPerPacket, sfm.mBytesPerFrame, \ sfm.mChannelsPerFrame, sfm.mBitsPerChannel #define STREAM_FORMAT_MSG_FULL( pre, sfm ) \ - pre ":\nsamplerate: [%ld]\nFormatID: [%4.4s]\nFormatFlags: [%ld]\nBypesPerPacket: [%ld]\nFramesPerPacket: [%ld]\nBytesPerFrame: [%ld]\nChannelsPerFrame: [%ld]\nBitsPerChannel[%ld]", \ + pre ":\nsamplerate: [%u]\nFormatID: [%4.4s]\nFormatFlags: [%u]\nBypesPerPacket: [%u]\nFramesPerPacket: [%u]\nBytesPerFrame: [%u]\nChannelsPerFrame: [%u]\nBitsPerChannel[%u]", \ (UInt32)sfm.mSampleRate, (char *)&sfm.mFormatID, \ sfm.mFormatFlags, sfm.mBytesPerPacket, \ sfm.mFramesPerPacket, sfm.mBytesPerFrame, \ sfm.mChannelsPerFrame, sfm.mBitsPerChannel -#define BUFSIZE 0xffffff +#define FRAMESIZE 2048 +#define BUFSIZE (FRAMESIZE * 8) #define AOUT_VAR_SPDIF_FLAG 0xf00000 /* @@ -75,12 +99,12 @@ struct aout_sys_t AudioDeviceID i_default_dev; /* Keeps DeviceID of defaultOutputDevice */ AudioDeviceID i_selected_dev; /* Keeps DeviceID of the selected device */ UInt32 i_devices; /* Number of CoreAudio Devices */ - vlc_bool_t b_supports_digital;/* Does the currently selected device support digital mode? */ - vlc_bool_t b_digital; /* Are we running in digital mode? */ + bool b_supports_digital;/* Does the currently selected device support digital mode? */ + bool b_digital; /* Are we running in digital mode? */ mtime_t clock_diff; /* Difference between VLC clock and Device clock */ /* AUHAL specific */ - Component au_component; /* The Audiocomponent we use */ + AudioComponent au_component; /* The Audiocomponent we use */ AudioUnit au_unit; /* The AudioUnit we use */ uint8_t p_remainder_buffer[BUFSIZE]; uint32_t i_read_bytes; @@ -92,8 +116,8 @@ struct aout_sys_t 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 */ - vlc_bool_t b_revert; /* Wether we need to revert the stream format */ - vlc_bool_t b_changed_mixing;/* Wether we need to set the mixing mode back */ + bool b_revert; /* Wether we need to revert the stream format */ + bool b_changed_mixing;/* Wether we need to set the mixing mode back */ }; /***************************************************************************** @@ -123,6 +147,7 @@ static int AudioDeviceCallback ( vlc_object_t *, const char *, vlc_value_t, vlc_value_t, void * ); + /***************************************************************************** * Module descriptor *****************************************************************************/ @@ -131,15 +156,15 @@ static int AudioDeviceCallback ( vlc_object_t *, const char *, "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_description( _("HAL AudioUnit output") ); - set_capability( "audio output", 101 ); - set_category( CAT_AUDIO ); - set_subcategory( SUBCAT_AUDIO_AOUT ); - set_callbacks( Open, Close ); - add_integer( "macosx-audio-device", 0, NULL, ADEV_TEXT, ADEV_LONGTEXT, VLC_FALSE ); -vlc_module_end(); +vlc_module_begin () + set_shortname( "auhal" ) + set_description( N_("HAL AudioUnit output") ) + set_capability( "audio output", 101 ) + set_category( CAT_AUDIO ) + set_subcategory( SUBCAT_AUDIO_AOUT ) + set_callbacks( Open, Close ) + add_integer( "macosx-audio-device", 0, NULL, ADEV_TEXT, ADEV_LONGTEXT, false ) +vlc_module_end () /***************************************************************************** * Open: open macosx audio output @@ -149,24 +174,24 @@ static int Open( vlc_object_t * p_this ) OSStatus err = noErr; UInt32 i_param_size = 0; struct aout_sys_t *p_sys = NULL; - vlc_bool_t b_alive = VLC_FALSE; vlc_value_t val; aout_instance_t *p_aout = (aout_instance_t *)p_this; + /* Use int here, to match kAudioDevicePropertyDeviceIsAlive + * property size */ + int b_alive = false; + /* Allocate structure */ p_aout->output.p_sys = malloc( sizeof( aout_sys_t ) ); if( p_aout->output.p_sys == NULL ) - { - msg_Err( p_aout, "out of memory" ); - return( VLC_ENOMEM ); - } + return VLC_ENOMEM; p_sys = p_aout->output.p_sys; p_sys->i_default_dev = 0; p_sys->i_selected_dev = 0; p_sys->i_devices = 0; - p_sys->b_supports_digital = VLC_FALSE; - p_sys->b_digital = VLC_FALSE; + p_sys->b_supports_digital = false; + p_sys->b_digital = false; p_sys->au_component = NULL; p_sys->au_unit = NULL; p_sys->clock_diff = (mtime_t) 0; @@ -175,18 +200,18 @@ static int Open( vlc_object_t * p_this ) p_sys->i_hog_pid = -1; p_sys->i_stream_id = 0; p_sys->i_stream_index = -1; - p_sys->b_revert = VLC_FALSE; - p_sys->b_changed_mixing = VLC_FALSE; + p_sys->b_revert = false; + p_sys->b_changed_mixing = false; memset( p_sys->p_remainder_buffer, 0, sizeof(uint8_t) * BUFSIZE ); p_aout->output.pf_play = Play; - + aout_FormatPrint( p_aout, "VLC is looking for:", (audio_sample_format_t *)&p_aout->output.output ); - + /* Persistent device variable */ - if( var_Type( p_aout->p_vlc, "macosx-audio-device" ) == 0 ) + if( var_Type( p_aout->p_libvlc, "macosx-audio-device" ) == 0 ) { - var_Create( p_aout->p_vlc, "macosx-audio-device", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); + var_Create( p_aout->p_libvlc, "macosx-audio-device", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); } /* Build a list of devices */ @@ -203,7 +228,7 @@ 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->b_supports_digital = ( val.i_int & AOUT_VAR_SPDIF_FLAG ) ? VLC_TRUE : VLC_FALSE; + p_sys->b_supports_digital = ( val.i_int & AOUT_VAR_SPDIF_FLAG ) ? true : false; /* Check if the desired device is alive and usable */ /* TODO: add a callback to the device to alert us if the device dies */ @@ -214,13 +239,14 @@ static int Open( vlc_object_t * p_this ) if( err != noErr ) { - msg_Err( p_aout, "could not check whether device is alive: %4.4s", (char *)&err ); - goto error; + /* Be tolerant, only give a warning here */ + msg_Warn( p_aout, "could not check whether device [0x%x] is alive: %4.4s", (unsigned int)p_sys->i_selected_dev, (char *)&err ); + b_alive = false; } - if( b_alive == VLC_FALSE ) + if( b_alive == false ) { - 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; } @@ -231,14 +257,18 @@ static int Open( vlc_object_t * p_this ) 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", (char *)&err ); - goto error; + p_sys->i_hog_pid = -1; } if( p_sys->i_hog_pid != -1 && p_sys->i_hog_pid != getpid() ) { msg_Err( p_aout, "Selected audio device is exclusively in use by another program." ); + dialog_Fatal( p_aout, _("Audio output failed"), "%s", + _("The selected audio output device is exclusively in " + "use by another program.") ); goto error; } @@ -257,7 +287,7 @@ static int Open( vlc_object_t * p_this ) error: /* If we reach this, this aout has failed */ var_Destroy( p_aout, "audio-device" ); - if( p_sys ) free( p_sys ); + free( p_sys ); return VLC_EGENERIC; } @@ -269,8 +299,8 @@ static int OpenAnalog( aout_instance_t *p_aout ) struct aout_sys_t *p_sys = p_aout->output.p_sys; OSStatus err = noErr; UInt32 i_param_size = 0, i = 0; - int i_original; - ComponentDescription desc; + int i_original; + AudioComponentDescription desc; AudioStreamBasicDescription DeviceFormat; AudioChannelLayout *layout; AudioChannelLayout new_layout; @@ -283,138 +313,157 @@ static int OpenAnalog( aout_instance_t *p_aout ) 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 VLC_FALSE; + return false; } - err = OpenAComponent( p_sys->au_component, &p_sys->au_unit ); - if( err ) + err = AudioComponentInstanceNew( p_sys->au_component, &p_sys->au_unit ); + if( err != noErr ) { msg_Warn( p_aout, "we cannot open our HAL component" ); - return VLC_FALSE; + return false; } - + /* Set the device we will use for this output unit */ - verify_noerr( AudioUnitSetProperty( p_sys->au_unit, + err = AudioUnitSetProperty( p_sys->au_unit, kAudioOutputUnitProperty_CurrentDevice, kAudioUnitScope_Global, 0, &p_sys->i_selected_dev, - sizeof( AudioDeviceID ))); - + sizeof( AudioDeviceID )); + + if( err != noErr ) + { + msg_Warn( p_aout, "we cannot select the audio device" ); + return false; + } + /* Get the current format */ i_param_size = sizeof(AudioStreamBasicDescription); - verify_noerr( AudioUnitGetProperty( p_sys->au_unit, + err = AudioUnitGetProperty( p_sys->au_unit, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Input, 0, &DeviceFormat, - &i_param_size )); - - msg_Dbg( p_aout, STREAM_FORMAT_MSG( "current format is: ", DeviceFormat ) ); + &i_param_size ); + + if( err != noErr ) return false; + 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) */ - verify_noerr( AudioUnitGetPropertyInfo( p_sys->au_unit, + err = AudioUnitGetPropertyInfo( p_sys->au_unit, kAudioDevicePropertyPreferredChannelLayout, kAudioUnitScope_Output, 0, &i_param_size, - NULL )); - - layout = (AudioChannelLayout *)malloc( i_param_size); + NULL ); - verify_noerr( AudioUnitGetProperty( p_sys->au_unit, - kAudioDevicePropertyPreferredChannelLayout, - kAudioUnitScope_Output, - 0, - layout, - &i_param_size )); - - /* We need to "fill out" the ChannelLayout, because there are multiple ways that it can be set */ - if( layout->mChannelLayoutTag == kAudioChannelLayoutTag_UseChannelBitmap) - { - /* bitmap defined channellayout */ - verify_noerr( AudioFormatGetProperty( kAudioFormatProperty_ChannelLayoutForBitmap, - sizeof( UInt32), &layout->mChannelBitmap, - &i_param_size, - layout )); - } - else if( layout->mChannelLayoutTag != kAudioChannelLayoutTag_UseChannelDescriptions ) + if( err == noErr ) { - /* layouttags defined channellayout */ - verify_noerr( AudioFormatGetProperty( kAudioFormatProperty_ChannelLayoutForTag, - sizeof( AudioChannelLayoutTag ), &layout->mChannelLayoutTag, - &i_param_size, - layout )); - } + layout = (AudioChannelLayout *)malloc( i_param_size); + + verify_noerr( AudioUnitGetProperty( p_sys->au_unit, + kAudioDevicePropertyPreferredChannelLayout, + kAudioUnitScope_Output, + 0, + layout, + &i_param_size )); + + /* We need to "fill out" the ChannelLayout, because there are multiple ways that it can be set */ + if( layout->mChannelLayoutTag == kAudioChannelLayoutTag_UseChannelBitmap) + { + /* bitmap defined channellayout */ + verify_noerr( AudioFormatGetProperty( kAudioFormatProperty_ChannelLayoutForBitmap, + sizeof( UInt32), &layout->mChannelBitmap, + &i_param_size, + layout )); + } + else if( layout->mChannelLayoutTag != kAudioChannelLayoutTag_UseChannelDescriptions ) + { + /* layouttags defined channellayout */ + verify_noerr( AudioFormatGetProperty( kAudioFormatProperty_ChannelLayoutForTag, + sizeof( AudioChannelLayoutTag ), &layout->mChannelLayoutTag, + &i_param_size, + layout )); + } - msg_Dbg( p_aout, "layout of AUHAL has %d channels" , (int)layout->mNumberChannelDescriptions ); - - /* Initialize the VLC core channel count */ - p_aout->output.output.i_physical_channels = 0; - i_original = p_aout->output.output.i_original_channels & AOUT_CHAN_PHYSMASK; - - if( i_original == AOUT_CHAN_CENTER || layout->mNumberChannelDescriptions < 2 ) - { - /* We only need Mono or cannot output more than 1 channel */ - p_aout->output.output.i_physical_channels = AOUT_CHAN_CENTER; - } - else if( i_original == (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT) || layout->mNumberChannelDescriptions < 3 ) - { - /* We only need Stereo or cannot output more than 2 channels */ - p_aout->output.output.i_physical_channels = AOUT_CHAN_RIGHT | AOUT_CHAN_LEFT; - } - else - { - /* We want more than stereo and we can do that */ - for( i = 0; i < layout->mNumberChannelDescriptions; i++ ) + msg_Dbg( p_aout, "layout of AUHAL has %d channels" , (int)layout->mNumberChannelDescriptions ); + + /* Initialize the VLC core channel count */ + p_aout->output.output.i_physical_channels = 0; + i_original = p_aout->output.output.i_original_channels & AOUT_CHAN_PHYSMASK; + + if( i_original == AOUT_CHAN_CENTER || layout->mNumberChannelDescriptions < 2 ) + { + /* We only need Mono or cannot output more than 1 channel */ + p_aout->output.output.i_physical_channels = AOUT_CHAN_CENTER; + } + else if( i_original == (AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT) || layout->mNumberChannelDescriptions < 3 ) { - msg_Dbg( p_aout, "this is channel: %d", (int)layout->mChannelDescriptions[i].mChannelLabel ); + /* We only need Stereo or cannot output more than 2 channels */ + p_aout->output.output.i_physical_channels = AOUT_CHAN_RIGHT | AOUT_CHAN_LEFT; + } + else + { + /* We want more than stereo and we can do that */ + for( i = 0; i < layout->mNumberChannelDescriptions; i++ ) + { + msg_Dbg( p_aout, "this is channel: %d", (int)layout->mChannelDescriptions[i].mChannelLabel ); - switch( layout->mChannelDescriptions[i].mChannelLabel ) + switch( layout->mChannelDescriptions[i].mChannelLabel ) + { + case kAudioChannelLabel_Left: + p_aout->output.output.i_physical_channels |= AOUT_CHAN_LEFT; + continue; + case kAudioChannelLabel_Right: + p_aout->output.output.i_physical_channels |= AOUT_CHAN_RIGHT; + continue; + case kAudioChannelLabel_Center: + p_aout->output.output.i_physical_channels |= AOUT_CHAN_CENTER; + continue; + case kAudioChannelLabel_LFEScreen: + p_aout->output.output.i_physical_channels |= AOUT_CHAN_LFE; + continue; + case kAudioChannelLabel_LeftSurround: + p_aout->output.output.i_physical_channels |= AOUT_CHAN_REARLEFT; + continue; + case kAudioChannelLabel_RightSurround: + p_aout->output.output.i_physical_channels |= AOUT_CHAN_REARRIGHT; + continue; + case kAudioChannelLabel_RearSurroundLeft: + p_aout->output.output.i_physical_channels |= AOUT_CHAN_MIDDLELEFT; + continue; + case kAudioChannelLabel_RearSurroundRight: + p_aout->output.output.i_physical_channels |= AOUT_CHAN_MIDDLERIGHT; + continue; + case kAudioChannelLabel_CenterSurround: + p_aout->output.output.i_physical_channels |= AOUT_CHAN_REARCENTER; + continue; + default: + msg_Warn( p_aout, "unrecognized channel form provided by driver: %d", (int)layout->mChannelDescriptions[i].mChannelLabel ); + } + } + if( p_aout->output.output.i_physical_channels == 0 ) { - case kAudioChannelLabel_Left: - p_aout->output.output.i_physical_channels |= AOUT_CHAN_LEFT; - continue; - case kAudioChannelLabel_Right: - p_aout->output.output.i_physical_channels |= AOUT_CHAN_RIGHT; - continue; - case kAudioChannelLabel_Center: - p_aout->output.output.i_physical_channels |= AOUT_CHAN_CENTER; - continue; - case kAudioChannelLabel_LFEScreen: - p_aout->output.output.i_physical_channels |= AOUT_CHAN_LFE; - continue; - case kAudioChannelLabel_LeftSurround: - p_aout->output.output.i_physical_channels |= AOUT_CHAN_REARLEFT; - continue; - case kAudioChannelLabel_RightSurround: - p_aout->output.output.i_physical_channels |= AOUT_CHAN_REARRIGHT; - continue; - case kAudioChannelLabel_RearSurroundLeft: - p_aout->output.output.i_physical_channels |= AOUT_CHAN_MIDDLELEFT; - continue; - case kAudioChannelLabel_RearSurroundRight: - p_aout->output.output.i_physical_channels |= AOUT_CHAN_MIDDLERIGHT; - continue; - case kAudioChannelLabel_CenterSurround: - p_aout->output.output.i_physical_channels |= AOUT_CHAN_REARCENTER; - continue; - default: - msg_Warn( p_aout, "Unrecognized channel form provided by driver: %d", (int)layout->mChannelDescriptions[i].mChannelLabel ); + p_aout->output.output.i_physical_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT; + msg_Err( p_aout, "You should configure your speaker layout with Audio Midi Setup Utility in /Applications/Utilities. Now using Stereo mode." ); + 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.") ); } } - if( p_aout->output.output.i_physical_channels == 0 ) - { - p_aout->output.output.i_physical_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT; - msg_Err( p_aout, "You should configure your speaker layout with Audio Midi Setup Utility in /Applications/Utilities. Now using Stereo mode." ); - } + free( layout ); + } + else + { + msg_Warn( p_aout, "this driver does not support kAudioDevicePropertyPreferredChannelLayout. BAD DRIVER AUTHOR !!!" ); + p_aout->output.output.i_physical_channels = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT; } - if( layout ) free( layout ); msg_Dbg( p_aout, "selected %d physical channels for device output", aout_FormatNbChannels( &p_aout->output.output ) ); msg_Dbg( p_aout, "VLC will output: %s", aout_FormatPrintChannels( &p_aout->output.output )); @@ -487,16 +536,16 @@ static int OpenAnalog( aout_instance_t *p_aout ) DeviceFormat.mFormatID = kAudioFormatLinearPCM; /* We use float 32. It's the best supported format by both VLC and Coreaudio */ - p_aout->output.output.i_format = VLC_FOURCC( 'f','l','3','2'); + p_aout->output.output.i_format = VLC_CODEC_FL32; DeviceFormat.mFormatFlags = kAudioFormatFlagsNativeFloatPacked; DeviceFormat.mBitsPerChannel = 32; DeviceFormat.mChannelsPerFrame = aout_FormatNbChannels( &p_aout->output.output ); - + /* Calculate framesizes and stuff */ DeviceFormat.mFramesPerPacket = 1; DeviceFormat.mBytesPerFrame = DeviceFormat.mBitsPerChannel * DeviceFormat.mChannelsPerFrame / 8; DeviceFormat.mBytesPerPacket = DeviceFormat.mBytesPerFrame * DeviceFormat.mFramesPerPacket; - + /* Set the desired format */ i_param_size = sizeof(AudioStreamBasicDescription); verify_noerr( AudioUnitSetProperty( p_sys->au_unit, @@ -505,9 +554,9 @@ static int OpenAnalog( aout_instance_t *p_aout ) 0, &DeviceFormat, i_param_size )); - + msg_Dbg( p_aout, STREAM_FORMAT_MSG( "we set the AU format: " , DeviceFormat ) ); - + /* Retrieve actual format */ verify_noerr( AudioUnitGetProperty( p_sys->au_unit, kAudioUnitProperty_StreamFormat, @@ -515,18 +564,18 @@ static int OpenAnalog( aout_instance_t *p_aout ) 0, &DeviceFormat, &i_param_size )); - + msg_Dbg( p_aout, STREAM_FORMAT_MSG( "the actual set AU format is " , DeviceFormat ) ); /* Do the last VLC aout setups */ aout_FormatPrepare( &p_aout->output.output ); - p_aout->output.i_nb_samples = 2048; + p_aout->output.i_nb_samples = FRAMESIZE; aout_VolumeSoftInit( p_aout ); /* set the IOproc callback */ input.inputProc = (AURenderCallback) RenderCallbackAnalog; input.inputProcRefCon = p_aout; - + verify_noerr( AudioUnitSetProperty( p_sys->au_unit, kAudioUnitProperty_SetRenderCallback, kAudioUnitScope_Input, @@ -534,28 +583,28 @@ static int OpenAnalog( aout_instance_t *p_aout ) 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, 0, &new_layout, sizeof(new_layout) ) ); - + if( new_layout.mNumberChannelDescriptions > 0 ) free( new_layout.mChannelDescriptions ); - + /* AU initiliaze */ verify_noerr( AudioUnitInitialize(p_sys->au_unit) ); /* Find the difference between device clock and mdate clock */ p_sys->clock_diff = - (mtime_t) - AudioConvertHostTimeToNanos( AudioGetCurrentHostTime() ) / 1000; + AudioConvertHostTimeToNanos( AudioGetCurrentHostTime() ) / 1000; p_sys->clock_diff += mdate(); /* Start the AU */ verify_noerr( AudioOutputUnitStart(p_sys->au_unit) ); - - return VLC_TRUE; + + return true; } /***************************************************************************** @@ -566,24 +615,24 @@ static int OpenSPDIF( aout_instance_t * p_aout ) struct aout_sys_t *p_sys = p_aout->output.p_sys; OSStatus err = noErr; UInt32 i_param_size = 0, b_mix = 0; - Boolean b_writeable = VLC_FALSE; + Boolean b_writeable = false; AudioStreamID *p_streams = NULL; int i = 0, i_streams = 0; /* Start doing the SPDIF setup proces */ - p_sys->b_digital = VLC_TRUE; + p_sys->b_digital = true; /* Hog the device */ i_param_size = sizeof( p_sys->i_hog_pid ); p_sys->i_hog_pid = getpid() ; - + err = AudioDeviceSetProperty( p_sys->i_selected_dev, 0, 0, FALSE, kAudioDevicePropertyHogMode, i_param_size, &p_sys->i_hog_pid ); - + if( err != noErr ) { msg_Err( p_aout, "failed to set hogmode: [%4.4s]", (char *)&err ); - return VLC_FALSE; + return false; } /* Set mixable to false if we are allowed to */ @@ -592,19 +641,19 @@ static int OpenSPDIF( aout_instance_t * p_aout ) err = AudioDeviceGetProperty( p_sys->i_selected_dev, 0, FALSE, kAudioDevicePropertySupportsMixing, &i_param_size, &b_mix ); - + if( !err && b_writeable ) { b_mix = 0; err = AudioDeviceSetProperty( p_sys->i_selected_dev, 0, 0, FALSE, kAudioDevicePropertySupportsMixing, i_param_size, &b_mix ); - p_sys->b_changed_mixing = VLC_TRUE; + p_sys->b_changed_mixing = true; } - + if( err != noErr ) { msg_Err( p_aout, "failed to set mixmode: [%4.4s]", (char *)&err ); - return VLC_FALSE; + return false; } /* Get a list of all the streams on this device */ @@ -614,26 +663,23 @@ static int OpenSPDIF( aout_instance_t * p_aout ) if( err != noErr ) { msg_Err( p_aout, "could not get number of streams: [%4.4s]", (char *)&err ); - return VLC_FALSE; + return false; } - + i_streams = i_param_size / sizeof( AudioStreamID ); p_streams = (AudioStreamID *)malloc( i_param_size ); if( p_streams == NULL ) - { - msg_Err( p_aout, "Out of memory" ); - return VLC_FALSE; - } - + return false; + err = AudioDeviceGetProperty( p_sys->i_selected_dev, 0, FALSE, kAudioDevicePropertyStreams, &i_param_size, p_streams ); - + if( err != noErr ) { msg_Err( p_aout, "could not get number of streams: [%4.4s]", (char *)&err ); - if( p_streams ) free( p_streams ); - return VLC_FALSE; + free( p_streams ); + return false; } for( i = 0; i < i_streams && p_sys->i_stream_index < 0 ; i++ ) @@ -641,8 +687,8 @@ static int OpenSPDIF( aout_instance_t * p_aout ) /* Find a stream with a cac3 stream */ AudioStreamBasicDescription *p_format_list = NULL; int i_formats = 0, j = 0; - vlc_bool_t b_digital = VLC_FALSE; - + bool b_digital = false; + /* Retrieve all the stream formats supported by each output stream */ err = AudioStreamGetPropertyInfo( p_streams[i], 0, kAudioStreamPropertyPhysicalFormats, @@ -652,22 +698,19 @@ static int OpenSPDIF( aout_instance_t * p_aout ) msg_Err( p_aout, "could not get number of streamformats: [%4.4s]", (char *)&err ); continue; } - + i_formats = i_param_size / sizeof( AudioStreamBasicDescription ); p_format_list = (AudioStreamBasicDescription *)malloc( i_param_size ); if( p_format_list == NULL ) - { - msg_Err( p_aout, "could not malloc the memory" ); continue; - } - + err = AudioStreamGetProperty( p_streams[i], 0, kAudioStreamPropertyPhysicalFormats, &i_param_size, p_format_list ); if( err != noErr ) { msg_Err( p_aout, "could not get the list of streamformats: [%4.4s]", (char *)&err ); - if( p_format_list) free( p_format_list); + free( p_format_list ); continue; } @@ -677,11 +720,11 @@ static int OpenSPDIF( aout_instance_t * p_aout ) if( p_format_list[j].mFormatID == 'IAC3' || p_format_list[j].mFormatID == kAudioFormat60958AC3 ) { - b_digital = VLC_TRUE; + b_digital = true; break; } } - + if( b_digital ) { /* if this stream supports a digital (cac3) format, then go set it. */ @@ -692,20 +735,20 @@ static int OpenSPDIF( aout_instance_t * p_aout ) p_sys->i_stream_id = p_streams[i]; p_sys->i_stream_index = i; - if( p_sys->b_revert == VLC_FALSE ) + if( p_sys->b_revert == false ) { /* Retrieve the original format of this stream first if not done so already */ i_param_size = sizeof( p_sys->sfmt_revert ); err = AudioStreamGetProperty( p_sys->i_stream_id, 0, kAudioStreamPropertyPhysicalFormat, - &i_param_size, + &i_param_size, &p_sys->sfmt_revert ); if( err != noErr ) { msg_Err( p_aout, "could not retrieve the original streamformat: [%4.4s]", (char *)&err ); - continue; + continue; } - p_sys->b_revert = VLC_TRUE; + p_sys->b_revert = true; } for( j = 0; j < i_formats; j++ ) @@ -728,29 +771,29 @@ static int OpenSPDIF( aout_instance_t * p_aout ) i_backup_rate_format = j; } } - + } - + 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]; else if( i_current_rate_format >= 0 ) /* If not possible, we will try to use the current samplerate of the device */ p_sys->stream_format = p_format_list[i_current_rate_format]; else p_sys->stream_format = p_format_list[i_backup_rate_format]; /* And if we have to, any digital format will be just fine (highest rate possible) */ } - if( p_format_list ) free( p_format_list ); + free( p_format_list ); } - if( p_streams ) free( p_streams ); + free( p_streams ); 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 ) ) - return VLC_FALSE; + return false; /* Set the format flags */ if( p_sys->stream_format.mFormatFlags & kAudioFormatFlagIsBigEndian ) - p_aout->output.output.i_format = VLC_FOURCC('s','p','d','b'); + p_aout->output.output.i_format = VLC_CODEC_SPDIFB; else - p_aout->output.output.i_format = VLC_FOURCC('s','p','d','i'); + p_aout->output.output.i_format = VLC_CODEC_SPDIFL; p_aout->output.output.i_bytes_per_frame = AOUT_SPDIF_SIZE; p_aout->output.output.i_frame_length = A52_FRAME_NB; p_aout->output.i_nb_samples = p_aout->output.output.i_frame_length; @@ -760,35 +803,36 @@ static int OpenSPDIF( aout_instance_t * p_aout ) /* Add IOProc callback */ err = AudioDeviceAddIOProc( p_sys->i_selected_dev, - (AudioDeviceIOProc)RenderCallbackSPDIF, - (void *)p_aout ); + (AudioDeviceIOProc)RenderCallbackSPDIF, + (void *)p_aout ); + if( err != noErr ) { msg_Err( p_aout, "AudioDeviceAddIOProc failed: [%4.4s]", (char *)&err ); - return VLC_FALSE; + return false; } /* Check for the difference between the Device clock and mdate */ p_sys->clock_diff = - (mtime_t) - AudioConvertHostTimeToNanos( AudioGetCurrentHostTime() ) / 1000; + AudioConvertHostTimeToNanos( AudioGetCurrentHostTime() ) / 1000; p_sys->clock_diff += mdate(); /* Start device */ - err = AudioDeviceStart( p_sys->i_selected_dev, (AudioDeviceIOProc)RenderCallbackSPDIF ); + err = AudioDeviceStart( p_sys->i_selected_dev, (AudioDeviceIOProc)RenderCallbackSPDIF ); if( err != noErr ) { msg_Err( p_aout, "AudioDeviceStart failed: [%4.4s]", (char *)&err ); - err = AudioDeviceRemoveIOProc( p_sys->i_selected_dev, - (AudioDeviceIOProc)RenderCallbackSPDIF ); + err = AudioDeviceRemoveIOProc( p_sys->i_selected_dev, + (AudioDeviceIOProc)RenderCallbackSPDIF ); if( err != noErr ) { msg_Err( p_aout, "AudioDeviceRemoveIOProc failed: [%4.4s]", (char *)&err ); } - return VLC_FALSE; + return false; } - return VLC_TRUE; + return true; } @@ -801,19 +845,19 @@ static void Close( vlc_object_t * p_this ) struct aout_sys_t *p_sys = p_aout->output.p_sys; OSStatus err = noErr; UInt32 i_param_size = 0; - + 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 ) { /* Stop device */ - err = AudioDeviceStop( p_sys->i_selected_dev, - (AudioDeviceIOProc)RenderCallbackSPDIF ); + err = AudioDeviceStop( p_sys->i_selected_dev, + (AudioDeviceIOProc)RenderCallbackSPDIF ); if( err != noErr ) { msg_Err( p_aout, "AudioDeviceStop failed: [%4.4s]", (char *)&err ); @@ -821,12 +865,12 @@ static void Close( vlc_object_t * p_this ) /* Remove IOProc callback */ err = AudioDeviceRemoveIOProc( p_sys->i_selected_dev, - (AudioDeviceIOProc)RenderCallbackSPDIF ); + (AudioDeviceIOProc)RenderCallbackSPDIF ); if( err != noErr ) { msg_Err( p_aout, "AudioDeviceRemoveIOProc failed: [%4.4s]", (char *)&err ); } - + if( p_sys->b_revert ) { AudioStreamChangeFormat( p_aout, p_sys->i_stream_id, p_sys->sfmt_revert ); @@ -842,7 +886,7 @@ static void Close( vlc_object_t * p_this ) err = AudioDeviceGetProperty( p_sys->i_selected_dev, 0, FALSE, kAudioDevicePropertySupportsMixing, &i_param_size, &b_mix ); - + if( !err && b_writeable ) { msg_Dbg( p_aout, "mixable is: %d", b_mix ); @@ -860,12 +904,12 @@ static void Close( vlc_object_t * p_this ) err = AudioHardwareRemovePropertyListener( kAudioHardwarePropertyDevices, HardwareListener ); - + if( err != noErr ) { msg_Err( p_aout, "AudioHardwareRemovePropertyListener failed: [%4.4s]", (char *)&err ); } - + if( p_sys->i_hog_pid == getpid() ) { p_sys->i_hog_pid = -1; @@ -874,8 +918,8 @@ static void Close( vlc_object_t * p_this ) kAudioDevicePropertyHogMode, i_param_size, &p_sys->i_hog_pid ); if( err != noErr ) msg_Err( p_aout, "Could not release hogmode: [%4.4s]", (char *)&err ); } - - if( p_sys ) free( p_sys ); + + free( p_sys ); } /***************************************************************************** @@ -883,6 +927,7 @@ static void Close( vlc_object_t * p_this ) *****************************************************************************/ static void Play( aout_instance_t * p_aout ) { + VLC_UNUSED(p_aout); } @@ -916,15 +961,12 @@ static void Probe( aout_instance_t * p_aout ) goto error; } - msg_Dbg( p_aout, "system has [%ld] device(s)", p_sys->i_devices ); + msg_Dbg( p_aout, "system has [%u] device(s)", p_sys->i_devices ); /* Allocate DeviceID array */ p_devices = (AudioDeviceID*)malloc( sizeof(AudioDeviceID) * p_sys->i_devices ); if( p_devices == NULL ) - { - msg_Err( p_aout, "out of memory" ); goto error; - } /* Populate DeviceID array */ err = AudioHardwareGetProperty( kAudioHardwarePropertyDevices, @@ -945,11 +987,11 @@ static void Probe( aout_instance_t * p_aout ) goto error; } p_sys->i_default_dev = devid_def; - + var_Create( p_aout, "audio-device", VLC_VAR_INTEGER|VLC_VAR_HASCHOICE ); - text.psz_string = _("Audio Device"); + text.psz_string = (char*)_("Audio Device"); var_Change( p_aout, "audio-device", VLC_VAR_SETTEXT, &text, NULL ); - + for( i = 0; i < p_sys->i_devices; i++ ) { char *psz_name; @@ -957,7 +999,7 @@ static void Probe( aout_instance_t * p_aout ) /* Retrieve the length of the device name */ err = AudioDeviceGetPropertyInfo( - p_devices[i], 0, VLC_FALSE, + p_devices[i], 0, false, kAudioDevicePropertyDeviceName, &i_param_size, NULL); if( err ) goto error; @@ -965,23 +1007,25 @@ static void Probe( aout_instance_t * p_aout ) /* Retrieve the name of the device */ psz_name = (char *)malloc( i_param_size ); err = AudioDeviceGetProperty( - p_devices[i], 0, VLC_FALSE, + p_devices[i], 0, false, kAudioDevicePropertyDeviceName, &i_param_size, psz_name); if( err ) goto error; - msg_Dbg( p_aout, "DevID: %#lx DevName: %s", p_devices[i], psz_name ); + msg_Dbg( p_aout, "DevID: %u DevName: %s", p_devices[i], psz_name ); if( !AudioDeviceHasOutput( p_devices[i]) ) { msg_Dbg( p_aout, "this device is INPUT only. skipping..." ); + free( psz_name ); continue; } /* Add the menu entries */ val.i_int = (int)p_devices[i]; - text.psz_string = strdup( psz_name ); + 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 */ @@ -992,44 +1036,48 @@ static void Probe( aout_instance_t * p_aout ) if( AudioDeviceSupportsDigital( p_aout, p_devices[i] ) ) { val.i_int = (int)p_devices[i] | AOUT_VAR_SPDIF_FLAG; - asprintf( &text.psz_string, _("%s (Encoded Output)"), psz_name ); - var_Change( p_aout, "audio-device", VLC_VAR_ADDCHOICE, &val, &text ); - if( p_sys->i_default_dev == p_devices[i] && config_GetInt( p_aout, "spdif" ) ) + if( asprintf( &text.psz_string, _("%s (Encoded Output)"), psz_name ) != -1 ) { - /* I 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 ); + 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_InheritInteger( 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 ); + } } } - + free( psz_name); } - + /* If a device is already "preselected", then use this device */ - var_Get( p_aout->p_vlc, "macosx-audio-device", &val ); + var_Get( p_aout->p_libvlc, "macosx-audio-device", &val ); if( val.i_int > 0 ) { var_Change( p_aout, "audio-device", VLC_VAR_SETDEFAULT, &val, NULL ); var_Set( p_aout, "audio-device", val ); } - + /* If we change the device we want to use, we should renegotiate the audio chain */ var_AddCallback( p_aout, "audio-device", AudioDeviceCallback, NULL ); /* Attach a Listener so that we are notified of a change in the Device setup */ err = AudioHardwareAddPropertyListener( kAudioHardwarePropertyDevices, - HardwareListener, + HardwareListener, (void *)p_aout ); if( err ) goto error; - if( p_devices ) free( p_devices ); + free( p_devices ); return; error: - var_Destroy( p_aout, "audio-device" ); - if( p_devices ) free( p_devices ); + msg_Warn( p_aout, "audio device already in use" ); + free( p_devices ); return; } @@ -1038,12 +1086,12 @@ error: *****************************************************************************/ static int AudioDeviceHasOutput( AudioDeviceID i_dev_id ) { - UInt32 dataSize; - Boolean isWritable; - + UInt32 dataSize; + Boolean isWritable; + verify_noerr( AudioDeviceGetPropertyInfo( i_dev_id, 0, FALSE, kAudioDevicePropertyStreams, &dataSize, &isWritable) ); if (dataSize == 0) return FALSE; - + return TRUE; } @@ -1056,8 +1104,8 @@ static int AudioDeviceSupportsDigital( aout_instance_t *p_aout, AudioDeviceID i_ UInt32 i_param_size = 0; AudioStreamID *p_streams = NULL; int i = 0, i_streams = 0; - vlc_bool_t b_return = VLC_FALSE; - + bool b_return = false; + /* Retrieve all the output streams */ err = AudioDeviceGetPropertyInfo( i_dev_id, 0, FALSE, kAudioDevicePropertyStreams, @@ -1065,34 +1113,31 @@ static int AudioDeviceSupportsDigital( aout_instance_t *p_aout, AudioDeviceID i_ if( err != noErr ) { msg_Err( p_aout, "could not get number of streams: [%4.4s]", (char *)&err ); - return VLC_FALSE; + return false; } - + i_streams = i_param_size / sizeof( AudioStreamID ); p_streams = (AudioStreamID *)malloc( i_param_size ); if( p_streams == NULL ) - { - msg_Err( p_aout, "Out of memory" ); return VLC_ENOMEM; - } - + err = AudioDeviceGetProperty( i_dev_id, 0, FALSE, kAudioDevicePropertyStreams, &i_param_size, p_streams ); - + if( err != noErr ) { msg_Err( p_aout, "could not get number of streams: [%4.4s]", (char *)&err ); - return VLC_FALSE; + return false; } for( i = 0; i < i_streams; i++ ) { if( AudioStreamSupportsDigital( p_aout, p_streams[i] ) ) - b_return = VLC_TRUE; + b_return = true; } - - if( p_streams ) free( p_streams ); + + free( p_streams ); return b_return; } @@ -1105,8 +1150,8 @@ static int AudioStreamSupportsDigital( aout_instance_t *p_aout, AudioStreamID i_ UInt32 i_param_size = 0; AudioStreamBasicDescription *p_format_list = NULL; int i = 0, i_formats = 0; - vlc_bool_t b_return = VLC_FALSE; - + bool b_return = false; + /* Retrieve all the stream formats supported by each output stream */ err = AudioStreamGetPropertyInfo( i_stream_id, 0, kAudioStreamPropertyPhysicalFormats, @@ -1114,17 +1159,14 @@ static int AudioStreamSupportsDigital( aout_instance_t *p_aout, AudioStreamID i_ if( err != noErr ) { msg_Err( p_aout, "could not get number of streamformats: [%4.4s]", (char *)&err ); - return VLC_FALSE; + return false; } - + i_formats = i_param_size / sizeof( AudioStreamBasicDescription ); p_format_list = (AudioStreamBasicDescription *)malloc( i_param_size ); if( p_format_list == NULL ) - { - msg_Err( p_aout, "could not malloc the memory" ); - return VLC_FALSE; - } - + return false; + err = AudioStreamGetProperty( i_stream_id, 0, kAudioStreamPropertyPhysicalFormats, &i_param_size, p_format_list ); @@ -1133,21 +1175,21 @@ static int AudioStreamSupportsDigital( aout_instance_t *p_aout, AudioStreamID i_ msg_Err( p_aout, "could not get the list of streamformats: [%4.4s]", (char *)&err ); free( p_format_list); p_format_list = NULL; - return VLC_FALSE; + return false; } for( i = 0; i < i_formats; i++ ) { msg_Dbg( p_aout, STREAM_FORMAT_MSG( "supported format: ", p_format_list[i] ) ); - + if( p_format_list[i].mFormatID == 'IAC3' || p_format_list[i].mFormatID == kAudioFormat60958AC3 ) { - b_return = VLC_TRUE; + b_return = true; } } - - if( p_format_list ) free( p_format_list ); + + free( p_format_list ); return b_return; } @@ -1160,15 +1202,13 @@ static int AudioStreamChangeFormat( aout_instance_t *p_aout, AudioStreamID i_str UInt32 i_param_size = 0; int i; - struct timeval now; - struct timespec timeout; struct { vlc_mutex_t lock; vlc_cond_t cond; } w; - + msg_Dbg( p_aout, STREAM_FORMAT_MSG( "setting stream format: ", change_format ) ); - /* Condition because SetProperty is asynchronious */ - vlc_cond_init( p_aout, &w.cond ); - vlc_mutex_init( p_aout, &w.lock ); + /* Condition because SetProperty is asynchronious */ + vlc_cond_init( &w.cond ); + vlc_mutex_init( &w.lock ); vlc_mutex_lock( &w.lock ); /* Install the callback */ @@ -1178,33 +1218,30 @@ static int AudioStreamChangeFormat( aout_instance_t *p_aout, AudioStreamID i_str if( err != noErr ) { msg_Err( p_aout, "AudioStreamAddPropertyListener failed: [%4.4s]", (char *)&err ); - return VLC_FALSE; + return false; } /* change the format */ err = AudioStreamSetProperty( i_stream_id, 0, 0, kAudioStreamPropertyPhysicalFormat, sizeof( AudioStreamBasicDescription ), - &change_format ); + &change_format ); if( err != noErr ) { msg_Err( p_aout, "could not set the stream format: [%4.4s]", (char *)&err ); - return VLC_FALSE; + return false; } /* The AudioStreamSetProperty is not only asynchronious (requiring the locks) - * it is also not Atomic, in it's behaviour. + * it is also not atomic in its behaviour. * Therefore we check 5 times before we really give up. * FIXME: failing isn't actually implemented yet. */ for( i = 0; i < 5; i++ ) { AudioStreamBasicDescription actual_format; + mtime_t timeout = mdate() + 500000; - gettimeofday( &now, NULL ); - timeout.tv_sec = now.tv_sec; - timeout.tv_nsec = (now.tv_usec + 500000) * 1000; - - if( pthread_cond_timedwait( &w.cond.cond, &w.lock.mutex, &timeout ) ) + if( vlc_cond_timedwait( &w.cond, &w.lock, timeout ) ) { msg_Dbg( p_aout, "reached timeout" ); } @@ -1212,7 +1249,7 @@ static int AudioStreamChangeFormat( aout_instance_t *p_aout, AudioStreamID i_str i_param_size = sizeof( AudioStreamBasicDescription ); err = AudioStreamGetProperty( i_stream_id, 0, kAudioStreamPropertyPhysicalFormat, - &i_param_size, + &i_param_size, &actual_format ); msg_Dbg( p_aout, STREAM_FORMAT_MSG( "actual format in use: ", actual_format ) ); @@ -1225,7 +1262,7 @@ static int AudioStreamChangeFormat( aout_instance_t *p_aout, AudioStreamID i_str } /* We need to check again */ } - + /* Removing the property listener */ err = AudioStreamRemovePropertyListener( i_stream_id, 0, kAudioStreamPropertyPhysicalFormat, @@ -1233,15 +1270,15 @@ static int AudioStreamChangeFormat( aout_instance_t *p_aout, AudioStreamID i_str if( err != noErr ) { msg_Err( p_aout, "AudioStreamRemovePropertyListener failed: [%4.4s]", (char *)&err ); - return VLC_FALSE; + return false; } - + /* Destroy the lock and condition */ vlc_mutex_unlock( &w.lock ); vlc_mutex_destroy( &w.lock ); vlc_cond_destroy( &w.cond ); - - return VLC_TRUE; + + return true; } /***************************************************************************** @@ -1253,23 +1290,27 @@ static int AudioStreamChangeFormat( aout_instance_t *p_aout, AudioStreamID i_str static OSStatus RenderCallbackAnalog( vlc_object_t *_p_aout, AudioUnitRenderActionFlags *ioActionFlags, const AudioTimeStamp *inTimeStamp, - unsigned int inBusNummer, + unsigned int inBusNumber, unsigned int inNumberFrames, AudioBufferList *ioData ) { AudioTimeStamp host_time; mtime_t current_date = 0; - uint32_t i_mData_bytes = 0; + uint32_t i_mData_bytes = 0; aout_instance_t * p_aout = (aout_instance_t *)_p_aout; struct aout_sys_t * p_sys = p_aout->output.p_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; + AudioConvertHostTimeToNanos( AudioGetCurrentHostTime() ) / 1000; p_sys->clock_diff += mdate(); current_date = p_sys->clock_diff + @@ -1288,32 +1329,39 @@ static OSStatus RenderCallbackAnalog( vlc_object_t *_p_aout, 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 ); - p_aout->p_vlc->pf_memcpy( ioData->mBuffers[0].mData, &p_sys->p_remainder_buffer[p_sys->i_read_bytes], i_mData_bytes ); + vlc_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_aout->output.output.i_rate ) * ( 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 ) 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 */ aout_buffer_t * p_buffer; - p_buffer = aout_OutputNextBuffer( p_aout, current_date , VLC_FALSE ); - + p_buffer = aout_OutputNextBuffer( p_aout, current_date , false ); + if( p_buffer != NULL ) { - uint32_t i_second_mData_bytes = __MIN( p_buffer->i_nb_bytes, ioData->mBuffers[0].mDataByteSize - i_mData_bytes ); - - p_aout->p_vlc->pf_memcpy( (uint8_t *)ioData->mBuffers[0].mData + i_mData_bytes, p_buffer->p_buffer, i_second_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, + 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_nb_bytes - i_second_mData_bytes; - p_aout->p_vlc->pf_memcpy( p_sys->p_remainder_buffer, &p_buffer->p_buffer[i_second_mData_bytes], p_sys->i_total_bytes ); + p_sys->i_total_bytes = p_buffer->i_buffer - i_second_mData_bytes; + vlc_memcpy( p_sys->p_remainder_buffer, + &p_buffer->p_buffer[i_second_mData_bytes], + p_sys->i_total_bytes ); + aout_BufferFree( p_buffer ); + break; } else { @@ -1325,22 +1373,23 @@ static OSStatus RenderCallbackAnalog( vlc_object_t *_p_aout, } else { - p_aout->p_vlc->pf_memset( (uint8_t *)ioData->mBuffers[0].mData +i_mData_bytes, 0, ioData->mBuffers[0].mDataByteSize - i_mData_bytes ); + vlc_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 ); + return( noErr ); } /***************************************************************************** * RenderCallbackSPDIF: callback for SPDIF audio output *****************************************************************************/ static OSStatus RenderCallbackSPDIF( AudioDeviceID inDevice, - const AudioTimeStamp * inNow, + const AudioTimeStamp * inNow, const void * inInputData, - const AudioTimeStamp * inInputTime, + const AudioTimeStamp * inInputTime, AudioBufferList * outOutputData, - const AudioTimeStamp * inOutputTime, + const AudioTimeStamp * inOutputTime, void * threadGlobals ) { aout_buffer_t * p_buffer; @@ -1349,35 +1398,38 @@ static OSStatus RenderCallbackSPDIF( AudioDeviceID inDevice, aout_instance_t * p_aout = (aout_instance_t *)threadGlobals; struct aout_sys_t * p_sys = p_aout->output.p_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; + AudioConvertHostTimeToNanos( inNow->mHostTime ) / 1000; p_sys->clock_diff += mdate(); current_date = p_sys->clock_diff + AudioConvertHostTimeToNanos( inOutputTime->mHostTime ) / 1000; //- ((mtime_t) 1000000 / p_aout->output.output.i_rate * 31 ); // 31 = Latency in Frames. retrieve somewhere - p_buffer = aout_OutputNextBuffer( p_aout, current_date, VLC_TRUE ); + p_buffer = aout_OutputNextBuffer( p_aout, current_date, true ); #define BUFFER outOutputData->mBuffers[p_sys->i_stream_index] if( p_buffer != NULL ) { - if( (int)BUFFER.mDataByteSize != (int)p_buffer->i_nb_bytes) - msg_Warn( p_aout, "bytesize: %d nb_bytes: %d", (int)BUFFER.mDataByteSize, (int)p_buffer->i_nb_bytes ); - + 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 */ - p_aout->p_vlc->pf_memcpy( BUFFER.mData, - p_buffer->p_buffer, p_buffer->i_nb_bytes ); + vlc_memcpy( BUFFER.mData, p_buffer->p_buffer, p_buffer->i_buffer ); aout_BufferFree( p_buffer ); } else { - p_aout->p_vlc->pf_memset( BUFFER.mData, 0, BUFFER.mDataByteSize ); + vlc_memset( BUFFER.mData, 0, BUFFER.mDataByteSize ); } #undef BUFFER - return( noErr ); + return( noErr ); } /***************************************************************************** @@ -1395,7 +1447,7 @@ static OSStatus HardwareListener( AudioHardwarePropertyID inPropertyID, { /* something changed in the list of devices */ /* We trigger the audio-device's aout_ChannelsRestart callback */ - var_Change( p_aout, "audio-device", VLC_VAR_TRIGGER_CALLBACKS, NULL, NULL ); + var_TriggerCallback( p_aout, "audio-device" ); var_Destroy( p_aout, "audio-device" ); } break; @@ -1405,7 +1457,7 @@ static OSStatus HardwareListener( AudioHardwarePropertyID inPropertyID, } /***************************************************************************** - * StreamListener + * StreamListener *****************************************************************************/ static OSStatus StreamListener( AudioStreamID inStream, UInt32 inChannel, @@ -1414,13 +1466,16 @@ static OSStatus StreamListener( AudioStreamID inStream, { OSStatus err = noErr; struct { vlc_mutex_t lock; vlc_cond_t cond; } * w = inClientData; - + + VLC_UNUSED(inStream); + VLC_UNUSED(inChannel); + switch( inPropertyID ) { case kAudioStreamPropertyPhysicalFormat: vlc_mutex_lock( &w->lock ); vlc_cond_signal( &w->cond ); - vlc_mutex_unlock( &w->lock ); + vlc_mutex_unlock( &w->lock ); break; default: @@ -1436,7 +1491,7 @@ static int AudioDeviceCallback( vlc_object_t *p_this, const char *psz_variable, vlc_value_t old_val, vlc_value_t new_val, void *param ) { aout_instance_t *p_aout = (aout_instance_t *)p_this; - var_Set( p_aout->p_vlc, "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 ); return aout_ChannelsRestart( p_this, psz_variable, old_val, new_val, param ); }