mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX(client): Performance degradation around speex

Browse Source 
Elements of a vector were failing to be cleared correctly which
created performance issues.

A nuance with speex was also causing the library to fail to call
a destroy callback.

Fixes #6150
This commit is contained in:
nJ3ahxac 2023-06-20 18:04:51 +10:00
parent f09c074645
commit bcbf86ecab
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/mumble/AudioOutputSpeech.cpp
View File

@ -22,7 +22,7 @@ std::vector< AudioOutputCache > AudioOutputSpeech::s_audioCaches(100);
void AudioOutputSpeech::invalidateAudioOutputCache(void *maskedIndex) {
// The given "pointer" actually is to be understood as an index
std::size_t index = reinterpret_cast< std::size_t >(maskedIndex);
const std::size_t index = reinterpret_cast< std::size_t >(maskedIndex) - 1;
std::lock_guard< std::mutex > lock(s_audioCachesMutex);
@ -201,8 +201,14 @@ void AudioOutputSpeech::addFrameToBuffer(const Mumble::Protocol::AudioData &audi
// We cheat a bit and instead of storing the actual audio data in the jitter buffer, we store the index to
// the created audio chunk in the buffer. Passing a length of 0 should ensure that this "pointer" will never
// be dereferenced.
// A call to jitter_buffer_put stores the packet in an internal array used for book-keeping.
// The library uses jbp.data == NULL to differentiate between unused and reserved elements
// of the book-keeping array.
// Since a storageIndex of zero will look the same as a null pointer, we always add one to
// ensure the library never erroneously confuses this entry with a free slot.
JitterBufferPacket jbp;
jbp.data = reinterpret_cast< char * >(storageIndex);
jbp.data = reinterpret_cast< char * >(storageIndex) + 1;
jbp.len = 0;
jbp.span = samples;
jbp.timestamp = iFrameSize * audioData.frameNumber;
@ -276,11 +282,11 @@ bool AudioOutputSpeech::prepareSampleBuffer(unsigned int frameCount) {
iMissCount = 0;
// The "data pointer" that is stored in the buffer is actually just an index to s_audioCaches
std::size_t index = reinterpret_cast< std::size_t >(jbp.data);
const std::size_t index = reinterpret_cast< std::size_t >(jbp.data) - 1;
assert(jbp.len == 0);
assert(index < s_audioCaches.size());
const AudioOutputCache &cache = s_audioCaches[index];
AudioOutputCache &cache = s_audioCaches[index];
assert(cache.isValid());
bHasTerminator = cache.isLastFrame();
@ -312,6 +318,11 @@ bool AudioOutputSpeech::prepareSampleBuffer(unsigned int frameCount) {
else
p->fAverageAvailable *= 0.99f;
}
// If a destroy callback has been registered, jitter_buffer_get expects the caller to
// invoke the destroy callback on the returned packet.
// We registered a destroy callback in our constructor, so we clean up the packet here.
cache.clear();
} else {
// Let the jitter buffer know it's the right time to adjust the buffering delay to the network
// conditions.