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

Side by Side Diff: trunk/src/content/renderer/media/webrtc_audio_device_unittest.cc

Issue 110303003: Revert 240548 "Enable platform echo cancellation through the Aud..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <vector> 5 #include <vector>
6 6
7 #include "base/environment.h" 7 #include "base/environment.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 113
114 media::AudioHardwareConfig* hardware_config = 114 media::AudioHardwareConfig* hardware_config =
115 RenderThreadImpl::current()->GetAudioHardwareConfig(); 115 RenderThreadImpl::current()->GetAudioHardwareConfig();
116 116
117 // Use native capture sample rate and channel configuration to get some 117 // Use native capture sample rate and channel configuration to get some
118 // action in this test. 118 // action in this test.
119 int sample_rate = hardware_config->GetInputSampleRate(); 119 int sample_rate = hardware_config->GetInputSampleRate();
120 media::ChannelLayout channel_layout = 120 media::ChannelLayout channel_layout =
121 hardware_config->GetInputChannelLayout(); 121 hardware_config->GetInputChannelLayout();
122 if (!capturer->Initialize(kRenderViewId, channel_layout, sample_rate, 0, 1, 122 if (!capturer->Initialize(kRenderViewId, channel_layout, sample_rate, 0, 1,
123 media::AudioManagerBase::kDefaultDeviceId, 0, 0, 123 media::AudioManagerBase::kDefaultDeviceId, 0 ,0)) {
124 media::AudioParameters::NO_EFFECTS)) {
125 return false; 124 return false;
126 } 125 }
127 126
128 // Add the capturer to the WebRtcAudioDeviceImpl. 127 // Add the capturer to the WebRtcAudioDeviceImpl.
129 webrtc_audio_device->AddAudioCapturer(capturer); 128 webrtc_audio_device->AddAudioCapturer(capturer);
130 129
131 return true; 130 return true;
132 } 131 }
133 132
134 // Create and start a local audio track. Starting the audio track will connect 133 // Create and start a local audio track. Starting the audio track will connect
(...skipping 835 matching lines...) Expand 10 before | Expand all | Expand 10 after
970 LOG(WARNING) << "Test disabled due to the test hangs on WinXP."; 969 LOG(WARNING) << "Test disabled due to the test hangs on WinXP.";
971 return; 970 return;
972 } 971 }
973 #endif 972 #endif
974 int latency = RunWebRtcLoopbackTimeTest(audio_manager_.get(), true); 973 int latency = RunWebRtcLoopbackTimeTest(audio_manager_.get(), true);
975 PrintPerfResultMs("webrtc_loopback_with_signal_processing (100 packets)", 974 PrintPerfResultMs("webrtc_loopback_with_signal_processing (100 packets)",
976 "t", latency); 975 "t", latency);
977 } 976 }
978 977
979 } // namespace content 978 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698