Distinguish instances of ACM1 from ACM2 by a version string. This is fpr testing purposes and will be removed when the experiment is done and ACM1 is fade out.

BUG=
R=andrew@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/4069006

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5161 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/modules/audio_coding/main/acm2/audio_coding_module.cc

@@ -19,6 +19,9 @@
 
 namespace webrtc {
 
+const char kLegacyAcmVersion[] = "acm1";
+const char kExperimentalAcmVersion[] = "acm2";
+
 // Create module
 AudioCodingModule* AudioCodingModule::Create(int id) {
   return new acm1::AudioCodingModuleImpl(id, Clock::GetRealTimeClock());

webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc

@@ -1975,6 +1975,10 @@ int AudioCodingModuleImpl::LeastRequiredDelayMs() const {
   return receiver_.LeastRequiredDelayMs();
 }
 
+const char* AudioCodingModuleImpl::Version() const {
+  return kExperimentalAcmVersion;
+}
+
 }  // namespace acm2
 
 }  // namespace webrtc

webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.h

@@ -32,12 +32,11 @@ class ACMGenericCodec;
 
 class AudioCodingModuleImpl : public AudioCodingModule {
  public:
-  // Constructor
   explicit AudioCodingModuleImpl(int id);
-
-  // Destructor
   ~AudioCodingModuleImpl();
 
+  virtual const char* Version() const;
+
   // Change the unique identifier of this object.
   virtual int32_t ChangeUniqueId(const int32_t id);
 

webrtc/modules/audio_coding/main/interface/audio_coding_module.h

@@ -73,6 +73,10 @@ class ACMVQMonCallback {
       const uint16_t delayMS) = 0;  // average delay in ms
 };
 
+// Version string for testing, to distinguish instances of ACM1 from ACM2.
+extern const char kLegacyAcmVersion[];
+extern const char kExperimentalAcmVersion[];
+
 class AudioCodingModule: public Module {
  protected:
   AudioCodingModule() {}
@@ -174,6 +178,11 @@ class AudioCodingModule: public Module {
   //
   static bool IsCodecValid(const CodecInst& codec);
 
+  // Returns the version of ACM. This facilitates distinguishing instances of
+  // ACM1 from ACM2 while testing. This API will be removed when ACM1 is
+  // completely removed.
+  virtual const char* Version() const = 0;
+
   ///////////////////////////////////////////////////////////////////////////
   //   Sender
   //

webrtc/modules/audio_coding/main/source/audio_coding_module_impl.cc

@@ -3026,6 +3026,10 @@ void AudioCodingModuleImpl::DisableNack() {
   nack_enabled_ = false;
 }
 
+const char* AudioCodingModuleImpl::Version() const {
+  return kLegacyAcmVersion;
+}
+
 }  // namespace acm1
 
 }  // namespace webrtc

webrtc/modules/audio_coding/main/source/audio_coding_module_impl.h

@@ -40,12 +40,11 @@ class ACMGenericCodec;
 
 class AudioCodingModuleImpl : public AudioCodingModule {
  public:
-  // Constructor
   AudioCodingModuleImpl(const int32_t id, Clock* clock);
-
-  // Destructor
   ~AudioCodingModuleImpl();
 
+  virtual const char* Version() const;
+
   // Change the unique identifier of this object.
   virtual int32_t ChangeUniqueId(const int32_t id);