zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use base/scoped_ptr.h; system_wrappers/interface/scoped_ptr.h is going away

Browse Source 
BUG=
R=andrew@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/36229004

Cr-Commit-Position: refs/heads/master@{#8517}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8517 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kwiberg@webrtc.org
2015-02-26 14:34:55 +00:00
parent ac2d27d9ae
commit 00b8f6b364
391 changed files with 1427 additions and 1402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
webrtc/modules/audio_coding/neteq/neteq_impl.h
View File

@ -14,6 +14,7 @@
#include <vector>
#include "webrtc/base/constructormagic.h"
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/base/thread_annotations.h"
#include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
#include "webrtc/modules/audio_coding/neteq/defines.h"
@ -22,7 +23,6 @@
#include "webrtc/modules/audio_coding/neteq/random_vector.h"
#include "webrtc/modules/audio_coding/neteq/rtcp.h"
#include "webrtc/modules/audio_coding/neteq/statistics_calculator.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/typedefs.h"
namespace webrtc {
@ -334,37 +334,40 @@ class NetEqImpl : public webrtc::NetEq {
// Creates DecisionLogic object with the mode given by |playout_mode_|.
virtual void CreateDecisionLogic() EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);
const scoped_ptr<CriticalSectionWrapper> crit_sect_;
const scoped_ptr<BufferLevelFilter> buffer_level_filter_
const rtc::scoped_ptr<CriticalSectionWrapper> crit_sect_;
const rtc::scoped_ptr<BufferLevelFilter> buffer_level_filter_
GUARDED_BY(crit_sect_);
const scoped_ptr<DecoderDatabase> decoder_database_ GUARDED_BY(crit_sect_);
const scoped_ptr<DelayManager> delay_manager_ GUARDED_BY(crit_sect_);
const scoped_ptr<DelayPeakDetector> delay_peak_detector_
const rtc::scoped_ptr<DecoderDatabase> decoder_database_
GUARDED_BY(crit_sect_);
const scoped_ptr<DtmfBuffer> dtmf_buffer_ GUARDED_BY(crit_sect_);
const scoped_ptr<DtmfToneGenerator> dtmf_tone_generator_
const rtc::scoped_ptr<DelayManager> delay_manager_ GUARDED_BY(crit_sect_);
const rtc::scoped_ptr<DelayPeakDetector> delay_peak_detector_
GUARDED_BY(crit_sect_);
const scoped_ptr<PacketBuffer> packet_buffer_ GUARDED_BY(crit_sect_);
const scoped_ptr<PayloadSplitter> payload_splitter_ GUARDED_BY(crit_sect_);
const scoped_ptr<TimestampScaler> timestamp_scaler_ GUARDED_BY(crit_sect_);
const scoped_ptr<PostDecodeVad> vad_ GUARDED_BY(crit_sect_);
const scoped_ptr<ExpandFactory> expand_factory_ GUARDED_BY(crit_sect_);
const scoped_ptr<AccelerateFactory> accelerate_factory_
const rtc::scoped_ptr<DtmfBuffer> dtmf_buffer_ GUARDED_BY(crit_sect_);
const rtc::scoped_ptr<DtmfToneGenerator> dtmf_tone_generator_
GUARDED_BY(crit_sect_);
const scoped_ptr<PreemptiveExpandFactory> preemptive_expand_factory_
const rtc::scoped_ptr<PacketBuffer> packet_buffer_ GUARDED_BY(crit_sect_);
const rtc::scoped_ptr<PayloadSplitter> payload_splitter_
GUARDED_BY(crit_sect_);
const rtc::scoped_ptr<TimestampScaler> timestamp_scaler_
GUARDED_BY(crit_sect_);
const rtc::scoped_ptr<PostDecodeVad> vad_ GUARDED_BY(crit_sect_);
const rtc::scoped_ptr<ExpandFactory> expand_factory_ GUARDED_BY(crit_sect_);
const rtc::scoped_ptr<AccelerateFactory> accelerate_factory_
GUARDED_BY(crit_sect_);
const rtc::scoped_ptr<PreemptiveExpandFactory> preemptive_expand_factory_
GUARDED_BY(crit_sect_);
scoped_ptr<BackgroundNoise> background_noise_ GUARDED_BY(crit_sect_);
scoped_ptr<DecisionLogic> decision_logic_ GUARDED_BY(crit_sect_);
scoped_ptr<AudioMultiVector> algorithm_buffer_ GUARDED_BY(crit_sect_);
scoped_ptr<SyncBuffer> sync_buffer_ GUARDED_BY(crit_sect_);
scoped_ptr<Expand> expand_ GUARDED_BY(crit_sect_);
scoped_ptr<Normal> normal_ GUARDED_BY(crit_sect_);
scoped_ptr<Merge> merge_ GUARDED_BY(crit_sect_);
scoped_ptr<Accelerate> accelerate_ GUARDED_BY(crit_sect_);
scoped_ptr<PreemptiveExpand> preemptive_expand_ GUARDED_BY(crit_sect_);
rtc::scoped_ptr<BackgroundNoise> background_noise_ GUARDED_BY(crit_sect_);
rtc::scoped_ptr<DecisionLogic> decision_logic_ GUARDED_BY(crit_sect_);
rtc::scoped_ptr<AudioMultiVector> algorithm_buffer_ GUARDED_BY(crit_sect_);
rtc::scoped_ptr<SyncBuffer> sync_buffer_ GUARDED_BY(crit_sect_);
rtc::scoped_ptr<Expand> expand_ GUARDED_BY(crit_sect_);
rtc::scoped_ptr<Normal> normal_ GUARDED_BY(crit_sect_);
rtc::scoped_ptr<Merge> merge_ GUARDED_BY(crit_sect_);
rtc::scoped_ptr<Accelerate> accelerate_ GUARDED_BY(crit_sect_);
rtc::scoped_ptr<PreemptiveExpand> preemptive_expand_ GUARDED_BY(crit_sect_);
RandomVector random_vector_ GUARDED_BY(crit_sect_);
scoped_ptr<ComfortNoise> comfort_noise_ GUARDED_BY(crit_sect_);
rtc::scoped_ptr<ComfortNoise> comfort_noise_ GUARDED_BY(crit_sect_);
Rtcp rtcp_ GUARDED_BY(crit_sect_);
StatisticsCalculator stats_ GUARDED_BY(crit_sect_);
int fs_hz_ GUARDED_BY(crit_sect_);
@ -372,9 +375,9 @@ class NetEqImpl : public webrtc::NetEq {
int output_size_samples_ GUARDED_BY(crit_sect_);
int decoder_frame_length_ GUARDED_BY(crit_sect_);
Modes last_mode_ GUARDED_BY(crit_sect_);
scoped_ptr<int16_t[]> mute_factor_array_ GUARDED_BY(crit_sect_);
rtc::scoped_ptr<int16_t[]> mute_factor_array_ GUARDED_BY(crit_sect_);
size_t decoded_buffer_length_ GUARDED_BY(crit_sect_);
scoped_ptr<int16_t[]> decoded_buffer_ GUARDED_BY(crit_sect_);
rtc::scoped_ptr<int16_t[]> decoded_buffer_ GUARDED_BY(crit_sect_);
uint32_t playout_timestamp_ GUARDED_BY(crit_sect_);
bool new_codec_ GUARDED_BY(crit_sect_);
uint32_t timestamp_ GUARDED_BY(crit_sect_);