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

Side by Side Diff: webrtc/test/call_test.h

Issue 1839603002: Remove webrtc::ScopedVector (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 8 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 unified diff | Download patch
« no previous file with comments | « webrtc/system_wrappers/system_wrappers_tests.gyp ('k') | webrtc/test/call_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 #ifndef WEBRTC_TEST_CALL_TEST_H_ 10 #ifndef WEBRTC_TEST_CALL_TEST_H_
11 #define WEBRTC_TEST_CALL_TEST_H_ 11 #define WEBRTC_TEST_CALL_TEST_H_
12 12
13 #include <memory>
13 #include <vector> 14 #include <vector>
14 15
15 #include "webrtc/call.h" 16 #include "webrtc/call.h"
16 #include "webrtc/call/transport_adapter.h" 17 #include "webrtc/call/transport_adapter.h"
17 #include "webrtc/system_wrappers/include/scoped_vector.h"
18 #include "webrtc/test/fake_audio_device.h" 18 #include "webrtc/test/fake_audio_device.h"
19 #include "webrtc/test/fake_decoder.h" 19 #include "webrtc/test/fake_decoder.h"
20 #include "webrtc/test/fake_encoder.h" 20 #include "webrtc/test/fake_encoder.h"
21 #include "webrtc/test/frame_generator_capturer.h" 21 #include "webrtc/test/frame_generator_capturer.h"
22 #include "webrtc/test/rtp_rtcp_observer.h" 22 #include "webrtc/test/rtp_rtcp_observer.h"
23 23
24 namespace webrtc { 24 namespace webrtc {
25 25
26 class VoEBase; 26 class VoEBase;
27 class VoECodec; 27 class VoECodec;
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 93
94 rtc::scoped_ptr<Call> receiver_call_; 94 rtc::scoped_ptr<Call> receiver_call_;
95 rtc::scoped_ptr<PacketTransport> receive_transport_; 95 rtc::scoped_ptr<PacketTransport> receive_transport_;
96 std::vector<VideoReceiveStream::Config> video_receive_configs_; 96 std::vector<VideoReceiveStream::Config> video_receive_configs_;
97 std::vector<VideoReceiveStream*> video_receive_streams_; 97 std::vector<VideoReceiveStream*> video_receive_streams_;
98 std::vector<AudioReceiveStream::Config> audio_receive_configs_; 98 std::vector<AudioReceiveStream::Config> audio_receive_configs_;
99 std::vector<AudioReceiveStream*> audio_receive_streams_; 99 std::vector<AudioReceiveStream*> audio_receive_streams_;
100 100
101 rtc::scoped_ptr<test::FrameGeneratorCapturer> frame_generator_capturer_; 101 rtc::scoped_ptr<test::FrameGeneratorCapturer> frame_generator_capturer_;
102 test::FakeEncoder fake_encoder_; 102 test::FakeEncoder fake_encoder_;
103 ScopedVector<VideoDecoder> allocated_decoders_; 103 std::vector<std::unique_ptr<VideoDecoder>> allocated_decoders_;
104 size_t num_video_streams_; 104 size_t num_video_streams_;
105 size_t num_audio_streams_; 105 size_t num_audio_streams_;
106 106
107 private: 107 private:
108 // TODO(holmer): Remove once VoiceEngine is fully refactored to the new API. 108 // TODO(holmer): Remove once VoiceEngine is fully refactored to the new API.
109 // These methods are used to set up legacy voice engines and channels which is 109 // These methods are used to set up legacy voice engines and channels which is
110 // necessary while voice engine is being refactored to the new stream API. 110 // necessary while voice engine is being refactored to the new stream API.
111 struct VoiceEngineState { 111 struct VoiceEngineState {
112 VoiceEngineState() 112 VoiceEngineState()
113 : voice_engine(nullptr), 113 : voice_engine(nullptr),
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 public: 186 public:
187 explicit EndToEndTest(unsigned int timeout_ms); 187 explicit EndToEndTest(unsigned int timeout_ms);
188 188
189 bool ShouldCreateReceivers() const override; 189 bool ShouldCreateReceivers() const override;
190 }; 190 };
191 191
192 } // namespace test 192 } // namespace test
193 } // namespace webrtc 193 } // namespace webrtc
194 194
195 #endif // WEBRTC_TEST_CALL_TEST_H_ 195 #endif // WEBRTC_TEST_CALL_TEST_H_
OLDNEW
« no previous file with comments | « webrtc/system_wrappers/system_wrappers_tests.gyp ('k') | webrtc/test/call_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698