Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-25 01:03:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

handle AudioInjectorManager for scripted ACs

Browse source
This commit is contained in:
Stephen Birarda 2015-11-17 17:01:11 -08:00
parent 935c0cc137
commit 8e4d7c69ce
3 changed files with 42 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
assignment-client/src/Agent.cpp
View file

@ -16,8 +16,9 @@
#include <QtNetwork/QNetworkRequest>
#include <QtNetwork/QNetworkReply>
#include <AssetClient.h>
#include <AvatarHashMap.h>
#include <AudioInjectorManager.h>
#include <AssetClient.h>
#include <NetworkAccessManager.h>
#include <NodeList.h>
#include <udt/PacketHeaders.h>
@ -43,7 +44,7 @@ Agent::Agent(NLPacket& packet) :
DEFAULT_WINDOW_SECONDS_FOR_DESIRED_REDUCTION, false))
{
DependencyManager::get<EntityScriptingInterface>()->setPacketSender(&_entityEditSender);
auto assetClient = DependencyManager::set<AssetClient>();
QThread* assetThread = new QThread;
@ -54,6 +55,8 @@ Agent::Agent(NLPacket& packet) :
DependencyManager::set<ResourceCacheSharedItems>();
DependencyManager::set<SoundCache>();
DependencyManager::set<AudioInjectorManager>();
auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();
@ -396,6 +399,9 @@ void Agent::aboutToFinish() {
DependencyManager::destroy<AssetClient>();
assetThread->quit();
assetThread->wait();
// cleanup the AudioInjectorManager (and any still running injectors)
DependencyManager::set<AudioInjectorManager>();
}
void Agent::sendPingRequests() {

2
examples/tests/injectorTest.js
View file

@ -11,7 +11,7 @@
var soundURL = "http://hifi-public.s3.amazonaws.com/birarda/medium-crowd.wav";
var audioOptions = {
position: MyAvatar.position,
position: { x: 0.0, y: 0.0, z: 0.0 },
volume: 0.5
};

56
libraries/audio/src/AudioInjectorManager.cpp
View file

@ -76,25 +76,28 @@ void AudioInjectorManager::run() {
_injectorReady.wait_for(lock, std::chrono::microseconds(difference));
}
// loop through the injectors in the map and send whatever frames need to go out
auto front = _injectors.front();
while (_injectors.size() > 0 && front.first <= usecTimestampNow()) {
// either way we're popping this injector off - get a copy first
auto injector = front.second;
_injectors.pop();
if (!injector.isNull()) {
// this is an injector that's ready to go, have it send a frame now
auto nextCallDelta = injector->injectNextFrame();
if (_injectors.size() > 0) {
// loop through the injectors in the map and send whatever frames need to go out
auto front = _injectors.front();
while (_injectors.size() > 0 && front.first <= usecTimestampNow()) {
// either way we're popping this injector off - get a copy first
auto injector = front.second;
_injectors.pop();
if (nextCallDelta > 0 && !injector->isFinished()) {
// re-enqueue the injector with the correct timing
_injectors.push({ usecTimestampNow() + nextCallDelta, injector });
if (!injector.isNull()) {
// this is an injector that's ready to go, have it send a frame now
auto nextCallDelta = injector->injectNextFrame();
if (nextCallDelta > 0 && !injector->isFinished()) {
// re-enqueue the injector with the correct timing
_injectors.push({ usecTimestampNow() + nextCallDelta, injector });
}
}
front = _injectors.front();
}
front = _injectors.front();
}
} else {
// we have no current injectors, wait until we get at least one before we do anything
_injectorReady.wait(lock);
@ -110,6 +113,11 @@ void AudioInjectorManager::run() {
static const int MAX_INJECTORS_PER_THREAD = 50; // calculated based on AudioInjector while loop time, with sufficient padding
bool AudioInjectorManager::threadInjector(AudioInjector* injector) {
if (_shouldStop) {
qDebug() << "AudioInjectorManager::threadInjector asked to thread injector but is shutting down.";
return false;
}
// guard the injectors vector with a mutex
std::unique_lock<std::mutex> lock(_injectorsMutex);
@ -140,12 +148,14 @@ bool AudioInjectorManager::threadInjector(AudioInjector* injector) {
}
void AudioInjectorManager::restartFinishedInjector(AudioInjector* injector) {
// guard the injectors vector with a mutex
std::unique_lock<std::mutex> lock(_injectorsMutex);
// add the injector to the queue with a send timestamp of now
_injectors.emplace(usecTimestampNow(), InjectorQPointer { injector });
// notify our wait condition so we can inject two frames for this injector immediately
_injectorReady.notify_one();
if (!_shouldStop) {
// guard the injectors vector with a mutex
std::unique_lock<std::mutex> lock(_injectorsMutex);
// add the injector to the queue with a send timestamp of now
_injectors.emplace(usecTimestampNow(), InjectorQPointer { injector });
// notify our wait condition so we can inject two frames for this injector immediately
_injectorReady.notify_one();
}
}