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

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

Issue 1909333002: Switch voice transport to use Call and Stream instead of VoENetwork. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: VoE::Channel external transport fix Created 4 years, 7 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
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 <memory>
14 #include <vector> 14 #include <vector>
15 15
16 #include "webrtc/call.h" 16 #include "webrtc/call.h"
17 #include "webrtc/call/transport_adapter.h"
18 #include "webrtc/test/fake_audio_device.h" 17 #include "webrtc/test/fake_audio_device.h"
19 #include "webrtc/test/fake_decoder.h" 18 #include "webrtc/test/fake_decoder.h"
20 #include "webrtc/test/fake_encoder.h" 19 #include "webrtc/test/fake_encoder.h"
21 #include "webrtc/test/frame_generator_capturer.h" 20 #include "webrtc/test/frame_generator_capturer.h"
22 #include "webrtc/test/rtp_rtcp_observer.h" 21 #include "webrtc/test/rtp_rtcp_observer.h"
23 22
24 namespace webrtc { 23 namespace webrtc {
25 24
26 class VoEBase; 25 class VoEBase;
27 class VoECodec; 26 class VoECodec;
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 private: 107 private:
109 // 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.
110 // 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
111 // 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.
112 struct VoiceEngineState { 111 struct VoiceEngineState {
113 VoiceEngineState() 112 VoiceEngineState()
114 : voice_engine(nullptr), 113 : voice_engine(nullptr),
115 base(nullptr), 114 base(nullptr),
116 network(nullptr), 115 network(nullptr),
117 codec(nullptr), 116 codec(nullptr),
118 channel_id(-1), 117 channel_id(-1) {}
119 transport_adapter(nullptr) {}
120 118
121 VoiceEngine* voice_engine; 119 VoiceEngine* voice_engine;
122 VoEBase* base; 120 VoEBase* base;
123 VoENetwork* network; 121 VoENetwork* network;
the sun 2016/04/28 09:15:57 Remove?
mflodman 2016/04/29 05:54:00 Done here and in cc-file.
124 VoECodec* codec; 122 VoECodec* codec;
125 int channel_id; 123 int channel_id;
126 rtc::scoped_ptr<internal::TransportAdapter> transport_adapter;
127 }; 124 };
128 125
129 void CreateVoiceEngines(); 126 void CreateVoiceEngines();
130 void SetupVoiceEngineTransports(PacketTransport* send_transport,
131 PacketTransport* recv_transport);
132 void DestroyVoiceEngines(); 127 void DestroyVoiceEngines();
133 128
134 VoiceEngineState voe_send_; 129 VoiceEngineState voe_send_;
135 VoiceEngineState voe_recv_; 130 VoiceEngineState voe_recv_;
136 131
137 // The audio devices must outlive the voice engines. 132 // The audio devices must outlive the voice engines.
138 rtc::scoped_ptr<test::FakeAudioDevice> fake_send_audio_device_; 133 rtc::scoped_ptr<test::FakeAudioDevice> fake_send_audio_device_;
139 rtc::scoped_ptr<test::FakeAudioDevice> fake_recv_audio_device_; 134 rtc::scoped_ptr<test::FakeAudioDevice> fake_recv_audio_device_;
140 }; 135 };
141 136
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 public: 182 public:
188 explicit EndToEndTest(unsigned int timeout_ms); 183 explicit EndToEndTest(unsigned int timeout_ms);
189 184
190 bool ShouldCreateReceivers() const override; 185 bool ShouldCreateReceivers() const override;
191 }; 186 };
192 187
193 } // namespace test 188 } // namespace test
194 } // namespace webrtc 189 } // namespace webrtc
195 190
196 #endif // WEBRTC_TEST_CALL_TEST_H_ 191 #endif // WEBRTC_TEST_CALL_TEST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698