X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_output%2Fauhal.c;h=2af9776900ea1ad062c33958e7d0aa55bf9aea81;hb=9683d8870fba25e4642610c5545d7660f21dd5b5;hp=e3ee3a1eb804e135a6634cb60532baa59e828772;hpb=6ee1e193fd896ab9a4729fde14f009d9ce629815;p=vlc diff --git a/modules/audio_output/auhal.c b/modules/audio_output/auhal.c index e3ee3a1eb8..2af9776900 100644 --- a/modules/audio_output/auhal.c +++ b/modules/audio_output/auhal.c @@ -24,33 +24,60 @@ /***************************************************************************** * Preamble *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include -#include -#include +#include +#include +#include #include +// 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) * 8 #define AOUT_VAR_SPDIF_FLAG 0xf00000 /* @@ -72,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; @@ -89,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 */ }; /***************************************************************************** @@ -120,6 +147,7 @@ static int AudioDeviceCallback ( vlc_object_t *, const char *, vlc_value_t, vlc_value_t, void * ); + /***************************************************************************** * Module descriptor *****************************************************************************/ @@ -128,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 @@ -146,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; @@ -172,8 +200,8 @@ 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; @@ -200,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 */ @@ -211,11 +239,12 @@ 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" ); p_sys->i_selected_dev = p_sys->i_default_dev; @@ -237,7 +266,7 @@ static int Open( vlc_object_t * p_this ) 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." ); - intf_UserFatal( p_aout, VLC_FALSE, _("Audio output failed"), + dialog_Fatal( p_aout, _("Audio output failed"), "%s", _("The selected audio output device is exclusively in " "use by another program.") ); goto error; @@ -258,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; } @@ -271,7 +300,7 @@ static int OpenAnalog( aout_instance_t *p_aout ) OSStatus err = noErr; UInt32 i_param_size = 0, i = 0; int i_original; - ComponentDescription desc; + AudioComponentDescription desc; AudioStreamBasicDescription DeviceFormat; AudioChannelLayout *layout; AudioChannelLayout new_layout; @@ -284,18 +313,18 @@ 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 ); + 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 */ @@ -309,7 +338,7 @@ static int OpenAnalog( aout_instance_t *p_aout ) if( err != noErr ) { msg_Warn( p_aout, "we cannot select the audio device" ); - return VLC_FALSE; + return false; } /* Get the current format */ @@ -322,7 +351,7 @@ static int OpenAnalog( aout_instance_t *p_aout ) &DeviceFormat, &i_param_size ); - if( err != noErr ) return VLC_FALSE; + 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) */ @@ -422,13 +451,13 @@ static int OpenAnalog( aout_instance_t *p_aout ) { 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." ); - intf_UserFatal( p_aout, VLC_FALSE, _("Audio device is not configured"), + dialog_Fatal( p_aout, _("Audio device is not configured"), "%s", _("You should configure your speaker layout with " - "the \"Audio Midi Setup Utility\" in /Applications/" + "the \"Audio Midi Setup\" utility in /Applications/" "Utilities. Stereo mode is being used now.") ); } } - if( layout ) free( layout ); + free( layout ); } else { @@ -507,7 +536,7 @@ 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 ); @@ -516,7 +545,7 @@ static int OpenAnalog( aout_instance_t *p_aout ) 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, @@ -540,7 +569,7 @@ static int OpenAnalog( aout_instance_t *p_aout ) /* 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 */ @@ -575,7 +604,7 @@ static int OpenAnalog( aout_instance_t *p_aout ) /* Start the AU */ verify_noerr( AudioOutputUnitStart(p_sys->au_unit) ); - return VLC_TRUE; + return true; } /***************************************************************************** @@ -586,12 +615,12 @@ 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 ); @@ -603,7 +632,7 @@ static int OpenSPDIF( aout_instance_t * p_aout ) 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 */ @@ -618,13 +647,13 @@ static int OpenSPDIF( aout_instance_t * p_aout ) 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 */ @@ -634,16 +663,13 @@ 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, @@ -652,8 +678,8 @@ 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 ); - 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++ ) @@ -661,7 +687,7 @@ 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, @@ -676,10 +702,7 @@ static int OpenSPDIF( aout_instance_t * p_aout ) 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, @@ -687,7 +710,7 @@ static int OpenSPDIF( aout_instance_t * p_aout ) 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; } @@ -697,7 +720,7 @@ 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; } } @@ -712,7 +735,7 @@ 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 ); @@ -725,7 +748,7 @@ static int OpenSPDIF( aout_instance_t * p_aout ) msg_Err( p_aout, "could not retrieve the original streamformat: [%4.4s]", (char *)&err ); continue; } - p_sys->b_revert = VLC_TRUE; + p_sys->b_revert = true; } for( j = 0; j < i_formats; j++ ) @@ -757,20 +780,20 @@ static int OpenSPDIF( aout_instance_t * p_aout ) 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; @@ -780,12 +803,13 @@ 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 */ @@ -800,15 +824,15 @@ static int OpenSPDIF( aout_instance_t * p_aout ) msg_Err( p_aout, "AudioDeviceStart failed: [%4.4s]", (char *)&err ); err = AudioDeviceRemoveIOProc( p_sys->i_selected_dev, - (AudioDeviceIOProc)RenderCallbackSPDIF ); + (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; } @@ -826,7 +850,7 @@ static void Close( vlc_object_t * p_this ) { 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 ) @@ -841,7 +865,7 @@ 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 ); @@ -895,7 +919,7 @@ static void Close( vlc_object_t * p_this ) if( err != noErr ) msg_Err( p_aout, "Could not release hogmode: [%4.4s]", (char *)&err ); } - if( p_sys ) free( p_sys ); + free( p_sys ); } /***************************************************************************** @@ -903,6 +927,7 @@ static void Close( vlc_object_t * p_this ) *****************************************************************************/ static void Play( aout_instance_t * p_aout ) { + VLC_UNUSED(p_aout); } @@ -936,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, @@ -967,7 +989,7 @@ static void Probe( aout_instance_t * p_aout ) 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++ ) @@ -977,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; @@ -985,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 */ @@ -1012,14 +1036,18 @@ 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 ) { - /* 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_InheritBool( p_aout, "spdif" ) ) + { + /* We selected to prefer SPDIF output if available + * then this "dummy" entry should be selected */ + var_Change( p_aout, "audio-device", VLC_VAR_SETDEFAULT, &val, NULL ); + var_Set( p_aout, "audio-device", val ); + } } } @@ -1044,12 +1072,12 @@ static void Probe( aout_instance_t * 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; } @@ -1076,7 +1104,7 @@ 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, @@ -1085,16 +1113,13 @@ 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, @@ -1103,16 +1128,16 @@ 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; } 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; } @@ -1125,7 +1150,7 @@ 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, @@ -1134,16 +1159,13 @@ 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, @@ -1153,7 +1175,7 @@ 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++ ) @@ -1163,11 +1185,11 @@ static int AudioStreamSupportsDigital( aout_instance_t *p_aout, AudioStreamID 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; } @@ -1180,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 ); + vlc_cond_init( &w.cond ); + vlc_mutex_init( &w.lock ); vlc_mutex_lock( &w.lock ); /* Install the callback */ @@ -1198,7 +1218,7 @@ 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 */ @@ -1209,7 +1229,7 @@ static int AudioStreamChangeFormat( aout_instance_t *p_aout, AudioStreamID i_str 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) @@ -1219,12 +1239,9 @@ static int AudioStreamChangeFormat( aout_instance_t *p_aout, AudioStreamID i_str 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" ); } @@ -1253,7 +1270,7 @@ 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 */ @@ -1261,7 +1278,7 @@ static int AudioStreamChangeFormat( aout_instance_t *p_aout, AudioStreamID i_str vlc_mutex_destroy( &w.lock ); vlc_cond_destroy( &w.cond ); - return VLC_TRUE; + return true; } /***************************************************************************** @@ -1273,7 +1290,7 @@ 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 ) { @@ -1284,6 +1301,10 @@ static OSStatus RenderCallbackAnalog( vlc_object_t *_p_aout, 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 ); @@ -1308,7 +1329,9 @@ 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_libvlc->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 @@ -1321,19 +1344,24 @@ static OSStatus RenderCallbackAnalog( vlc_object_t *_p_aout, { /* 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 ); + uint32_t i_second_mData_bytes = __MIN( p_buffer->i_buffer, ioData->mBuffers[0].mDataByteSize - i_mData_bytes ); - p_aout->p_libvlc->pf_memcpy( (uint8_t *)ioData->mBuffers[0].mData + i_mData_bytes, p_buffer->p_buffer, i_second_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_libvlc->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 { @@ -1345,7 +1373,8 @@ static OSStatus RenderCallbackAnalog( vlc_object_t *_p_aout, } else { - p_aout->p_libvlc->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; } } @@ -1369,6 +1398,10 @@ 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; @@ -1378,22 +1411,21 @@ static OSStatus RenderCallbackSPDIF( AudioDeviceID inDevice, 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_libvlc->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_libvlc->pf_memset( BUFFER.mData, 0, BUFFER.mDataByteSize ); + vlc_memset( BUFFER.mData, 0, BUFFER.mDataByteSize ); } #undef BUFFER @@ -1415,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; @@ -1434,6 +1466,9 @@ 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 ) { @@ -1457,7 +1492,7 @@ static int AudioDeviceCallback( vlc_object_t *p_this, const char *psz_variable, { aout_instance_t *p_aout = (aout_instance_t *)p_this; 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: %#"PRIx64, new_val.i_int ); return aout_ChannelsRestart( p_this, psz_variable, old_val, new_val, param ); }