Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 17:55:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix audio pool resizing

Browse source
This commit is contained in:
Zach Pomerantz 2016-12-01 21:25:56 +00:00
parent 2c42bb0aa8
commit 78bc5cf502
2 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
assignment-client/src/audio/AudioMixerSlavePool.cpp
View file

@ -56,7 +56,7 @@ AudioMixerSlavePool::~AudioMixerSlavePool() {
Lock lock(_mutex);
wait(lock);
}
setNumThreads(0);
resize(0);
}
void AudioMixerSlavePool::mix(ConstIter begin, ConstIter end, unsigned int frame) {
@ -107,21 +107,30 @@ void AudioMixerSlavePool::wait(Lock& lock) {
}
void AudioMixerSlavePool::setNumThreads(int numThreads) {
Lock lock(_mutex);
// ensure slave are not running
assert(!_running);
// clamp to allowed size
{
// idealThreadCount returns -1 if cores cannot be detected - cast it to a large number
int maxThreads = (int)((unsigned int)QThread::idealThreadCount());
int maxThreads = QThread::idealThreadCount();
if (maxThreads == -1) {
// idealThreadCount returns -1 if cores cannot be detected
maxThreads = std::numeric_limits<int>::max();
}
int clampedThreads = std::min(std::max(1, numThreads), maxThreads);
if (clampedThreads != numThreads) {
qWarning("%s: clamped to %d (was %d)", __FUNCTION__, numThreads, clampedThreads);
numThreads = clampedThreads;
}
}
resize(numThreads);
}
void AudioMixerSlavePool::resize(int numThreads) {
Lock lock(_mutex);
// ensure slave are not running
assert(!_running);
qDebug("%s: set %d threads", __FUNCTION__, numThreads);
if (numThreads > _numThreads) {
@ -147,7 +156,8 @@ void AudioMixerSlavePool::setNumThreads(int numThreads) {
// ...wait for them to finish...
slave = extraBegin;
while (slave != _slaves.end()) {
(*slave)->wait();
QThread* thread = reinterpret_cast<QThread*>(slave->get());
thread->wait();
}
// ...and delete them

2
assignment-client/src/audio/AudioMixerSlavePool.h
View file

@ -75,6 +75,8 @@ private:
void start(Lock& lock, ConstIter begin = ConstIter(), ConstIter end = ConstIter(), unsigned int frame = 0);
void wait(Lock& lock);
void resize(int numThreads);
std::vector<std::unique_ptr<AudioMixerSlaveThread>> _slaves;
friend void AudioMixerSlaveThread::wait();