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

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

Issue 2447723002: Remove use of VoECodec in video/call tests. (Closed)
Patch Set: sign Created 4 years, 1 month 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/call/call_perf_tests.cc ('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 <memory>
14 #include <vector> 14 #include <vector>
15 15
16 #include "webrtc/call.h" 16 #include "webrtc/call.h"
17 #include "webrtc/logging/rtc_event_log/rtc_event_log.h" 17 #include "webrtc/logging/rtc_event_log/rtc_event_log.h"
18 #include "webrtc/test/encoder_settings.h" 18 #include "webrtc/test/encoder_settings.h"
19 #include "webrtc/test/fake_audio_device.h" 19 #include "webrtc/test/fake_audio_device.h"
20 #include "webrtc/test/fake_decoder.h" 20 #include "webrtc/test/fake_decoder.h"
21 #include "webrtc/test/fake_encoder.h" 21 #include "webrtc/test/fake_encoder.h"
22 #include "webrtc/test/fake_videorenderer.h" 22 #include "webrtc/test/fake_videorenderer.h"
23 #include "webrtc/test/frame_generator_capturer.h" 23 #include "webrtc/test/frame_generator_capturer.h"
24 #include "webrtc/test/rtp_rtcp_observer.h" 24 #include "webrtc/test/rtp_rtcp_observer.h"
25 25
26 namespace webrtc { 26 namespace webrtc {
27 27
28 class VoEBase; 28 class VoEBase;
29 class VoECodec;
30 29
31 namespace test { 30 namespace test {
32 31
33 class BaseTest; 32 class BaseTest;
34 33
35 class CallTest : public ::testing::Test { 34 class CallTest : public ::testing::Test {
36 public: 35 public:
37 CallTest(); 36 CallTest();
38 virtual ~CallTest(); 37 virtual ~CallTest();
39 38
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 test::FakeVideoRenderer fake_renderer_; 115 test::FakeVideoRenderer fake_renderer_;
117 116
118 private: 117 private:
119 // TODO(holmer): Remove once VoiceEngine is fully refactored to the new API. 118 // TODO(holmer): Remove once VoiceEngine is fully refactored to the new API.
120 // These methods are used to set up legacy voice engines and channels which is 119 // These methods are used to set up legacy voice engines and channels which is
121 // necessary while voice engine is being refactored to the new stream API. 120 // necessary while voice engine is being refactored to the new stream API.
122 struct VoiceEngineState { 121 struct VoiceEngineState {
123 VoiceEngineState() 122 VoiceEngineState()
124 : voice_engine(nullptr), 123 : voice_engine(nullptr),
125 base(nullptr), 124 base(nullptr),
126 codec(nullptr),
127 channel_id(-1) {} 125 channel_id(-1) {}
128 126
129 VoiceEngine* voice_engine; 127 VoiceEngine* voice_engine;
130 VoEBase* base; 128 VoEBase* base;
131 VoECodec* codec;
132 int channel_id; 129 int channel_id;
133 }; 130 };
134 131
135 void CreateVoiceEngines(); 132 void CreateVoiceEngines();
136 void DestroyVoiceEngines(); 133 void DestroyVoiceEngines();
137 134
138 VoiceEngineState voe_send_; 135 VoiceEngineState voe_send_;
139 VoiceEngineState voe_recv_; 136 VoiceEngineState voe_recv_;
140 137
141 // The audio devices must outlive the voice engines. 138 // The audio devices must outlive the voice engines.
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 public: 193 public:
197 explicit EndToEndTest(unsigned int timeout_ms); 194 explicit EndToEndTest(unsigned int timeout_ms);
198 195
199 bool ShouldCreateReceivers() const override; 196 bool ShouldCreateReceivers() const override;
200 }; 197 };
201 198
202 } // namespace test 199 } // namespace test
203 } // namespace webrtc 200 } // namespace webrtc
204 201
205 #endif // WEBRTC_TEST_CALL_TEST_H_ 202 #endif // WEBRTC_TEST_CALL_TEST_H_
OLDNEW
« no previous file with comments | « webrtc/call/call_perf_tests.cc ('k') | webrtc/test/call_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698