- ongoing work

src/engine/agent/Agent_AudioManager.cpp

@@ -1,11 +1,10 @@
-/* Copyright(C) 2007-2017 VoIP objects (voipobjects.com)
+/* Copyright(C) 2007-2023 VoIP objects (voipobjects.com)
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "Agent_AudioManager.h"
 #include "../engine/audio/Audio_WavFile.h"
-#include "../engine/helper/HL_String.h"
 #include "../engine/audio/Audio_Null.h"
 
 #if defined(TARGET_ANDROID)
@@ -15,18 +14,15 @@
 #define LOG_SUBSYSTEM "AudioManager"
 
 
-// ---------------- AudioManager -------------
-//static AudioManager GAudioManager;
-
 AudioManager::AudioManager()
-:mTerminal(nullptr)
+:mTerminal(nullptr), mAudioMonitoring(nullptr)
 {
   mPlayer.setDelegate(this);
 }
 
 AudioManager::~AudioManager()
 {
-  //stop();
+  // stop();
 }
 
 AudioManager& AudioManager::instance()
@@ -49,6 +45,16 @@ MT::Terminal* AudioManager::terminal()
   return mTerminal;
 }
 
+void AudioManager::setAudioMonitoring(Audio::DataConnection* monitoring)
+{
+  mAudioMonitoring = monitoring;
+}
+
+Audio::DataConnection* AudioManager::audioMonitoring()
+{
+  return mAudioMonitoring;
+}
+
 #define LOCK_MANAGER std::unique_lock<std::mutex> l(mGuard)
 void AudioManager::start(int usageId)
 {
@@ -68,7 +74,14 @@ void AudioManager::start(int usageId)
       // Disable AEC for now - because PVQA conflicts with speex AEC.
       std::shared_ptr<Audio::Enumerator> enumerator(Audio::Enumerator::make(usageId == atNull));
       if (!mTerminal->audio())
-          mTerminal->setAudio(std::make_shared<Audio::DevicePair>(false, true));
+      {
+          auto audio = std::make_shared<Audio::DevicePair>();
+          audio->setAgc(true);
+          audio->setAec(false);
+          audio->setMonitoring(mAudioMonitoring);
+
+          mTerminal->setAudio(audio);
+      }
 
       if (!mAudioInput)
       {
@@ -96,8 +109,8 @@ void AudioManager::start(int usageId)
             if (outputIndex >= enumerator->count())
               outputIndex = 0;
 
-              mAudioOutput = Audio::POutputDevice(
-                      Audio::OutputDevice::make(enumerator->idAt(outputIndex)));
+            mAudioOutput = Audio::POutputDevice(
+                  Audio::OutputDevice::make(enumerator->idAt(outputIndex)));
           }
           else
               mAudioOutput = Audio::POutputDevice(new Audio::NullOutputDevice());

src/engine/agent/Agent_AudioManager.h

@@ -8,10 +8,7 @@
 
 #include "../engine/audio/Audio_Interface.h"
 #include "../engine/audio/Audio_Player.h"
-#include "../engine/endpoint/EP_Engine.h"
 #include "../engine/media/MT_Box.h"
-#include "../engine/helper/HL_Log.h"
-#include "../engine/helper/HL_Sync.h"
 
 
 
@@ -49,6 +46,9 @@ public:
   void setTerminal(MT::Terminal* terminal);
   MT::Terminal* terminal();
 
+  void setAudioMonitoring(Audio::DataConnection* monitoring);
+  Audio::DataConnection* audioMonitoring();
+
   // Start/stop methods relies on usage counter; only first start and last stop opens/closes devices actually
   void start(int usageId);
   void stop(int usageId);
@@ -69,6 +69,7 @@ public:
   void startPlayFile(int usageId, const std::string& path, AudioTarget target, LoopMode lm, int timelimit = 0);
   void stopPlayFile(int usageId);
   
+
   void onFilePlayed(Audio::Player::PlaylistItem& item);
   
   // Must be called from main loop to release used audio devices
@@ -79,6 +80,7 @@ protected:
   Audio::POutputDevice mAudioOutput;
   Audio::Player mPlayer;
   MT::Terminal* mTerminal;
+  Audio::DataConnection* mAudioMonitoring;
 
   std::map<int, int> UsageMap;
   UsageCounter mUsage;

src/engine/agent/Agent_Impl.cpp

@@ -32,6 +32,24 @@ AgentImpl::~AgentImpl()
     stopAgentAndThread();
 }
 
+// Get access to internal audio manager. Value can be nullptr.
+const std::shared_ptr<AudioManager>& AgentImpl::audioManager() const
+{
+  return mAudioManager;
+}
+
+void AgentImpl::setAudioMonitoring(Audio::DataConnection* monitoring)
+{
+  mAudioMonitoring = monitoring;
+  if (mAudioManager)
+    mAudioManager->setAudioMonitoring(monitoring);
+}
+
+Audio::DataConnection* AgentImpl::monitoring() const
+{
+  return mAudioMonitoring;
+}
+
 void AgentImpl::run()
 {
     while (!mShutdown)
@@ -212,8 +230,10 @@ void AgentImpl::processStart(JsonCpp::Value& request, JsonCpp::Value &answer)
     // Enable audio
     mAudioManager = std::make_shared<AudioManager>();
     mAudioManager->setTerminal(mTerminal.get());
+    if (mAudioMonitoring)
+      mAudioManager->setAudioMonitoring(mAudioMonitoring);
 
-    // Do not start here. Start right before call.
+    // Do not start audio manager here. Start right before call.
 
     // Initialize endpoint
     start();

src/engine/agent/Agent_Impl.h

@@ -14,6 +14,7 @@
 #include <mutex>
 #include <condition_variable>
 
+
 class AgentImpl: public UserAgent, public MT::Stream::MediaObserver
 {
 protected:
@@ -34,7 +35,7 @@ protected:
   volatile bool mShutdown;
   std::shared_ptr<MT::Terminal> mTerminal;
   std::shared_ptr<AudioManager> mAudioManager;
-  //Audio::PWavFileWriter mIncomingAudioDump, mOutgoingAudioDump;
+  Audio::DataConnection* mAudioMonitoring = nullptr;
 
   void run();
   void addEvent(const JsonCpp::Value& v);
@@ -65,6 +66,12 @@ public:
   bool waitForData(int milliseconds);
   std::string read();
 
+  // Get access to internal audio manager. Value can be nullptr.
+  const std::shared_ptr<AudioManager>& audioManager() const;
+
+  void setAudioMonitoring(Audio::DataConnection* monitoring);
+  Audio::DataConnection* monitoring() const;
+
   // UserAgent overrides
   // Called on new incoming session; providers shoukld
   PDataProvider onProviderNeeded(const std::string& name) override;