commit 6af9399117b8a1c80988ecce24464fbcb4981cf9
author Henrik Lundin <henrik.lundin@webrtc.org> Wed Jun 14 14:13:02 2017 +0200
committer Commit Bot <commit-bot@chromium.org> Thu Jun 15 10:11:07 2017 +0000
tree 8688419555a5277ef4dcb5db24f2734e0f5e141f
parent f9784f23d7b95db426626c340690f7592a1a7f46

ACM: Make AcmReceiver's ownership of NetEq more obvious

Bug: None
Change-Id: Iff544940fcbd651c967771c209c8c0c3aaeda9a1
Reviewed-on: https://chromium-review.googlesource.com/533073
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Henrik Lundin <henrik.lundin@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#18607}

webrtc/modules/audio_coding/acm2/acm_receiver.h

diff --git a/webrtc/modules/audio_coding/acm2/acm_receiver.h b/webrtc/modules/audio_coding/acm2/acm_receiver.h
index 87190c6..b374495 100644
--- a/webrtc/modules/audio_coding/acm2/acm_receiver.h
+++ b/webrtc/modules/audio_coding/acm2/acm_receiver.h
@@ -281,7 +281,7 @@
   ACMResampler resampler_ GUARDED_BY(crit_sect_);
   std::unique_ptr<int16_t[]> last_audio_buffer_ GUARDED_BY(crit_sect_);
   CallStatistics call_stats_ GUARDED_BY(crit_sect_);
-  NetEq* neteq_;
+  const std::unique_ptr<NetEq> neteq_;  // NetEq is thread-safe; no lock needed.
   const Clock* const clock_;
   bool resampled_last_output_frame_ GUARDED_BY(crit_sect_);
   rtc::Optional<int> last_packet_sample_rate_hz_ GUARDED_BY(crit_sect_);