Upgrade scoped_ptr to Chromium's latest version.
Analogous to the recent libjingle change: http://cl/54929753-p10. This supports scoped_ptr<T[]> and scoped_ptr<C, FreeDeleter> rather than scoped_array and scoped_ptr_malloc respectively. - Add Chromium's template-based COMPILE_ASSERT. We didn't have this previously in order to support the macro in C. Instead, move the existing macro to compile_assert_c.h. - Additionally copy the move.h and template_util.h depedencies and add the WARN_UNUSED_RESULT macro. - Leave scoped_array and scoped_ptr_malloc for now, but mark as deprecated. - Remove scoped_ptr foo(NULL) use. The default constructor handles it. - Remove the now redundant COMPILE_ASSERT from peerconnection_jni.cc. - Add a CHECK_ARRAY_SIZE macro to rtp_format_vp8_unittest.cc to remove some repeated code. TESTED=trybots R=pbos@webrtc.org, tommi@webrtc.org Review URL: https://webrtc-codereview.appspot.com/2449005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5015 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
@ -59,8 +59,7 @@ NetEqImpl::NetEqImpl(int fs,
|
||||
PacketBuffer* packet_buffer,
|
||||
PayloadSplitter* payload_splitter,
|
||||
TimestampScaler* timestamp_scaler)
|
||||
: background_noise_(NULL),
|
||||
buffer_level_filter_(buffer_level_filter),
|
||||
: buffer_level_filter_(buffer_level_filter),
|
||||
decoder_database_(decoder_database),
|
||||
delay_manager_(delay_manager),
|
||||
delay_peak_detector_(delay_peak_detector),
|
||||
@ -70,14 +69,6 @@ NetEqImpl::NetEqImpl(int fs,
|
||||
payload_splitter_(payload_splitter),
|
||||
timestamp_scaler_(timestamp_scaler),
|
||||
vad_(new PostDecodeVad()),
|
||||
algorithm_buffer_(NULL),
|
||||
sync_buffer_(NULL),
|
||||
expand_(NULL),
|
||||
normal_(NULL),
|
||||
merge_(NULL),
|
||||
accelerate_(NULL),
|
||||
preemptive_expand_(NULL),
|
||||
comfort_noise_(NULL),
|
||||
last_mode_(kModeNormal),
|
||||
mute_factor_array_(NULL),
|
||||
decoded_buffer_length_(kMaxFrameSize),
|
||||
|
||||
Reference in New Issue
Block a user