Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(132)

Unified Diff: webrtc/voice_engine/channel.cc

Issue 1702983002: Replace scoped_ptr with unique_ptr in webrtc/voice_engine/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/voice_engine/channel.h ('k') | webrtc/voice_engine/channel_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/voice_engine/channel.cc
diff --git a/webrtc/voice_engine/channel.cc b/webrtc/voice_engine/channel.cc
index c078d20a91cc513b758206de427f8a991f3810b2..9e27ce8b7b7162905a036f6d52a639c96d17bfa0 100644
--- a/webrtc/voice_engine/channel.cc
+++ b/webrtc/voice_engine/channel.cc
@@ -1071,7 +1071,7 @@ int32_t Channel::UpdateLocalTimeStamp() {
return 0;
}
-void Channel::SetSink(rtc::scoped_ptr<AudioSinkInterface> sink) {
+void Channel::SetSink(std::unique_ptr<AudioSinkInterface> sink) {
rtc::CritScope cs(&_callbackCritSect);
audio_sink_ = std::move(sink);
}
@@ -3265,7 +3265,7 @@ int Channel::GetRtpRtcp(RtpRtcp** rtpRtcpModule,
// TODO(andrew): refactor Mix functions here and in transmit_mixer.cc to use
// a shared helper.
int32_t Channel::MixOrReplaceAudioWithFile(int mixingFrequency) {
- rtc::scoped_ptr<int16_t[]> fileBuffer(new int16_t[640]);
+ std::unique_ptr<int16_t[]> fileBuffer(new int16_t[640]);
size_t fileSamples(0);
{
@@ -3313,7 +3313,7 @@ int32_t Channel::MixOrReplaceAudioWithFile(int mixingFrequency) {
int32_t Channel::MixAudioWithFile(AudioFrame& audioFrame, int mixingFrequency) {
assert(mixingFrequency <= 48000);
- rtc::scoped_ptr<int16_t[]> fileBuffer(new int16_t[960]);
+ std::unique_ptr<int16_t[]> fileBuffer(new int16_t[960]);
size_t fileSamples(0);
{
« no previous file with comments | « webrtc/voice_engine/channel.h ('k') | webrtc/voice_engine/channel_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698