Move VoiceEngineObserver into AudioSendStream so that we detect typing noises and return properly i…

talk/media/base/mediaengine.h

 /*
  * libjingle
  * Copyright 2004 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 24 matching lines @@
 #include <string>
 #include <vector>
 
 #include "talk/media/base/codec.h"
 #include "talk/media/base/mediachannel.h"
 #include "talk/media/base/mediacommon.h"
 #include "talk/media/base/videocapturer.h"
 #include "talk/media/base/videocommon.h"
 #include "talk/media/base/voiceprocessor.h"
 #include "talk/media/devices/devicemanager.h"
+#include "webrtc/audio_state.h"
 #include "webrtc/base/fileutils.h"
 #include "webrtc/base/sigslotrepeater.h"
 
 #if defined(GOOGLE_CHROME_BUILD) || defined(CHROMIUM_BUILD)
 #define DISABLE_MEDIA_ENGINE_FACTORY
 #endif
 
 namespace webrtc {
 class Call;
-class VoiceEngine;
 }
 
 namespace cricket {
 
 class VideoCapturer;
 
 // MediaEngineInterface is an abstraction of a media engine which can be
 // subclassed to support different media componentry backends.
 // It supports voice and video operations in the same class to facilitate
 // proper synchronization between both media types.
 class MediaEngineInterface {
  public:
   virtual ~MediaEngineInterface() {}
 
   // Initialization
   // Starts the engine.
   virtual bool Init(rtc::Thread* worker_thread) = 0;
   // Shuts down the engine.
   virtual void Terminate() = 0;
   // TODO(solenberg): Remove once VoE API refactoring is done.
-  virtual webrtc::VoiceEngine* GetVoE() = 0;
+  virtual rtc::linked_ptr<webrtc::AudioState> GetAudioState() const = 0;

[tommi, 2015/11/02 13:46:53]

are there any threading requirements for being allowed to call this method?
(e.g. must be called on the same thread as calls Init() or something along those
lines).

[the sun, 2015/11/03 12:41:07]

No, the returned smart pointer should be thread safe.

 
   // MediaChannel creation
   // Creates a voice media channel. Returns NULL on failure.
   virtual VoiceMediaChannel* CreateChannel(
       webrtc::Call* call,
       const AudioOptions& options) = 0;
   // Creates a video media channel, paired with the specified voice channel.
   // Returns NULL on failure.
   virtual VideoMediaChannel* CreateVideoChannel(
       webrtc::Call* call,
@@ skipping 74 matching lines @@
   virtual bool Init(rtc::Thread* worker_thread) {
     if (!voice_.Init(worker_thread))
       return false;
     video_.Init();
     return true;
   }
   virtual void Terminate() {
     voice_.Terminate();
   }
 
-  virtual webrtc::VoiceEngine* GetVoE() {
-    return voice_.GetVoE();
+  virtual rtc::linked_ptr<webrtc::AudioState> GetAudioState() const {
+    return voice_.GetAudioState();
   }
   virtual VoiceMediaChannel* CreateChannel(webrtc::Call* call,
                                            const AudioOptions& options) {
     return voice_.CreateChannel(call, options);
   }
   virtual VideoMediaChannel* CreateVideoChannel(webrtc::Call* call,
                                                 const VideoOptions& options) {
     return video_.CreateChannel(call, options);
   }
 
@@ skipping 134 matching lines @@
 class DataEngineInterface {
  public:
   virtual ~DataEngineInterface() {}
   virtual DataMediaChannel* CreateChannel(DataChannelType type) = 0;
   virtual const std::vector<DataCodec>& data_codecs() = 0;
 };
 
 }  // namespace cricket
 
 #endif  // TALK_MEDIA_BASE_MEDIAENGINE_H_