generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Microphone volume on Mac not being printed properly due

Browse Source 
to a mismatch in variable type. Additionally, now printing
a volume that will range from 0 - 255
Review URL: http://webrtc-codereview.appspot.com/267016

git-svn-id: http://webrtc.googlecode.com/svn/trunk@951 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
punyabrata@webrtc.org 2011-11-16 02:06:49 +00:00
parent 755b04a06e
commit 81d4499dee
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/modules/audio_device/main/source/mac/audio_mixer_manager_mac.cc
View File

@ -1045,7 +1045,7 @@ AudioMixerManagerMac::MicrophoneVolume(WebRtc_UWord32& volume) const
UInt32 size = 0; UInt32 size = 0;
unsigned int channels = 0; unsigned int channels = 0;
Float32 channelVol = 0; Float32 channelVol = 0;
Float32 vol = 0; Float32 volFloat32 = 0;
// Does the device have a master volume control? // Does the device have a master volume control?
// If so, use it exclusively. // If so, use it exclusively.
@ -1056,16 +1056,16 @@ AudioMixerManagerMac::MicrophoneVolume(WebRtc_UWord32& volume) const
&propertyAddress); &propertyAddress);
if (hasProperty) if (hasProperty)
{ {
size = sizeof(vol); size = sizeof(volFloat32);
WEBRTC_CA_RETURN_ON_ERR(AudioObjectGetPropertyData(_inputDeviceID, WEBRTC_CA_RETURN_ON_ERR(AudioObjectGetPropertyData(_inputDeviceID,
&propertyAddress, 0, NULL, &size, &vol)); &propertyAddress, 0, NULL, &size, &volFloat32));
// vol 0.0 to 1.0 -> convert to 0 - 255 // vol 0.0 to 1.0 -> convert to 0 - 255
volume = static_cast<WebRtc_UWord32> (vol * 255 + 0.5); volume = static_cast<WebRtc_UWord32> (volFloat32 * 255 + 0.5);
} else } else
{ {
// Otherwise get the average volume across channels. // Otherwise get the average volume across channels.
vol = 0; volFloat32 = 0;
for (UInt32 i = 1; i <= _noInputChannels; i++) for (UInt32 i = 1; i <= _noInputChannels; i++)
{ {
channelVol = 0; channelVol = 0;
@ -1078,7 +1078,7 @@ AudioMixerManagerMac::MicrophoneVolume(WebRtc_UWord32& volume) const
WEBRTC_CA_RETURN_ON_ERR(AudioObjectGetPropertyData(_inputDeviceID, WEBRTC_CA_RETURN_ON_ERR(AudioObjectGetPropertyData(_inputDeviceID,
&propertyAddress, 0, NULL, &size, &channelVol)); &propertyAddress, 0, NULL, &size, &channelVol));
vol += channelVol; volFloat32 += channelVol;
channels++; channels++;
} }
} }
@ -1092,12 +1092,13 @@ AudioMixerManagerMac::MicrophoneVolume(WebRtc_UWord32& volume) const
assert(channels > 0); assert(channels > 0);
// vol 0.0 to 1.0 -> convert to 0 - 255 // vol 0.0 to 1.0 -> convert to 0 - 255
volume = static_cast<WebRtc_UWord32> (255 * vol / channels + 0.5); volume = static_cast<WebRtc_UWord32>
(255 * volFloat32 / channels + 0.5);
} }
WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id,
" AudioMixerManagerMac::MicrophoneVolume() => vol=%i", " AudioMixerManagerMac::MicrophoneVolume() => vol=%u",
vol); volume);
return 0; return 0;
} }