Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-22 18:34:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request from zzmp/fix/half-sec-audio-crash

Browse source 
reduce sound from crashed avatars
This commit is contained in:
Ryan Huffman 2016-10-23 20:38:35 -07:00 committed by GitHub
commit b5881146df
1 changed files with 2 additions and 4 deletions

6
libraries/audio/src/InboundAudioStream.cpp
View file

@ -471,8 +471,8 @@ float calculateRepeatedFrameFadeFactor(int indexOfRepeat) {
const float INITIAL_MSECS_NO_FADE = 20.0f;
const float MSECS_FADE_TO_ZERO = 320.0f;
const float INITIAL_FRAMES_NO_FADE = INITIAL_MSECS_NO_FADE * AudioConstants::NETWORK_FRAME_MSECS;
const float FRAMES_FADE_TO_ZERO = MSECS_FADE_TO_ZERO * AudioConstants::NETWORK_FRAME_MSECS;
const float INITIAL_FRAMES_NO_FADE = INITIAL_MSECS_NO_FADE / AudioConstants::NETWORK_FRAME_MSECS;
const float FRAMES_FADE_TO_ZERO = MSECS_FADE_TO_ZERO / AudioConstants::NETWORK_FRAME_MSECS;
const float SAMPLE_RANGE = std::numeric_limits<int16_t>::max();
@ -480,8 +480,6 @@ float calculateRepeatedFrameFadeFactor(int indexOfRepeat) {
return 1.0f;
} else if (indexOfRepeat <= INITIAL_FRAMES_NO_FADE + FRAMES_FADE_TO_ZERO) {
return pow(SAMPLE_RANGE, -(indexOfRepeat - INITIAL_FRAMES_NO_FADE) / FRAMES_FADE_TO_ZERO);
//return 1.0f - ((indexOfRepeat - INITIAL_FRAMES_NO_FADE) / FRAMES_FADE_TO_ZERO);
}
return 0.0f;
}