zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove AudioCodingModule's dependency on the Module interface

Browse Source 
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
This commit is contained in:
henrik.lundin@webrtc.org
2015-02-25 10:37:20 +00:00
parent af82f75690
commit c5558b7021
3 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -218,19 +218,6 @@ AudioCodingModuleImpl::~AudioCodingModuleImpl() {
"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_;

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

@ -35,10 +35,6 @@ class AudioCodingModuleImpl : public AudioCodingModule {
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;

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

@ -74,7 +74,7 @@ class ACMVQMonCallback {
const uint16_t delayMS) = 0; // average delay in ms
};
class AudioCodingModule: public Module {
class AudioCodingModule {
protected:
AudioCodingModule() {}
@ -101,6 +101,8 @@ class AudioCodingModule: public Module {
static AudioCodingModule* Create(int id, Clock* clock);
virtual ~AudioCodingModule() {};
virtual int32_t Process() = 0;
///////////////////////////////////////////////////////////////////////////
// Utility functions
//