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

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

Issue 2377023002: Now pass ADM as a constructor argument to audio_state. (Closed)
Patch Set: Removed audio_transport() mock calls in tests. Created 4 years, 2 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
« webrtc/api/call/audio_state.h ('K') | « webrtc/test/call_test.cc ('k') | no next file » | 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) 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 #include "webrtc/video/video_quality_test.h" 10 #include "webrtc/video/video_quality_test.h"
(...skipping 1225 matching lines...) Expand 10 before | Expand all | Expand 10 after
1236 // TODO(ivica): Remove bitrate_config and use the default Call::Config(), to 1236 // TODO(ivica): Remove bitrate_config and use the default Call::Config(), to
1237 // match the full stack tests. 1237 // match the full stack tests.
1238 Call::Config call_config; 1238 Call::Config call_config;
1239 call_config.bitrate_config = params_.common.call_bitrate_config; 1239 call_config.bitrate_config = params_.common.call_bitrate_config;
1240 1240
1241 ::VoiceEngineState voe; 1241 ::VoiceEngineState voe;
1242 if (params_.audio) { 1242 if (params_.audio) {
1243 CreateVoiceEngine(&voe, decoder_factory_); 1243 CreateVoiceEngine(&voe, decoder_factory_);
1244 AudioState::Config audio_state_config; 1244 AudioState::Config audio_state_config;
1245 audio_state_config.voice_engine = voe.voice_engine; 1245 audio_state_config.voice_engine = voe.voice_engine;
1246 call_config.audio_state = AudioState::Create(audio_state_config); 1246 call_config.audio_state = AudioState::Create(audio_state_config, nullptr);
1247 } 1247 }
1248 1248
1249 std::unique_ptr<Call> call(Call::Create(call_config)); 1249 std::unique_ptr<Call> call(Call::Create(call_config));
1250 1250
1251 test::LayerFilteringTransport transport( 1251 test::LayerFilteringTransport transport(
1252 params.pipe, call.get(), kPayloadTypeVP8, kPayloadTypeVP9, 1252 params.pipe, call.get(), kPayloadTypeVP8, kPayloadTypeVP9,
1253 params.common.selected_tl, params_.ss.selected_sl); 1253 params.common.selected_tl, params_.ss.selected_sl);
1254 // TODO(ivica): Use two calls to be able to merge with RunWithAnalyzer or at 1254 // TODO(ivica): Use two calls to be able to merge with RunWithAnalyzer or at
1255 // least share as much code as possible. That way this test would also match 1255 // least share as much code as possible. That way this test would also match
1256 // the full stack tests better. 1256 // the full stack tests better.
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
1390 std::ostringstream str; 1390 std::ostringstream str;
1391 str << receive_logs_++; 1391 str << receive_logs_++;
1392 std::string path = 1392 std::string path =
1393 params_.common.encoded_frame_base_path + "." + str.str() + ".recv.ivf"; 1393 params_.common.encoded_frame_base_path + "." + str.str() + ".recv.ivf";
1394 stream->EnableEncodedFrameRecording(rtc::CreatePlatformFile(path), 1394 stream->EnableEncodedFrameRecording(rtc::CreatePlatformFile(path),
1395 10000000); 1395 10000000);
1396 } 1396 }
1397 } 1397 }
1398 1398
1399 } // namespace webrtc 1399 } // namespace webrtc
OLDNEW
« webrtc/api/call/audio_state.h ('K') | « webrtc/test/call_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698