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

Replace scoped_ptr with unique_ptr in webrtc/modules/audio_coding/neteq/

Browse Source 
BUG=webrtc:5520

Review URL: https://codereview.webrtc.org/1697823002

Cr-Commit-Position: refs/heads/master@{#11616}
This commit is contained in:
kwiberg
2016-02-14 09:28:33 -08:00
committed by Commit bot
parent 04af839a88
commit 2d0c33277c
35 changed files with 158 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
webrtc/modules/audio_coding/neteq/neteq_unittest.cc
View File

@ -19,13 +19,13 @@
#include <string.h> // memset
#include <algorithm>
#include <memory>
#include <set>
#include <string>
#include <vector>
#include "gflags/gflags.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/modules/audio_coding/neteq/tools/audio_loop.h"
#include "webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h"
#include "webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.h"
@ -102,7 +102,7 @@ void ReadMessage(FILE* file, std::string* message) {
ASSERT_EQ(1u, fread(&size, sizeof(size), 1, file));
if (size <= 0)
return;
rtc::scoped_ptr<char[]> buffer(new char[size]);
std::unique_ptr<char[]> buffer(new char[size]);
ASSERT_EQ(static_cast<size_t>(size),
fread(buffer.get(), sizeof(char), size, file));
message->assign(buffer.get(), size);
@ -320,8 +320,8 @@ class NetEqDecodingTest : public ::testing::Test {
NetEq* neteq_;
NetEq::Config config_;
rtc::scoped_ptr<test::RtpFileSource> rtp_source_;
rtc::scoped_ptr<test::Packet> packet_;
std::unique_ptr<test::RtpFileSource> rtp_source_;
std::unique_ptr<test::Packet> packet_;
unsigned int sim_clock_;
int16_t out_data_[kMaxBlockSize];
int output_sample_rate_;