Moving/renaming webrtc/common.h.

webrtc/voice_engine/include/voe_base.h

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 18 matching lines @@
 //  base->DeleteChannel(ch);
 //  base->Terminate();
 //  base->Release();
 //  VoiceEngine::Delete(voe);
 //
 #ifndef WEBRTC_VOICE_ENGINE_VOE_BASE_H
 #define WEBRTC_VOICE_ENGINE_VOE_BASE_H
 
 #include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/modules/audio_coding/codecs/audio_decoder_factory.h"
+#include "webrtc/modules/audio_coding/include/audio_coding_module.h"
 #include "webrtc/common_types.h"
 
 namespace webrtc {
 
 class AudioDeviceModule;
 class AudioProcessing;
 class AudioTransport;
-class Config;
-
-const int kVoEDefault = -1;
 
 // VoiceEngineObserver
 class WEBRTC_DLLEXPORT VoiceEngineObserver {
  public:
   // This method will be called after the occurrence of any runtime error
   // code, or warning notification, when the observer interface has been
   // installed using VoEBase::RegisterVoiceEngineObserver().
   virtual void CallbackOnError(int channel, int errCode) = 0;
 
  protected:
   virtual ~VoiceEngineObserver() {}
 };
 
 // VoiceEngine
 class WEBRTC_DLLEXPORT VoiceEngine {
  public:
   // Creates a VoiceEngine object, which can then be used to acquire
   // sub-APIs. Returns NULL on failure.
   static VoiceEngine* Create();
-  static VoiceEngine* Create(const Config& config);
 
   // Deletes a created VoiceEngine object and releases the utilized resources.
   // Note that if there are outstanding references held via other interfaces,
   // the voice engine instance will not actually be deleted until those
   // references have been released.
   static bool Delete(VoiceEngine*& voiceEngine);
 
   // Specifies the amount and type of trace information which will be
   // created by the VoiceEngine.
   static int SetTraceFilter(unsigned int filter);
@@ skipping 13 matching lines @@
   static std::string GetVersionString();
 
  protected:
   VoiceEngine() {}
   ~VoiceEngine() {}
 };
 
 // VoEBase
 class WEBRTC_DLLEXPORT VoEBase {
  public:
+  struct ChannelConfig {

[hlundin-webrtc, 2016/09/05 11:28:42]

We tend to let the Config struct of a class reside in the declaration of that
class. Following that pattern, the ChannelConfig should go inside the Channel
class as a public struct?

[kwiberg-webrtc, 2016/09/05 14:36:24]

+1

[the sun, 2016/09/05 15:25:04]

Agree in principle, but

-2

The Channel class is not, nor should it be, part of the public API, which it
would have to be if we were to place the config there. Hence, the somewhat
awkward name.

[hlundin-webrtc, 2016/09/06 12:07:21]

Acknowledged.

+    AudioCodingModule::Config acm_config;
+    bool enable_voice_pacing = false;
+  };
+
   // Factory for the VoEBase sub-API. Increases an internal reference
   // counter if successful. Returns NULL if the API is not supported or if
   // construction fails.
   static VoEBase* GetInterface(VoiceEngine* voiceEngine);
 
   // Releases the VoEBase sub-API and decreases an internal reference
   // counter. Returns the new reference count. This value should be zero
   // for all sub-APIs before the VoiceEngine object can be safely deleted.
   virtual int Release() = 0;
 
@@ skipping 27 matching lines @@
 
   // This method is WIP - DO NOT USE!
   // Returns NULL before Init() is called.
   virtual AudioDeviceModule* audio_device_module() = 0;
 
   // Terminates all VoiceEngine functions and releases allocated resources.
   // Returns 0.
   virtual int Terminate() = 0;
 
   // Creates a new channel and allocates the required resources for it.
-  // One can use |config| to configure the channel. Currently that is used for
-  // choosing between ACM1 and ACM2, when creating Audio Coding Module.
+  // The second version accepts a |config| struct which includes an Audio Coding
+  // Module config and an option to enable voice pacing.
   // Returns channel ID or -1 in case of an error.
   virtual int CreateChannel() = 0;
-  virtual int CreateChannel(const Config& config) = 0;
+  virtual int CreateChannel(const ChannelConfig& config) = 0;
 
   // Deletes an existing channel and releases the utilized resources.
   // Returns -1 in case of an error, 0 otherwise.
   virtual int DeleteChannel(int channel) = 0;
 
   // Prepares and initiates the VoiceEngine for reception of
   // incoming RTP/RTCP packets on the specified |channel|.
   virtual int StartReceive(int channel) = 0;
 
   // Stops receiving incoming RTP/RTCP packets on the specified |channel|.
@@ skipping 31 matching lines @@
   virtual int AssociateSendChannel(int channel, int accociate_send_channel) = 0;
 
  protected:
   VoEBase() {}
   virtual ~VoEBase() {}
 };
 
 }  // namespace webrtc
 
 #endif  //  WEBRTC_VOICE_ENGINE_VOE_BASE_H