mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-30 04:15:31 +00:00
Code Issues Releases Wiki Activity

Use separate lists for the sound name and its buffer

Browse source 
This should make sound lookup a bit more efficient, especially when an integer
ID can be used.
This commit is contained in:
Chris Robinson 2015-11-24 00:03:54 -08:00
parent fbfcc4050f
commit 6c3953766e
2 changed files with 61 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
apps/openmw/mwsound/soundmanagerimp.cpp
View file

@ -101,12 +101,12 @@ namespace MWSound
clear();
if(mOutput->isInitialized())
{
NameBufferMap::iterator sfxiter = mSoundBuffers.begin();
SoundBufferList::iterator sfxiter = mSoundBuffers.begin();
for(;sfxiter != mSoundBuffers.end();++sfxiter)
{
if(sfxiter->second.mHandle)
mOutput->unloadSound(sfxiter->second.mHandle);
sfxiter->second.mHandle = 0;
if(sfxiter->mHandle)
mOutput->unloadSound(sfxiter->mHandle);
sfxiter->mHandle = 0;
}
}
mOutput.reset();
@ -122,11 +122,11 @@ namespace MWSound
// minRange and maxRange. The returned pointer is only valid temporarily.
Sound_Buffer *SoundManager::lookup(const std::string &soundId)
{
NameBufferMap::iterator sfxiter = mSoundBuffers.find(soundId);
if(sfxiter != mSoundBuffers.end() && sfxiter->second.mHandle)
return &sfxiter->second;
if(sfxiter == mSoundBuffers.end())
Sound_Buffer *sfx;
BufferKeyList::iterator bufkey = std::lower_bound(mBufferKeys.begin(), mBufferKeys.end(), soundId);
if(bufkey != mBufferKeys.end() && *bufkey == soundId)
sfx = &mSoundBuffers[std::distance(mBufferKeys.begin(), bufkey)];
else
{
// TODO: We could process all available ESM::Sound records on init
// to pre-fill a non-resizing list, which would allow subsystems to
@ -157,31 +157,45 @@ namespace MWSound
min = std::max(min, 1.0f);
max = std::max(min, max);
sfxiter = mSoundBuffers.insert(std::make_pair(
soundId, Sound_Buffer("Sound/"+snd->mSound, volume, min, max)
)).first;
mVFS->normalizeFilename(sfxiter->second.mResourceName);
}
Sound_Buffer *sfx = &sfxiter->second;
sfx->mHandle = mOutput->loadSound(sfx->mResourceName);
mBufferCacheSize += mOutput->getSoundDataSize(sfx->mHandle);
// NOTE: Max sound buffer cache size is 15MB. Make configurable?
while(mBufferCacheSize > 15*1024*1024)
{
if(mUnusedBuffers.empty())
{
std::cerr<< "No unused sound buffers to free, using "<<mBufferCacheSize<<" bytes!" <<std::endl;
break;
bufkey = mBufferKeys.insert(bufkey, soundId);
try {
BufferKeyList::difference_type id;
id = std::distance(mBufferKeys.begin(), bufkey);
mSoundBuffers.insert(mSoundBuffers.begin()+id,
Sound_Buffer("Sound/"+snd->mSound, volume, min, max)
);
sfx = &mSoundBuffers[id];
}
SoundSet::iterator iter = mUnusedBuffers.begin();
sfxiter = mSoundBuffers.find(*iter);
mBufferCacheSize -= mOutput->getSoundDataSize(sfxiter->second.mHandle);
mOutput->unloadSound(sfxiter->second.mHandle);
mUnusedBuffers.erase(iter);
catch(...) {
mBufferKeys.erase(bufkey);
throw;
}
mVFS->normalizeFilename(sfx->mResourceName);
}
if(!sfx->mHandle)
{
sfx->mHandle = mOutput->loadSound(sfx->mResourceName);
mBufferCacheSize += mOutput->getSoundDataSize(sfx->mHandle);
// NOTE: Max sound buffer cache size is 15MB. Make configurable?
while(mBufferCacheSize > 15*1024*1024)
{
if(mUnusedBuffers.empty())
{
std::cerr<< "No unused sound buffers to free, using "<<mBufferCacheSize<<" bytes!" <<std::endl;
break;
}
SoundSet::iterator iter = mUnusedBuffers.begin();
bufkey = std::lower_bound(mBufferKeys.begin(), mBufferKeys.end(), *iter);
Sound_Buffer *unused = &mSoundBuffers[std::distance(mBufferKeys.begin(), bufkey)];
mBufferCacheSize -= mOutput->getSoundDataSize(unused->mHandle);
mOutput->unloadSound(unused->mHandle);
mUnusedBuffers.erase(iter);
}
mUnusedBuffers.insert(soundId);
}
mUnusedBuffers.insert(soundId);
return sfx;
}
@ -773,8 +787,10 @@ namespace MWSound
{
if(!updateSound(sndname->first, snditer->first, duration))
{
NameBufferMap::iterator sfxiter = mSoundBuffers.find(sndname->second);
if(sfxiter->second.mReferences-- == 1)
BufferKeyList::iterator bufkey = std::lower_bound(mBufferKeys.begin(), mBufferKeys.end(),
sndname->second);
Sound_Buffer *sfx = &mSoundBuffers[std::distance(mBufferKeys.begin(), bufkey)];
if(sfx->mReferences-- == 1)
mUnusedBuffers.insert(sndname->second);
sndname = snditer->second.erase(sndname);
}
@ -981,8 +997,10 @@ namespace MWSound
for(;sndname != snditer->second.end();++sndname)
{
sndname->first->stop();
NameBufferMap::iterator sfxiter = mSoundBuffers.find(sndname->second);
if(sfxiter->second.mReferences-- == 1)
BufferKeyList::iterator bufkey = std::lower_bound(mBufferKeys.begin(), mBufferKeys.end(),
sndname->second);
Sound_Buffer *sfx = &mSoundBuffers[std::distance(mBufferKeys.begin(), bufkey)];
if(sfx->mReferences-- == 1)
mUnusedBuffers.insert(sndname->second);
}
}

9
apps/openmw/mwsound/soundmanagerimp.hpp
View file

@ -45,8 +45,13 @@ namespace MWSound
float mVoiceVolume;
float mFootstepsVolume;
typedef std::map<std::string,Sound_Buffer> NameBufferMap;
NameBufferMap mSoundBuffers;
typedef std::vector<std::string> BufferKeyList;
typedef std::vector<Sound_Buffer> SoundBufferList;
// Each mBufferKeys index has a corresponding entry in mSoundBuffers.
// That is, if string "foo" is at index 10 in mBufferKeys, index 10 in
// mSoundBuffers contains the Sound_Buffer for "foo".
BufferKeyList mBufferKeys;
SoundBufferList mSoundBuffers;
size_t mBufferCacheSize;
typedef std::map<std::string,Sound_Loudness> NameLoudnessMap;