From 02ed201182f44e1a55365afa43f71a30a8bfe4f5 Mon Sep 17 00:00:00 2001 From: Henrik Lundin Date: Thu, 8 Jun 2017 09:03:55 +0200 Subject: [PATCH] AcmReceiver: Make a member variable const This is a minor clean-up made possible by simplifications done in the past. Bug: none Change-Id: Id0ea167572f8da36db5de949441f67a2a18555be Reviewed-on: https://chromium-review.googlesource.com/528073 Reviewed-by: Karl Wiberg Commit-Queue: Henrik Lundin Cr-Commit-Position: refs/heads/master@{#18490} --- webrtc/modules/audio_coding/acm2/acm_receiver.cc | 2 +- webrtc/modules/audio_coding/acm2/acm_receiver.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webrtc/modules/audio_coding/acm2/acm_receiver.cc b/webrtc/modules/audio_coding/acm2/acm_receiver.cc index 2eacefdb9d..553265e448 100644 --- a/webrtc/modules/audio_coding/acm2/acm_receiver.cc +++ b/webrtc/modules/audio_coding/acm2/acm_receiver.cc @@ -37,7 +37,7 @@ AcmReceiver::AcmReceiver(const AudioCodingModule::Config& config) neteq_(NetEq::Create(config.neteq_config, config.decoder_factory)), clock_(config.clock), resampled_last_output_frame_(true) { - assert(clock_); + RTC_DCHECK(clock_); memset(last_audio_buffer_.get(), 0, AudioFrame::kMaxDataSizeSamples); } diff --git a/webrtc/modules/audio_coding/acm2/acm_receiver.h b/webrtc/modules/audio_coding/acm2/acm_receiver.h index 8f0963f0af..87190c6e67 100644 --- a/webrtc/modules/audio_coding/acm2/acm_receiver.h +++ b/webrtc/modules/audio_coding/acm2/acm_receiver.h @@ -282,7 +282,7 @@ class AcmReceiver { std::unique_ptr last_audio_buffer_ GUARDED_BY(crit_sect_); CallStatistics call_stats_ GUARDED_BY(crit_sect_); NetEq* neteq_; - Clock* clock_; // TODO(henrik.lundin) Make const if possible. + const Clock* const clock_; bool resampled_last_output_frame_ GUARDED_BY(crit_sect_); rtc::Optional last_packet_sample_rate_hz_ GUARDED_BY(crit_sect_); };