NetEq: Add thread annotation to const scoped_ptrs
Since the objects pointed to are not const, only the pointer to them,
they too must be accessed under lock.
Move the crit_sect to above the variables it is protecting.
R=pbos@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/12679006
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6340 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/modules/audio_coding/neteq4/neteq_impl.cc b/webrtc/modules/audio_coding/neteq4/neteq_impl.cc
index 38a5456..963a820 100644
--- a/webrtc/modules/audio_coding/neteq4/neteq_impl.cc
+++ b/webrtc/modules/audio_coding/neteq4/neteq_impl.cc
@@ -63,7 +63,8 @@
ExpandFactory* expand_factory,
PreemptiveExpandFactory* preemptive_expand_factory,
bool create_components)
- : buffer_level_filter_(buffer_level_filter),
+ : crit_sect_(CriticalSectionWrapper::CreateCriticalSection()),
+ buffer_level_filter_(buffer_level_filter),
decoder_database_(decoder_database),
delay_manager_(delay_manager),
delay_peak_detector_(delay_peak_detector),
@@ -89,7 +90,6 @@
first_packet_(true),
error_code_(0),
decoder_error_code_(0),
- crit_sect_(CriticalSectionWrapper::CreateCriticalSection()),
decoded_packet_sequence_number_(-1),
decoded_packet_timestamp_(0) {
if (fs != 8000 && fs != 16000 && fs != 32000 && fs != 48000) {