Remove AudioCodingModule's dependency on the Module interface
BUG=3520
COAUTHOR=kwiberg@webrtc.org
R=minyue@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/42069004
Cr-Commit-Position: refs/heads/master@{#8500}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8500 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc b/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc
index ddc3681..694900a 100644
--- a/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc
+++ b/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc
@@ -218,19 +218,6 @@
"Destroyed");
}
-// Returns the number of milliseconds until the module want a
-// worker thread to call Process.
-int64_t AudioCodingModuleImpl::TimeUntilNextProcess() {
- CriticalSectionScoped lock(acm_crit_sect_);
-
- if (!HaveValidEncoder("TimeUntilNextProcess")) {
- return -1;
- }
- FATAL() << "Dead code?";
-// return codecs_[current_send_codec_idx_]->SamplesLeftToEncode() /
-// (send_codec_inst_.plfreq / 1000);
-}
-
int32_t AudioCodingModuleImpl::Process() {
CriticalSectionScoped lock(acm_crit_sect_);
return last_encode_value_;
diff --git a/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.h b/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.h
index 191fa69..aa8d366 100644
--- a/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.h
+++ b/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.h
@@ -35,10 +35,6 @@
explicit AudioCodingModuleImpl(const AudioCodingModule::Config& config);
~AudioCodingModuleImpl();
- // Returns the number of milliseconds until the module want a worker thread
- // to call Process.
- virtual int64_t TimeUntilNextProcess() OVERRIDE;
-
// Process any pending tasks such as timeouts.
virtual int32_t Process() OVERRIDE;
diff --git a/webrtc/modules/audio_coding/main/interface/audio_coding_module.h b/webrtc/modules/audio_coding/main/interface/audio_coding_module.h
index a039802..f14ff80 100644
--- a/webrtc/modules/audio_coding/main/interface/audio_coding_module.h
+++ b/webrtc/modules/audio_coding/main/interface/audio_coding_module.h
@@ -74,7 +74,7 @@
const uint16_t delayMS) = 0; // average delay in ms
};
-class AudioCodingModule: public Module {
+class AudioCodingModule {
protected:
AudioCodingModule() {}
@@ -101,6 +101,8 @@
static AudioCodingModule* Create(int id, Clock* clock);
virtual ~AudioCodingModule() {};
+ virtual int32_t Process() = 0;
+
///////////////////////////////////////////////////////////////////////////
// Utility functions
//
