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

Side by Side Diff: webrtc/video/video_quality_test.h

Issue 2136573002: Adding audio to video_quality_test. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: using fake audio device Created 4 years, 5 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 | « no previous file | webrtc/video/video_quality_test.cc » ('j') | webrtc/video/video_quality_test.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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_VIDEO_VIDEO_QUALITY_TEST_H_ 10 #ifndef WEBRTC_VIDEO_VIDEO_QUALITY_TEST_H_
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 98
99 // Helper static methods. 99 // Helper static methods.
100 static VideoStream DefaultVideoStream(const Params& params); 100 static VideoStream DefaultVideoStream(const Params& params);
101 static std::vector<int> ParseCSV(const std::string& str); 101 static std::vector<int> ParseCSV(const std::string& str);
102 102
103 // Helper methods for setting up the call. 103 // Helper methods for setting up the call.
104 void CreateCapturer(VideoCaptureInput* input); 104 void CreateCapturer(VideoCaptureInput* input);
105 void SetupCommon(Transport* send_transport, Transport* recv_transport); 105 void SetupCommon(Transport* send_transport, Transport* recv_transport);
106 void SetupScreenshare(); 106 void SetupScreenshare();
107 107
108 void CreateVoiceEngine();
109 void DestroyVoiceEngine();
110
108 // We need a more general capturer than the FrameGeneratorCapturer. 111 // We need a more general capturer than the FrameGeneratorCapturer.
109 std::unique_ptr<test::VideoCapturer> capturer_; 112 std::unique_ptr<test::VideoCapturer> capturer_;
110 std::unique_ptr<test::TraceToStderr> trace_to_stderr_; 113 std::unique_ptr<test::TraceToStderr> trace_to_stderr_;
111 std::unique_ptr<test::FrameGenerator> frame_generator_; 114 std::unique_ptr<test::FrameGenerator> frame_generator_;
112 std::unique_ptr<VideoEncoder> encoder_; 115 std::unique_ptr<VideoEncoder> encoder_;
113 VideoCodecUnion codec_settings_; 116 VideoCodecUnion codec_settings_;
114 Clock* const clock_; 117 Clock* const clock_;
115 118
119 struct VoiceEngineState {
minyue-webrtc 2016/07/12 10:09:36 I think this, and CreateVoiceEngine/DestroyVoiceEn
120 VoiceEngineState()
121 : voice_engine(nullptr),
122 base(nullptr),
123 codec(nullptr),
124 send_channel_id(-1),
125 receive_channel_id(-1) {}
126
127 VoiceEngine* voice_engine;
128 VoEBase* base;
129 VoECodec* codec;
130 int send_channel_id;
131 int receive_channel_id;
132 };
133 VoiceEngineState voe_;
134 std::unique_ptr<test::FakeAudioDevice> fake_audio_device_;
135
116 Params params_; 136 Params params_;
117 }; 137 };
118 138
119 } // namespace webrtc 139 } // namespace webrtc
120 140
121 #endif // WEBRTC_VIDEO_VIDEO_QUALITY_TEST_H_ 141 #endif // WEBRTC_VIDEO_VIDEO_QUALITY_TEST_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/video/video_quality_test.cc » ('j') | webrtc/video/video_quality_test.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698