generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.

Browse Source 
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
This commit is contained in:
turaj@webrtc.org 2013-11-22 17:04:49 +00:00
parent 2ffb149c2c
commit 1e8c93c953
6 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
webrtc/modules/audio_coding/main/acm2/audio_coding_module.cc
View File

@ -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());

4
webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc
View File

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

5
webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.h
View File

@ -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);

9
webrtc/modules/audio_coding/main/interface/audio_coding_module.h
View File

@ -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
//

4
webrtc/modules/audio_coding/main/source/audio_coding_module_impl.cc
View File

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

5
webrtc/modules/audio_coding/main/source/audio_coding_module_impl.h
View File

@ -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);