| Index: webrtc/modules/audio_coding/acm2/acm_receiver.cc
|
| diff --git a/webrtc/modules/audio_coding/acm2/acm_receiver.cc b/webrtc/modules/audio_coding/acm2/acm_receiver.cc
|
| index 53ec8841e50c9a2b6e6b694a119d535ff236dfc9..39d8a0d175e44aa5432a2997759cf0ae671481f0 100644
|
| --- a/webrtc/modules/audio_coding/acm2/acm_receiver.cc
|
| +++ b/webrtc/modules/audio_coding/acm2/acm_receiver.cc
|
| @@ -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);
|
| }
|
|
|