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

Truncated the volume to 255 when the users set the volume above 100%.

Browse Source 
Allowed the users to set the volume above 100% when AGC is enabled, in this case AGC can gradually scale down the volume instead of jumping to 100% immediately.
Reduced the flakiness of the volume tests in linux.
Review URL: https://webrtc-codereview.appspot.com/387011

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1706 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
xians@webrtc.org 2012-02-16 18:15:54 +00:00
parent f7b6078f6f
commit 3ab6dda5cb
2 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/voice_engine/main/source/voe_base_impl.cc
View File

@ -187,11 +187,12 @@ WebRtc_Word32 VoEBaseImpl::RecordedDataIsAvailable(
// We learned that on certain systems (e.g Linux) the currentVoEMicLevel // We learned that on certain systems (e.g Linux) the currentVoEMicLevel
// can be greater than the maxVolumeLevel therefore // can be greater than the maxVolumeLevel therefore
// we are going to cap the currentVoEMicLevel to the maxVolumeLevel // we are going to cap the currentVoEMicLevel to the maxVolumeLevel
// if it turns out that the currentVoEMicLevel is indeed greater // and change the maxVolume to currentMicLevel if it turns out that
// than the maxVolumeLevel // the currentVoEMicLevel is indeed greater than the maxVolumeLevel.
if (currentVoEMicLevel > kMaxVolumeLevel) if (currentVoEMicLevel > kMaxVolumeLevel)
{ {
currentVoEMicLevel = kMaxVolumeLevel; currentVoEMicLevel = kMaxVolumeLevel;
maxVolume = currentMicLevel;
} }
} }

40
src/voice_engine/main/source/voe_volume_control_impl.cc
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
* *
* Use of this source code is governed by a BSD-style license * Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source * that can be found in the LICENSE file in the root of the source
@ -99,7 +99,7 @@ int VoEVolumeControlImpl::SetSpeakerVolume(unsigned int volume)
"SetSpeakerVolume() failed to get max volume"); "SetSpeakerVolume() failed to get max volume");
return -1; return -1;
} }
// round the value and avoid floating computation // Round the value and avoid floating computation.
spkrVol = (WebRtc_UWord32)((volume * maxVol + spkrVol = (WebRtc_UWord32)((volume * maxVol +
(int)(kMaxVolumeLevel / 2)) / (kMaxVolumeLevel)); (int)(kMaxVolumeLevel / 2)) / (kMaxVolumeLevel));
@ -145,7 +145,7 @@ int VoEVolumeControlImpl::GetSpeakerVolume(unsigned int& volume)
"GetSpeakerVolume() unable to get max speaker volume"); "GetSpeakerVolume() unable to get max speaker volume");
return -1; return -1;
} }
// round the value and avoid floating computation // Round the value and avoid floating computation.
volume = (WebRtc_UWord32) ((spkrVol * kMaxVolumeLevel + volume = (WebRtc_UWord32) ((spkrVol * kMaxVolumeLevel +
(int)(maxVol / 2)) / (maxVol)); (int)(maxVol / 2)) / (maxVol));
@ -230,11 +230,28 @@ int VoEVolumeControlImpl::SetMicVolume(unsigned int volume)
"SetMicVolume() failed to get max volume"); "SetMicVolume() failed to get max volume");
return -1; return -1;
} }
// round the value and avoid floating point computation
if (volume == kMaxVolumeLevel) {
// On Linux running pulse, users are able to set the volume above 100%
// through the volume control panel, where the +100% range is digital
// scaling. WebRTC does not support setting the volume above 100%, and
// simply ignores changing the volume if the user tries to set it to
// |kMaxVolumeLevel| while the current volume is higher than |maxVol|.
if (_audioDevicePtr->MicrophoneVolume(&micVol) != 0) {
_engineStatistics.SetLastError(
VE_GET_MIC_VOL_ERROR, kTraceError,
"SetMicVolume() unable to get microphone volume");
return -1;
}
if (micVol >= maxVol)
return 0;
}
// Round the value and avoid floating point computation.
micVol = (WebRtc_UWord32) ((volume * maxVol + micVol = (WebRtc_UWord32) ((volume * maxVol +
(int)(kMaxVolumeLevel / 2)) / (kMaxVolumeLevel)); (int)(kMaxVolumeLevel / 2)) / (kMaxVolumeLevel));
// set the actual volume using the audio mixer // set the actual volume using the audio mixer
if (_audioDevicePtr->SetMicrophoneVolume(micVol) != 0) if (_audioDevicePtr->SetMicrophoneVolume(micVol) != 0)
{ {
_engineStatistics.SetLastError( _engineStatistics.SetLastError(
@ -269,7 +286,7 @@ int VoEVolumeControlImpl::GetMicVolume(unsigned int& volume)
return -1; return -1;
} }
// scale: [0, MaxMicrophoneVolume] -> [0, kMaxVolumeLevel] // scale: [0, MaxMicrophoneVolume] -> [0, kMaxVolumeLevel]
if (_audioDevicePtr->MaxMicrophoneVolume(&maxVol) != 0) if (_audioDevicePtr->MaxMicrophoneVolume(&maxVol) != 0)
{ {
_engineStatistics.SetLastError( _engineStatistics.SetLastError(
@ -277,9 +294,14 @@ int VoEVolumeControlImpl::GetMicVolume(unsigned int& volume)
"GetMicVolume() unable to get max microphone volume"); "GetMicVolume() unable to get max microphone volume");
return -1; return -1;
} }
// round the value and avoid floating point calculation if (micVol < maxVol) {
volume = (WebRtc_UWord32) ((micVol * kMaxVolumeLevel + // Round the value and avoid floating point calculation.
(int)(maxVol / 2)) / (maxVol)); volume = (WebRtc_UWord32) ((micVol * kMaxVolumeLevel +
(int)(maxVol / 2)) / (maxVol));
} else {
// Truncate the value to the kMaxVolumeLevel.
volume = kMaxVolumeLevel;
}
WEBRTC_TRACE(kTraceStateInfo, kTraceVoice, VoEId(_instanceId,-1), WEBRTC_TRACE(kTraceStateInfo, kTraceVoice, VoEId(_instanceId,-1),
"GetMicVolume() => volume=%d", volume); "GetMicVolume() => volume=%d", volume);