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

8
webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_test.h
View File

@ -13,7 +13,7 @@
#include <string>
#include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/typedefs.h"
namespace webrtc {
@ -60,11 +60,11 @@ class AudioCodecSpeedTest : public testing::TestWithParam<coding_param> {
// Expected output number of samples-per-channel in a frame.
int output_length_sample_;
scoped_ptr<int16_t[]> in_data_;
scoped_ptr<int16_t[]> out_data_;
rtc::scoped_ptr<int16_t[]> in_data_;
rtc::scoped_ptr<int16_t[]> out_data_;
size_t data_pointer_;
size_t loop_length_samples_;
scoped_ptr<uint8_t[]> bit_stream_;
rtc::scoped_ptr<uint8_t[]> bit_stream_;
// Maximum number of bytes in output bitstream for a frame of audio.
int max_bytes_;