webrtc/modules/audio_coding/acm2/acm_send_test_oldapi.h - Issue 1694073002: Replace scoped_ptr with unique_ptr in webrtc/modules/audio_coding/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/modules/audio_coding/acm2/acm_send_test_oldapi.h

Issue 1694073002: Replace scoped_ptr with unique_ptr in webrtc/modules/audio_coding/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@up-actest

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

« webrtc/modules/audio_coding/acm2/acm_receive_test_oldapi.cc ('K') | « webrtc/modules/audio_coding/acm2/acm_receiver_unittest_oldapi.cc ('k') | webrtc/modules/audio_coding/acm2/audio_coding_module_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/audio_coding/acm2/acm_send_test_oldapi.h

diff --git a/webrtc/modules/audio_coding/acm2/acm_send_test_oldapi.h b/webrtc/modules/audio_coding/acm2/acm_send_test_oldapi.h

index ce68196a3f474a6777ced8cd3a91316b83e1a141..cfee35302063a1c44afbfa5d8997306ec577abe6 100644

--- a/webrtc/modules/audio_coding/acm2/acm_send_test_oldapi.h

+++ b/webrtc/modules/audio_coding/acm2/acm_send_test_oldapi.h

@@ -11,10 +11,10 @@

#ifndef WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_SEND_TEST_OLDAPI_H_

#define WEBRTC_MODULES_AUDIO_CODING_ACM2_ACM_SEND_TEST_OLDAPI_H_

+#include <memory>

#include <vector>

#include "webrtc/base/constructormagic.h"

-#include "webrtc/base/scoped_ptr.h"

#include "webrtc/modules/audio_coding/include/audio_coding_module.h"

#include "webrtc/modules/audio_coding/neteq/tools/packet_source.h"

#include "webrtc/system_wrappers/include/clock.h"

@@ -68,7 +68,7 @@ class AcmSendTestOldApi : public AudioPacketizationCallback,

Packet* CreatePacket();

SimulatedClock clock_;

- rtc::scoped_ptr<AudioCodingModule> acm_;

+ std::unique_ptr<AudioCodingModule> acm_;

InputAudioFile* audio_source_;

int source_rate_hz_;

const size_t input_block_size_samples_;