admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove the ID from AcmReceiver

Browse Source 
This is an artifact from the past, and is no longer used.

R=ivoc@webrtc.org

Review URL: https://codereview.webrtc.org/1764623002

Cr-Commit-Position: refs/heads/master@{#11866}
This commit is contained in:
henrik.lundin 2016-03-03 23:05:39 -08:00 committed by Commit bot
parent 4f735d16ad
commit 0023fdffd0
3 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
webrtc/modules/audio_coding/acm2/acm_receiver.cc
View File

@ -118,8 +118,7 @@ bool IsCng(int codec_id) {
} // namespace
AcmReceiver::AcmReceiver(const AudioCodingModule::Config& config)
: id_(config.id),
last_audio_decoder_(nullptr),
: last_audio_decoder_(nullptr),
previous_audio_activity_(AudioFrame::kVadPassive),
audio_buffer_(new int16_t[AudioFrame::kMaxDataSizeSamples]),
last_audio_buffer_(new int16_t[AudioFrame::kMaxDataSizeSamples]),
@ -419,11 +418,6 @@ int AcmReceiver::RemoveCodec(uint8_t payload_type) {
return 0;
}
void AcmReceiver::set_id(int id) {
rtc::CritScope lock(&crit_sect_);
id_ = id;
}
bool AcmReceiver::GetPlayoutTimestamp(uint32_t* timestamp) {
return neteq_->GetPlayoutTimestamp(timestamp);
}

6
webrtc/modules/audio_coding/acm2/acm_receiver.h
View File

@ -210,11 +210,6 @@ class AcmReceiver {
//
int RemoveAllCodecs();
//
// Set ID.
//
void set_id(int id); // TODO(turajs): can be inline.
//
// Gets the RTP timestamp of the last sample delivered by GetAudio().
// Returns true if the RTP timestamp is valid, otherwise false.
@ -282,7 +277,6 @@ class AcmReceiver {
uint32_t NowInTimestamp(int decoder_sampling_rate) const;
rtc::CriticalSection crit_sect_;
int id_; // TODO(henrik.lundin) Make const.
const Decoder* last_audio_decoder_ GUARDED_BY(crit_sect_);
AudioFrame::VADActivity previous_audio_activity_ GUARDED_BY(crit_sect_);
ACMResampler resampler_ GUARDED_BY(crit_sect_);

1
webrtc/modules/audio_coding/acm2/audio_coding_module_impl.cc
View File

@ -544,7 +544,6 @@ int AudioCodingModuleImpl::InitializeReceiverSafe() {
if (receiver_.RemoveAllCodecs() < 0)
return -1;
}
receiver_.set_id(id_);
receiver_.ResetInitialDelay();
receiver_.SetMinimumDelay(0);
receiver_.SetMaximumDelay(0);