mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 21:23:52 +00:00
Code Issues Releases Wiki Activity

Store sound buffers in a deque that's filled in as needed

Browse source 
A deque allows existing Sound_Buffer references to remain valid as long as new
ones are back-inserted. These references can be used instead of indices.
This commit is contained in:
Chris Robinson 2015-11-26 01:26:33 -08:00
parent 8f08ca9cba
commit 8715add72f
2 changed files with 73 additions and 115 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -119,15 +119,8 @@ namespace MWSound
return DecoderPtr(new DEFAULT_DECODER (mVFS)); return DecoderPtr(new DEFAULT_DECODER (mVFS));
} }
void SoundManager::insertSound(const std::string &soundId, const ESM::Sound *sound) Sound_Buffer *SoundManager::insertSound(const std::string &soundId, const ESM::Sound *sound)
{ {
BufferKeyList::iterator bufkey = std::lower_bound(mBufferKeys.begin(), mBufferKeys.end(), soundId);
if(bufkey != mBufferKeys.end() && *bufkey == soundId)
{
std::cerr<< "Duplicate sound record \""<<soundId<<"\"" <<std::endl;
return;
}
MWBase::World* world = MWBase::Environment::get().getWorld(); MWBase::World* world = MWBase::Environment::get().getWorld();
static const float fAudioDefaultMinDistance = world->getStore().get<ESM::GameSetting>().find("fAudioDefaultMinDistance")->getFloat(); static const float fAudioDefaultMinDistance = world->getStore().get<ESM::GameSetting>().find("fAudioDefaultMinDistance")->getFloat();
static const float fAudioDefaultMaxDistance = world->getStore().get<ESM::GameSetting>().find("fAudioDefaultMaxDistance")->getFloat(); static const float fAudioDefaultMaxDistance = world->getStore().get<ESM::GameSetting>().find("fAudioDefaultMaxDistance")->getFloat();
@ -152,64 +145,40 @@ namespace MWSound
min = std::max(min, 1.0f); min = std::max(min, 1.0f);
max = std::max(min, max); max = std::max(min, max);
Sound_Buffer *sfx; Sound_Buffer *sfx = &*mSoundBuffers.insert(mSoundBuffers.end(),
bufkey = mBufferKeys.insert(bufkey, soundId); Sound_Buffer("Sound/"+sound->mSound, volume, min, max)
try { );
BufferKeyList::difference_type id;
id = std::distance(mBufferKeys.begin(), bufkey);
mSoundBuffers.insert(mSoundBuffers.begin()+id,
Sound_Buffer("Sound/"+sound->mSound, volume, min, max)
);
sfx = &mSoundBuffers[id];
}
catch(...) {
mBufferKeys.erase(bufkey);
throw;
}
mVFS->normalizeFilename(sfx->mResourceName); mVFS->normalizeFilename(sfx->mResourceName);
mBufferNameMap.insert(std::make_pair(soundId, sfx));
return sfx;
} }
size_t SoundManager::lookupId(const std::string &soundId) // Lookup a soundId for its sound data (resource name, local volume,
// minRange, and maxRange)
Sound_Buffer *SoundManager::lookupSound(const std::string &soundId) const
{ {
BufferKeyList::iterator bufkey = std::lower_bound(mBufferKeys.begin(), mBufferKeys.end(), soundId); NameBufferMap::const_iterator snd = mBufferNameMap.find(soundId);
if(bufkey != mBufferKeys.end() && *bufkey == soundId) if(snd != mBufferNameMap.end()) return snd->second;
return std::distance(mBufferKeys.begin(), bufkey); return 0;
}
if(mBufferKeys.empty()) // Lookup a soundId for its sound data (resource name, local volume,
// minRange, and maxRange), and ensure it's ready for use.
Sound_Buffer *SoundManager::loadSound(const std::string &soundId)
{
Sound_Buffer *sfx;
NameBufferMap::const_iterator snd = mBufferNameMap.find(soundId);
if(snd != mBufferNameMap.end())
sfx = snd->second;
else
{ {
MWBase::World *world = MWBase::Environment::get().getWorld(); MWBase::World *world = MWBase::Environment::get().getWorld();
MWWorld::Store<ESM::Sound>::iterator iter = world->getStore().get<ESM::Sound>().begin(); const ESM::Sound *sound = world->getStore().get<ESM::Sound>().find(soundId);
MWWorld::Store<ESM::Sound>::iterator end = world->getStore().get<ESM::Sound>().end(); sfx = insertSound(soundId, sound);
size_t storesize = world->getStore().get<ESM::Sound>().getSize();
mBufferKeys.reserve(storesize);
mSoundBuffers.reserve(storesize);
for(;iter != end;++iter)
insertSound(Misc::StringUtils::lowerCase(iter->mId), &*iter);
bufkey = std::lower_bound(mBufferKeys.begin(), mBufferKeys.end(), soundId);
if(bufkey != mBufferKeys.end() && *bufkey == soundId)
return std::distance(mBufferKeys.begin(), bufkey);
} }
throw std::runtime_error("Sound "+soundId+" not found");
}
size_t SoundManager::lookupId(const std::string& soundId) const
{
BufferKeyList::const_iterator bufkey = std::lower_bound(mBufferKeys.begin(), mBufferKeys.end(), soundId);
if(bufkey != mBufferKeys.end() && *bufkey == soundId)
return std::distance(mBufferKeys.begin(), bufkey);
throw std::runtime_error("Sound "+soundId+" not found");
}
// Lookup a sfxid for its sound data (resource name, local volume,
// minRange, and maxRange).
Sound_Buffer *SoundManager::lookup(size_t sfxid)
{
Sound_Buffer *sfx = &mSoundBuffers[sfxid];
if(!sfx->mHandle) if(!sfx->mHandle)
{ {
sfx->mHandle = mOutput->loadSound(sfx->mResourceName); sfx->mHandle = mOutput->loadSound(sfx->mResourceName);
@ -223,7 +192,7 @@ namespace MWSound
std::cerr<< "No unused sound buffers to free, using "<<mBufferCacheSize<<" bytes!" <<std::endl; std::cerr<< "No unused sound buffers to free, using "<<mBufferCacheSize<<" bytes!" <<std::endl;
break; break;
} }
Sound_Buffer *unused = &mSoundBuffers[mUnusedBuffers.back()]; Sound_Buffer *unused = mUnusedBuffers.back();
mBufferCacheSize -= mOutput->getSoundDataSize(unused->mHandle); mBufferCacheSize -= mOutput->getSoundDataSize(unused->mHandle);
mOutput->unloadSound(unused->mHandle); mOutput->unloadSound(unused->mHandle);
@ -231,19 +200,12 @@ namespace MWSound
mUnusedBuffers.pop_back(); mUnusedBuffers.pop_back();
} }
mUnusedBuffers.push_front(sfxid); mUnusedBuffers.push_front(sfx);
} }
return sfx; return sfx;
} }
// Lookup a soundid for its sound data (resource name, local volume,
// minRange, and maxRange).
Sound_Buffer *SoundManager::lookup(const std::string &soundId)
{
return lookup(lookupId(soundId));
}
DecoderPtr SoundManager::loadVoice(const std::string &voicefile) DecoderPtr SoundManager::loadVoice(const std::string &voicefile)
{ {
DecoderPtr decoder = getDecoder(); DecoderPtr decoder = getDecoder();
@ -511,8 +473,7 @@ namespace MWSound
return sound; return sound;
try try
{ {
size_t sfxid = lookupId(Misc::StringUtils::lowerCase(soundId)); Sound_Buffer *sfx = loadSound(Misc::StringUtils::lowerCase(soundId));
Sound_Buffer *sfx = lookup(sfxid);
float basevol = volumeFromType(type); float basevol = volumeFromType(type);
sound = mOutput->playSound(sfx->mHandle, sound = mOutput->playSound(sfx->mHandle,
@ -520,11 +481,11 @@ namespace MWSound
); );
if(sfx->mUses++ == 0) if(sfx->mUses++ == 0)
{ {
SoundList::iterator iter = std::find(mUnusedBuffers.begin(), mUnusedBuffers.end(), sfxid); SoundList::iterator iter = std::find(mUnusedBuffers.begin(), mUnusedBuffers.end(), sfx);
if(iter != mUnusedBuffers.end()) if(iter != mUnusedBuffers.end())
mUnusedBuffers.erase(iter); mUnusedBuffers.erase(iter);
} }
mActiveSounds[MWWorld::Ptr()].push_back(std::make_pair(sound, sfxid)); mActiveSounds[MWWorld::Ptr()].push_back(std::make_pair(sound, sfx));
} }
catch(std::exception&) catch(std::exception&)
{ {
@ -542,8 +503,7 @@ namespace MWSound
try try
{ {
// Look up the sound in the ESM data // Look up the sound in the ESM data
size_t sfxid = lookupId(Misc::StringUtils::lowerCase(soundId)); Sound_Buffer *sfx = loadSound(Misc::StringUtils::lowerCase(soundId));
Sound_Buffer *sfx = lookup(sfxid);
float basevol = volumeFromType(type); float basevol = volumeFromType(type);
const ESM::Position &pos = ptr.getRefData().getPosition(); const ESM::Position &pos = ptr.getRefData().getPosition();
const osg::Vec3f objpos(pos.asVec3()); const osg::Vec3f objpos(pos.asVec3());
@ -556,11 +516,11 @@ namespace MWSound
); );
if(sfx->mUses++ == 0) if(sfx->mUses++ == 0)
{ {
SoundList::iterator iter = std::find(mUnusedBuffers.begin(), mUnusedBuffers.end(), sfxid); SoundList::iterator iter = std::find(mUnusedBuffers.begin(), mUnusedBuffers.end(), sfx);
if(iter != mUnusedBuffers.end()) if(iter != mUnusedBuffers.end())
mUnusedBuffers.erase(iter); mUnusedBuffers.erase(iter);
} }
mActiveSounds[ptr].push_back(std::make_pair(sound, sfxid)); mActiveSounds[ptr].push_back(std::make_pair(sound, sfx));
} }
catch(std::exception&) catch(std::exception&)
{ {
@ -578,8 +538,7 @@ namespace MWSound
try try
{ {
// Look up the sound in the ESM data // Look up the sound in the ESM data
size_t sfxid = lookupId(Misc::StringUtils::lowerCase(soundId)); Sound_Buffer *sfx = loadSound(Misc::StringUtils::lowerCase(soundId));
Sound_Buffer *sfx = lookup(sfxid);
float basevol = volumeFromType(type); float basevol = volumeFromType(type);
sound = mOutput->playSound3D(sfx->mHandle, sound = mOutput->playSound3D(sfx->mHandle,
@ -587,11 +546,11 @@ namespace MWSound
); );
if(sfx->mUses++ == 0) if(sfx->mUses++ == 0)
{ {
SoundList::iterator iter = std::find(mUnusedBuffers.begin(), mUnusedBuffers.end(), sfxid); SoundList::iterator iter = std::find(mUnusedBuffers.begin(), mUnusedBuffers.end(), sfx);
if(iter != mUnusedBuffers.end()) if(iter != mUnusedBuffers.end())
mUnusedBuffers.erase(iter); mUnusedBuffers.erase(iter);
} }
mActiveSounds[MWWorld::Ptr()].push_back(std::make_pair(sound, sfxid)); mActiveSounds[MWWorld::Ptr()].push_back(std::make_pair(sound, sfx));
} }
catch(std::exception &) catch(std::exception &)
{ {
@ -605,11 +564,11 @@ namespace MWSound
SoundMap::iterator snditer = mActiveSounds.find(ptr); SoundMap::iterator snditer = mActiveSounds.find(ptr);
if(snditer != mActiveSounds.end()) if(snditer != mActiveSounds.end())
{ {
size_t sfxid = lookupId(Misc::StringUtils::lowerCase(soundId)); Sound_Buffer *sfx = loadSound(Misc::StringUtils::lowerCase(soundId));
SoundIndexPairList::iterator sndidx = snditer->second.begin(); SoundBufferRefPairList::iterator sndidx = snditer->second.begin();
for(;sndidx != snditer->second.end();++sndidx) for(;sndidx != snditer->second.end();++sndidx)
{ {
if(sndidx->second == sfxid) if(sndidx->second == sfx)
sndidx->first->stop(); sndidx->first->stop();
} }
} }
@ -620,7 +579,7 @@ namespace MWSound
SoundMap::iterator snditer = mActiveSounds.find(ptr); SoundMap::iterator snditer = mActiveSounds.find(ptr);
if(snditer != mActiveSounds.end()) if(snditer != mActiveSounds.end())
{ {
SoundIndexPairList::iterator sndidx = snditer->second.begin(); SoundBufferRefPairList::iterator sndidx = snditer->second.begin();
for(;sndidx != snditer->second.end();++sndidx) for(;sndidx != snditer->second.end();++sndidx)
sndidx->first->stop(); sndidx->first->stop();
} }
@ -635,7 +594,7 @@ namespace MWSound
snditer->first != MWMechanics::getPlayer() && snditer->first != MWMechanics::getPlayer() &&
snditer->first.getCell() == cell) snditer->first.getCell() == cell)
{ {
SoundIndexPairList::iterator sndidx = snditer->second.begin(); SoundBufferRefPairList::iterator sndidx = snditer->second.begin();
for(;sndidx != snditer->second.end();++sndidx) for(;sndidx != snditer->second.end();++sndidx)
sndidx->first->stop(); sndidx->first->stop();
} }
@ -659,11 +618,11 @@ namespace MWSound
SoundMap::iterator snditer = mActiveSounds.find(MWWorld::Ptr()); SoundMap::iterator snditer = mActiveSounds.find(MWWorld::Ptr());
if(snditer != mActiveSounds.end()) if(snditer != mActiveSounds.end())
{ {
size_t sfxid = lookupId(Misc::StringUtils::lowerCase(soundId)); Sound_Buffer *sfx = loadSound(Misc::StringUtils::lowerCase(soundId));
SoundIndexPairList::iterator sndidx = snditer->second.begin(); SoundBufferRefPairList::iterator sndidx = snditer->second.begin();
for(;sndidx != snditer->second.end();++sndidx) for(;sndidx != snditer->second.end();++sndidx)
{ {
if(sndidx->second == sfxid) if(sndidx->second == sfx)
sndidx->first->stop(); sndidx->first->stop();
} }
} }
@ -675,11 +634,11 @@ namespace MWSound
SoundMap::iterator snditer = mActiveSounds.find(ptr); SoundMap::iterator snditer = mActiveSounds.find(ptr);
if(snditer != mActiveSounds.end()) if(snditer != mActiveSounds.end())
{ {
size_t sfxid = lookupId(Misc::StringUtils::lowerCase(soundId)); Sound_Buffer *sfx = loadSound(Misc::StringUtils::lowerCase(soundId));
SoundIndexPairList::iterator sndidx = snditer->second.begin(); SoundBufferRefPairList::iterator sndidx = snditer->second.begin();
for(;sndidx != snditer->second.end();++sndidx) for(;sndidx != snditer->second.end();++sndidx)
{ {
if(sndidx->second == sfxid) if(sndidx->second == sfx)
sndidx->first->setFadeout(duration); sndidx->first->setFadeout(duration);
} }
} }
@ -690,11 +649,11 @@ namespace MWSound
SoundMap::const_iterator snditer = mActiveSounds.find(ptr); SoundMap::const_iterator snditer = mActiveSounds.find(ptr);
if(snditer != mActiveSounds.end()) if(snditer != mActiveSounds.end())
{ {
size_t sfxid = lookupId(Misc::StringUtils::lowerCase(soundId)); Sound_Buffer *sfx = lookupSound(Misc::StringUtils::lowerCase(soundId));
SoundIndexPairList::const_iterator sndidx = snditer->second.begin(); SoundBufferRefPairList::const_iterator sndidx = snditer->second.begin();
for(;sndidx != snditer->second.end();++sndidx) for(;sndidx != snditer->second.end();++sndidx)
{ {
if(sndidx->second == sfxid && sndidx->first->isPlaying()) if(sndidx->second == sfx && sndidx->first->isPlaying())
return true; return true;
} }
} }
@ -825,14 +784,14 @@ namespace MWSound
SoundMap::iterator snditer = mActiveSounds.begin(); SoundMap::iterator snditer = mActiveSounds.begin();
while(snditer != mActiveSounds.end()) while(snditer != mActiveSounds.end())
{ {
SoundIndexPairList::iterator sndidx = snditer->second.begin(); SoundBufferRefPairList::iterator sndidx = snditer->second.begin();
while(sndidx != snditer->second.end()) while(sndidx != snditer->second.end())
{ {
if(!updateSound(sndidx->first, snditer->first, duration)) if(!updateSound(sndidx->first, snditer->first, duration))
{ {
Sound_Buffer *sfx = &mSoundBuffers[sndidx->second]; Sound_Buffer *sfx = sndidx->second;
if(sfx->mUses-- == 1) if(sfx->mUses-- == 1)
mUnusedBuffers.push_front(sndidx->second); mUnusedBuffers.push_front(sfx);
sndidx = snditer->second.erase(sndidx); sndidx = snditer->second.erase(sndidx);
} }
else else
@ -916,7 +875,7 @@ namespace MWSound
SoundMap::iterator snditer = mActiveSounds.begin(); SoundMap::iterator snditer = mActiveSounds.begin();
for(;snditer != mActiveSounds.end();++snditer) for(;snditer != mActiveSounds.end();++snditer)
{ {
SoundIndexPairList::iterator sndidx = snditer->second.begin(); SoundBufferRefPairList::iterator sndidx = snditer->second.begin();
for(;sndidx != snditer->second.end();++sndidx) for(;sndidx != snditer->second.end();++sndidx)
{ {
MWBase::SoundPtr sound = sndidx->first; MWBase::SoundPtr sound = sndidx->first;
@ -956,7 +915,7 @@ namespace MWSound
SoundMap::iterator snditer = mActiveSounds.find(old); SoundMap::iterator snditer = mActiveSounds.find(old);
if(snditer != mActiveSounds.end()) if(snditer != mActiveSounds.end())
{ {
SoundIndexPairList sndlist = snditer->second; SoundBufferRefPairList sndlist = snditer->second;
mActiveSounds.erase(snditer); mActiveSounds.erase(snditer);
mActiveSounds[updated] = sndlist; mActiveSounds[updated] = sndlist;
} }
@ -1039,13 +998,13 @@ namespace MWSound
SoundMap::iterator snditer = mActiveSounds.begin(); SoundMap::iterator snditer = mActiveSounds.begin();
for(;snditer != mActiveSounds.end();++snditer) for(;snditer != mActiveSounds.end();++snditer)
{ {
SoundIndexPairList::iterator sndidx = snditer->second.begin(); SoundBufferRefPairList::iterator sndidx = snditer->second.begin();
for(;sndidx != snditer->second.end();++sndidx) for(;sndidx != snditer->second.end();++sndidx)
{ {
sndidx->first->stop(); sndidx->first->stop();
Sound_Buffer *sfx = &mSoundBuffers[sndidx->second]; Sound_Buffer *sfx = sndidx->second;
if(sfx->mUses-- == 1) if(sfx->mUses-- == 1)
mUnusedBuffers.push_front(sndidx->second); mUnusedBuffers.push_front(sfx);
} }
} }
mActiveSounds.clear(); mActiveSounds.clear();

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

@ -51,28 +51,29 @@ namespace MWSound
float mVoiceVolume; float mVoiceVolume;
float mFootstepsVolume; float mFootstepsVolume;
typedef std::vector<std::string> BufferKeyList; typedef std::deque<Sound_Buffer> SoundBufferList;
typedef std::vector<Sound_Buffer> SoundBufferList; // List of sound buffers, grown as needed. New enties are added to the
// Each mBufferKeys index has a corresponding entry in mSoundBuffers. // back, allowing existing Sound_Buffer references/pointers to remain
// That is, if string "foo" is at index 10 in mBufferKeys, index 10 in // valid.
// mSoundBuffers contains the Sound_Buffer for "foo".
BufferKeyList mBufferKeys;
SoundBufferList mSoundBuffers; SoundBufferList mSoundBuffers;
size_t mBufferCacheSize; size_t mBufferCacheSize;
typedef std::map<std::string,Sound_Buffer*> NameBufferMap;
NameBufferMap mBufferNameMap;
typedef std::map<std::string,Sound_Loudness> NameLoudnessMap; typedef std::map<std::string,Sound_Loudness> NameLoudnessMap;
NameLoudnessMap mVoiceLipBuffers; NameLoudnessMap mVoiceLipBuffers;
// NOTE: unused buffers are stored in front-newest order. // NOTE: unused buffers are stored in front-newest order.
typedef std::deque<size_t> SoundList; typedef std::deque<Sound_Buffer*> SoundList;
SoundList mUnusedBuffers; SoundList mUnusedBuffers;
boost::shared_ptr<Sound> mMusic; boost::shared_ptr<Sound> mMusic;
std::string mCurrentPlaylist; std::string mCurrentPlaylist;
typedef std::pair<MWBase::SoundPtr,size_t> SoundIndexPair; typedef std::pair<MWBase::SoundPtr,Sound_Buffer*> SoundBufferRefPair;
typedef std::vector<SoundIndexPair> SoundIndexPairList; typedef std::vector<SoundBufferRefPair> SoundBufferRefPairList;
typedef std::map<MWWorld::Ptr,SoundIndexPairList> SoundMap; typedef std::map<MWWorld::Ptr,SoundBufferRefPairList> SoundMap;
SoundMap mActiveSounds; SoundMap mActiveSounds;
typedef std::pair<MWBase::SoundPtr,std::string> SoundNamePair; typedef std::pair<MWBase::SoundPtr,std::string> SoundNamePair;
@ -88,12 +89,10 @@ namespace MWSound
int mPausedSoundTypes; int mPausedSoundTypes;
void insertSound(const std::string &soundId, const ESM::Sound *sound); Sound_Buffer *insertSound(const std::string &soundId, const ESM::Sound *sound);
size_t lookupId(const std::string &soundId); Sound_Buffer *lookupSound(const std::string &soundId) const;
size_t lookupId(const std::string &soundId) const; Sound_Buffer *loadSound(const std::string &soundId);
Sound_Buffer *lookup(size_t sfxid);
Sound_Buffer *lookup(const std::string &soundId);
// Ensures the loudness/"lip" data is loaded, and returns a decoder to // Ensures the loudness/"lip" data is loaded, and returns a decoder to
// start streaming // start streaming