admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add check to see if output device has HogMode property (Mac OS X)

Browse Source 
Bug: webrtc:8549
Change-Id: I952db26de02ccce8155762531cbae9411abafb28
Reviewed-on: https://webrtc-review.googlesource.com/24125
Commit-Queue: Henrik Andreassson <henrika@webrtc.org>
Reviewed-by: Henrik Andreassson <henrika@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20809}
This commit is contained in:
Adam Fedor 2017-11-20 09:07:58 -07:00 committed by Commit Bot
parent 212ad82494
commit d6c98c020a
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
modules/audio_device/mac/audio_mixer_manager_mac.cc
View File

@ -105,21 +105,25 @@ int32_t AudioMixerManagerMac::OpenSpeaker(AudioDeviceID deviceID) {
AudioObjectPropertyAddress propertyAddress = {
kAudioDevicePropertyHogMode, kAudioDevicePropertyScopeOutput, 0};
size = sizeof(hogPid);
WEBRTC_CA_RETURN_ON_ERR(AudioObjectGetPropertyData(
_outputDeviceID, &propertyAddress, 0, NULL, &size, &hogPid));
// First, does it have the property? Aggregate devices don't.
if (AudioObjectHasProperty(_outputDeviceID, &propertyAddress)) {
size = sizeof(hogPid);
WEBRTC_CA_RETURN_ON_ERR(AudioObjectGetPropertyData(
_outputDeviceID, &propertyAddress, 0, NULL, &size, &hogPid));
if (hogPid == -1) {
RTC_LOG(LS_VERBOSE) << "No process has hogged the input device";
}
// getpid() is apparently "always successful"
else if (hogPid == getpid()) {
RTC_LOG(LS_VERBOSE) << "Our process has hogged the input device";
} else {
RTC_LOG(LS_WARNING) << "Another process (pid = " << static_cast<int>(hogPid)
<< ") has hogged the input device";
if (hogPid == -1) {
RTC_LOG(LS_VERBOSE) << "No process has hogged the output device";
}
// getpid() is apparently "always successful"
else if (hogPid == getpid()) {
RTC_LOG(LS_VERBOSE) << "Our process has hogged the output device";
} else {
RTC_LOG(LS_WARNING) << "Another process (pid = "
<< static_cast<int>(hogPid)
<< ") has hogged the output device";
return -1;
return -1;
}
}
// get number of channels from stream format