| Index: webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc
|
| 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 19ae4cbc2b5e6d18e9c22688d6c38dfb177045e5..5d18bda00c3a5e1b9aa12fd5791479e560bbaea4 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
|
| @@ -525,14 +525,9 @@ int AudioCodingModuleImpl::InitializeReceiverSafe() {
|
|
|
| // Get current receive frequency.
|
| int AudioCodingModuleImpl::ReceiveFrequency() const {
|
| - WEBRTC_TRACE(webrtc::kTraceStream, webrtc::kTraceAudioCoding, id_,
|
| - "ReceiveFrequency()");
|
| -
|
| - CriticalSectionScoped lock(acm_crit_sect_.get());
|
| -
|
| - auto codec_id = RentACodec::CodecIdFromIndex(receiver_.last_audio_codec_id());
|
| - return codec_id ? RentACodec::CodecInstById(*codec_id)->plfreq
|
| - : receiver_.last_output_sample_rate_hz();
|
| + const auto last_packet_sample_rate = receiver_.last_packet_sample_rate_hz();
|
| + return last_packet_sample_rate ? *last_packet_sample_rate
|
| + : receiver_.last_output_sample_rate_hz();
|
| }
|
|
|
| // Get current playout frequency.
|
|
|