PR feedback

AgentAvatarTimer now in its own files.  The thread still is created
the same way, and started only when you are an avatar, but now I
remember to stop it when you no longer are one.  Audio is still at
100Hz, but avatar messages go at 60Hz as before.  Unsure it matters,
but easy to do.   Looking at that buzz now.

assignment-client/src/Agent.cpp

@@ -46,26 +46,10 @@
 #include "AbstractAudioInterface.h"
 
 #include "Agent.h"
+#include "AvatarAudioTimer.h"
 
 static const int RECEIVED_AUDIO_STREAM_CAPACITY_FRAMES = 10;
 
-// this should send a signal every 10ms, with pretty good precision
-void AvatarAudioTimer::start() {
-    qDebug() << "AvatarAudioTimer::start called";
-    auto startTime = usecTimestampNow();
-    quint64 frameCounter = 0;
-    const int TARGET_INTERVAL_USEC = 10000; // 10ms
-    while (!_quit) {
-        frameCounter++;
-        // simplest possible timer
-        quint64 targetTime = startTime + frameCounter * TARGET_INTERVAL_USEC;
-        quint64 interval = std::max((quint64)0, targetTime - usecTimestampNow());
-        usleep(interval);
-        emit avatarTick();
-    }
-    qDebug() << "AvatarAudioTimer is finished";
-}
-
 Agent::Agent(ReceivedMessage& message) :
     ThreadedAssignment(message),
     _entityEditSender(),
@@ -399,14 +383,17 @@ void Agent::executeScript() {
 
     DependencyManager::set<AssignmentParentFinder>(_entityViewer.getTree());
     
+    // 100Hz timer for audio
     AvatarAudioTimer* audioTimerWorker = new AvatarAudioTimer();
     audioTimerWorker->moveToThread(&_avatarAudioTimerThread);
-    connect(audioTimerWorker, &AvatarAudioTimer::avatarTick, this, &Agent::processAgentAvatarAndAudio);
+    connect(audioTimerWorker, &AvatarAudioTimer::avatarTick, this, &Agent::processAgentAvatarAudio);
     connect(this, &Agent::startAvatarAudioTimer, audioTimerWorker, &AvatarAudioTimer::start);
     connect(this, &Agent::stopAvatarAudioTimer, audioTimerWorker, &AvatarAudioTimer::stop);
     connect(&_avatarAudioTimerThread, &QThread::finished, audioTimerWorker, &QObject::deleteLater); 
     _avatarAudioTimerThread.start();
     
+    // 60Hz timer for avatar
+    QObject::connect(_scriptEngine.get(), &ScriptEngine::update, this, &Agent::processAgentAvatar);
     _scriptEngine->run();
 
     Frame::clearFrameHandler(AUDIO_FRAME_TYPE);
@@ -460,6 +447,7 @@ void Agent::setIsAvatar(bool isAvatar) {
                 nodeList->sendPacketList(std::move(packetList), *node);
             });
         }
+        emit stopAvatarAudioTimer();
     }
 }
 
@@ -470,7 +458,7 @@ void Agent::sendAvatarIdentityPacket() {
     }
 }
 
-void Agent::processAgentAvatarAndAudio() {
+void Agent::processAgentAvatar() {
     if (!_scriptEngine->isFinished() && _isAvatar) {
         auto scriptedAvatar = DependencyManager::get<ScriptableAvatar>();
 
@@ -486,9 +474,13 @@ void Agent::processAgentAvatarAndAudio() {
         auto nodeList = DependencyManager::get<NodeList>();
 
         nodeList->broadcastToNodes(std::move(avatarPacket), NodeSet() << NodeType::AvatarMixer);
+    }
+}
 
-        if (_isListeningToAudioStream || _avatarSound) {
+void Agent::processAgentAvatarAudio() {
+    if (_isAvatar && (_isListeningToAudioStream || _avatarSound)) {
         // if we have an avatar audio stream then send it out to our audio-mixer
+        auto scriptedAvatar = DependencyManager::get<ScriptableAvatar>();
         bool silentFrame = true;
 
         int16_t numAvailableSamples = AudioConstants::NETWORK_FRAME_SAMPLES_PER_CHANNEL;
@@ -544,6 +536,7 @@ void Agent::processAgentAvatarAndAudio() {
             audioPacket->writePrimitive(headOrientation);
 
         } else if (nextSoundOutput) {
+            
             // write the codec
             audioPacket->writeString(_selectedCodecName);
 
@@ -583,7 +576,6 @@ void Agent::processAgentAvatarAndAudio() {
         });
     }
 }
-}
 
 void Agent::aboutToFinish() {
     setIsAvatar(false);// will stop timers for sending identity packets

assignment-client/src/Agent.h

@@ -31,21 +31,6 @@
 
 #include "MixedAudioStream.h"
 
-
-class AvatarAudioTimer : public QObject {
-    Q_OBJECT
-
-signals:
-    void avatarTick();
-
-public slots:
-    void start();
-    void stop() { _quit = true; }
-
-private:
-    bool _quit { false };
-};
-
 class Agent : public ThreadedAssignment {
     Q_OBJECT
 
@@ -74,7 +59,6 @@ public:
 public slots:
     void run() override;
     void playAvatarSound(SharedSoundPointer avatarSound);
-    void processAgentAvatarAndAudio();
 
 private slots:
     void requestScript();
@@ -88,6 +72,9 @@ private slots:
 
     void nodeActivated(SharedNodePointer activatedNode);
     
+    void processAgentAvatar();
+    void processAgentAvatarAudio();
+
 signals:
     void startAvatarAudioTimer();
     void stopAvatarAudioTimer();

assignment-client/src/AvatarAudioTimer.cpp

@@ -0,0 +1,33 @@
+//
+//  AvatarAudioTimer.cpp
+//  assignment-client/src
+//
+//  Created by David Kelly on 10/12/13.
+//  Copyright 2016 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+#include <QDebug>
+#include <SharedUtil.h>
+#include "AvatarAudioTimer.h"
+
+// this should send a signal every 10ms, with pretty good precision.  Hardcoding
+// to 10ms since that's what you'd want for audio.  
+void AvatarAudioTimer::start() {
+    qDebug() << "AvatarAudioTimer::start called";
+    auto startTime = usecTimestampNow();
+    quint64 frameCounter = 0;
+    const int TARGET_INTERVAL_USEC = 10000; // 10ms
+    while (!_quit) {
+        frameCounter++;
+        // simplest possible timer
+        quint64 targetTime = startTime + frameCounter * TARGET_INTERVAL_USEC;
+        quint64 interval = std::max((quint64)0, targetTime - usecTimestampNow());
+        usleep(interval);
+        emit avatarTick();
+    }
+    qDebug() << "AvatarAudioTimer is finished";
+}
+
+

assignment-client/src/AvatarAudioTimer.h

@@ -0,0 +1,31 @@
+//
+//  AvatarAudioTimer.h
+//  assignment-client/src
+//
+//  Created by David Kelly on 10/12/13.
+//  Copyright 2016 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_AvatarAudioTimer_h
+#define hifi_AvatarAudioTimer_h
+
+#include <QtCore/QObject>
+
+class AvatarAudioTimer : public QObject {
+    Q_OBJECT
+
+signals:
+    void avatarTick();
+
+public slots:
+    void start();
+    void stop() { _quit = true; }
+
+private:
+    bool _quit { false };
+};
+
+#endif //hifi_AvatarAudioTimer_h