Skip to content

Audio: Pin UI sounds in memory and preload UISndNewIncomingIMSession to prevent frame hitching #6264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Shadowolf7 wants to merge 2 commits into
base: develop
Choose a base branch
from
+86 −40
Open

Audio: Pin UI sounds in memory and preload UISndNewIncomingIMSession to prevent frame hitching #6264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64eea0d
Audio: Pin UI sounds in memory and preload UISndNewIncomingIMSession …
Shadowolf7 Sep 5, 2026
926cbe5
Audio: Default preloadSound pin_buffer to false and restrict pinning …
Shadowolf7 Sep 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions indra/llaudio/llaudiodecodemgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,6 +756,14 @@ bool tryFinishAudio(const LLUUID &decode_id, LLPointer<LLVorbisDecodeState> deco
if (valid)
{
adp->setHasWAVLoadFailed(false);
if (adp->isPinned() && !adp->getBuffer())
{
adp->load();
if (adp->getBuffer())
{
adp->getBuffer()->setPinned(true);
}
Comment on lines +761 to +765
}
}

return true;
Expand Down
32 changes: 26 additions & 6 deletions indra/llaudio/llaudioengine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ void LLAudioEngine::idle()
{
if (mBuffers[i])
{
if (!mBuffers[i]->mInUse && mBuffers[i]->mLastUseTimer.getElapsedTimeF32() > 30.f)
if (!mBuffers[i]->mInUse && !mBuffers[i]->isPinned() && mBuffers[i]->mLastUseTimer.getElapsedTimeF32() > 30.f)
{
//LL_INFOS() << "Flushing unused buffer!" << LL_ENDL;
mBuffers[i]->mAudioDatap->mBufferp = NULL;
Expand Down Expand Up @@ -550,7 +550,7 @@ LLAudioBuffer * LLAudioEngine::getFreeBuffer()
{
if (mBuffers[i])
{
if (!mBuffers[i]->mInUse)
if (!mBuffers[i]->mInUse && !mBuffers[i]->isPinned())
{
if (mBuffers[i]->mLastUseTimer.getElapsedTimeF32() > max_age)
{
Expand Down Expand Up @@ -643,12 +643,28 @@ void LLAudioEngine::cleanupBuffer(LLAudioBuffer *bufferp)
}


bool LLAudioEngine::preloadSound(const LLUUID &uuid)
bool LLAudioEngine::preloadSound(const LLUUID &uuid, bool pin_buffer)
{
LL_DEBUGS("AudioEngine")<<"( "<<uuid<<" )"<<LL_ENDL;

getAudioData(uuid); // We don't care about the return value, this is just to make sure
// that we have an entry, which will mean that the audio engine knows about this
LLAudioData *adp = getAudioData(uuid);
if (!adp)
return false;

if (pin_buffer)
{
adp->setPinned(true);
}

if (adp->hasDecodedData() && !adp->getBuffer())
{
adp->load();
if (adp->getBuffer() && pin_buffer)
{
adp->getBuffer()->setPinned(true);
}
Comment on lines +661 to +665
return true;
}

if (LLAudioDecodeMgr::getInstance()->addDecodeRequest(uuid))
{
Expand Down Expand Up @@ -1837,11 +1853,15 @@ bool LLAudioData::load()
mHasCompletedDecode = false;
mHasDecodeFailed = false;
mHasWAVLoadFailed = false;
gAudiop->preloadSound(mID);
gAudiop->preloadSound(mID, mPinned);
}

return false;
}
mBufferp->mAudioDatap = this;
if (mPinned)
{
mBufferp->setPinned(true);
}
return true;
}
20 changes: 18 additions & 2 deletions indra/llaudio/llaudioengine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ const F32 ATTACHED_OBJECT_TIMEOUT = 5.0f;
const F32 DEFAULT_MIN_DISTANCE = 2.0f;

#define LL_MAX_AUDIO_CHANNELS 30
#define LL_MAX_AUDIO_BUFFERS 40 // Some extra for preloading, maybe?
#define LL_MAX_AUDIO_BUFFERS 80 // Some extra for preloading and pinning UI sounds

class LLAudioSource;
class LLAudioData;
Expand Down Expand Up @@ -137,7 +137,7 @@ class LLAudioEngine
const LLVector3d &pos_global = LLVector3d::zero);
void triggerSound(SoundData& soundData);

bool preloadSound(const LLUUID &id);
bool preloadSound(const LLUUID &id, bool pin_buffer = false);

void addAudioSource(LLAudioSource *asp);
void cleanupAudioSource(LLAudioSource *asp);
Expand Down Expand Up @@ -373,12 +373,14 @@ class LLAudioData
bool hasCompletedDecode() const { return mHasCompletedDecode; }
bool hasDecodeFailed() const { return mHasDecodeFailed; }
bool hasWAVLoadFailed() const { return mHasWAVLoadFailed; }
bool isPinned() const { return mPinned; }

void setHasLocalData(const bool hld) { mHasLocalData = hld; }
void setHasDecodedData(const bool hdd) { mHasDecodedData = hdd; }
void setHasCompletedDecode(const bool hcd) { mHasCompletedDecode = hcd; }
void setHasDecodeFailed(const bool hdf) { mHasDecodeFailed = hdf; }
void setHasWAVLoadFailed(const bool hwlf) { mHasWAVLoadFailed = hwlf; }
void setPinned(const bool pinned);

friend class LLAudioEngine; // Severe laziness, bad.

Expand All @@ -391,6 +393,7 @@ class LLAudioData
bool mHasDecodeFailed; // Set true if decoding failed, meaning the sound asset is bad
bool mHasWAVLoadFailed; // Set true if loading the decoded WAV file failed, meaning the sound asset should be decoded instead if
// possible
bool mPinned{ false };
};


Expand Down Expand Up @@ -449,15 +452,28 @@ class LLAudioBuffer
virtual bool loadWAV(const std::string& filename) = 0;
virtual U32 getLength() = 0;

void setPinned(bool pinned) { mPinned = pinned; }
bool isPinned() const { return mPinned; }

friend class LLAudioEngine;
friend class LLAudioChannel;
friend class LLAudioData;
protected:
bool mInUse;
bool mPinned{ false };
LLAudioData *mAudioDatap;
LLFrameTimer mLastUseTimer;
};

inline void LLAudioData::setPinned(const bool pinned)
{
mPinned = pinned;
if (mBufferp)
{
mBufferp->setPinned(pinned);
}
}

struct SoundData
{
LLUUID audio_uuid;
Expand Down
66 changes: 34 additions & 32 deletions indra/newview/llvieweraudio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,38 +359,40 @@ void init_audio()

if (!mute_audio && false == gSavedSettings.getBOOL("NoPreload"))
{
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndAlert")));
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndBadKeystroke")));
//gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndChatFromObject")));
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndClick")));
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndClickRelease")));
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndHealthReductionF")));
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndHealthReductionM")));
//gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndIncomingChat")));
//gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndIncomingIM")));
//gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndInvApplyToObject")));
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndInvalidOp")));
//gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndInventoryCopyToInv")));
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndMoneyChangeDown")));
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndMoneyChangeUp")));
//gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndObjectCopyToInv")));
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndObjectCreate")));
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndObjectDelete")));
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndObjectRezIn")));
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndObjectRezOut")));
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndSnapshot")));
//gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndStartAutopilot")));
//gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndStartFollowpilot")));
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndStartIM")));
//gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndStopAutopilot")));
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndTeleportOut")));
//gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndTextureApplyToObject")));
//gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndTextureCopyToInv")));
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndTyping")));
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndWindowClose")));
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndWindowOpen")));
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndRestart")));
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndChatMention")));
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndAlert")), true);
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndBadKeystroke")), true);
//gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndChatFromObject")), true);
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndClick")), true);
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndClickRelease")), true);
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndHealthReductionF")), true);
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndHealthReductionM")), true);
//gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndIncomingChat")), true);
//gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndIncomingIM")), true);
//gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndInvApplyToObject")), true);
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndInvalidOp")), true);
//gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndInventoryCopyToInv")), true);
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndMoneyChangeDown")), true);
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndMoneyChangeUp")), true);
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndNewIncomingIMSession")), true);
//gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndObjectCopyToInv")), true);
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndObjectCreate")), true);
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndObjectDelete")), true);
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndObjectRezIn")), true);
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndObjectRezOut")), true);
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndSnapshot")), true);
//gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndStartAutopilot")), true);
//gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndStartFollowpilot")), true);
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndStartIM")), true);
//gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndStopAutopilot")), true);
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndTeleportOut")), true);
//gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndTextureApplyToObject")), true);
//gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndTextureCopyToInv")), true);
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndTyping")), true);
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndWindowClose")), true);
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndWindowOpen")), true);
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndRestart")), true);
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndChatMention")), true);
gAudiop->preloadSound(LLUUID(gSavedSettings.getString("UISndChatPing")), true);
}

audio_update_volume(true);
Expand Down
Loading