Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-14 13:36:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

abstract audio ignore caching

Browse source
This commit is contained in:
Zach Pomerantz 2017-02-06 22:38:34 +00:00
parent 207d2e78f0
commit e7cf84324b
2 changed files with 36 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
assignment-client/src/audio/AudioMixerClientData.cpp
View file

@ -59,15 +59,33 @@ AvatarAudioStream* AudioMixerClientData::getAvatarAudioStream() {
return NULL;
}
bool AudioMixerClientData::shouldIgnore(const SharedNodePointer self, const SharedNodePointer node, unsigned int frame) {
// this is symmetric over self / node; they cache their computations to reduce work by 2x
void AudioMixerClientData::IgnoreNodeData::cache(bool shouldIgnore) {
// do not reset the cache until it has been used, to avoid a data race
if (!_flag) {
_ignore = shouldIgnore;
_flag = true;
}
}
auto& localCache = _nodeSourcesIgnoreMap[node->getUUID()];
if (localCache.isCached) {
assert(localCache.isCached.is_lock_free());
bool shouldIgnore = localCache.shouldIgnore;
localCache.isCached = false;
return shouldIgnore;
bool AudioMixerClientData::IgnoreNodeData::isCached() {
assert(_flag.is_lock_free());
return _flag;
}
bool AudioMixerClientData::IgnoreNodeData::shouldIgnore() {
// do not reset the cache until it has been used, to avoid a data race
bool ignore = _ignore;
_flag = false;
return ignore;
}
bool AudioMixerClientData::shouldIgnore(const SharedNodePointer self, const SharedNodePointer node, unsigned int frame) {
// this is symmetric over self / node; if computed, it is cached in the other
// check the cache to avoid computation
auto& cache = _nodeSourcesIgnoreMap[node->getUUID()];
if (cache.isCached()) {
return cache.shouldIgnore();
}
AudioMixerClientData* nodeData = static_cast<AudioMixerClientData*>(node->getLinkedData());
@ -93,12 +111,8 @@ bool AudioMixerClientData::shouldIgnore(const SharedNodePointer self, const Shar
}
}
auto& remoteCache = nodeData->_nodeSourcesIgnoreMap[self->getUUID()];
// do not reset the cache until it has been used to avoid a data race
if (!remoteCache.isCached) {
remoteCache.shouldIgnore = shouldIgnore;
remoteCache.isCached = true;
}
// cache in node
nodeData->_nodeSourcesIgnoreMap[self->getUUID()].cache(shouldIgnore);
return shouldIgnore;
}

11
assignment-client/src/audio/AudioMixerClientData.h
View file

@ -124,9 +124,14 @@ private:
};
IgnoreZoneMemo _ignoreZoneMemo;
struct IgnoreNodeData {
std::atomic<bool> isCached { false };
bool shouldIgnore { false };
class IgnoreNodeData {
public:
void cache(bool shouldIgnore);
bool isCached();
bool shouldIgnore();
private:
std::atomic<bool> _flag { false };
bool _ignore { false };
};
using NodeSourcesIgnoreMap = std::unordered_map<QUuid, IgnoreNodeData>;
NodeSourcesIgnoreMap _nodeSourcesIgnoreMap;