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

Side by Side Diff: content/renderer/media/webrtc_audio_capturer_unittest.cc

Issue 115413002: Enable platform echo cancellation through the AudioRecord path. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "base/logging.h" 5 #include "base/logging.h"
6 #include "content/renderer/media/rtc_media_constraints.h" 6 #include "content/renderer/media/rtc_media_constraints.h"
7 #include "content/renderer/media/webrtc_audio_capturer.h" 7 #include "content/renderer/media/webrtc_audio_capturer.h"
8 #include "content/renderer/media/webrtc_local_audio_track.h" 8 #include "content/renderer/media/webrtc_local_audio_track.h"
9 #include "media/audio/audio_parameters.h" 9 #include "media/audio/audio_parameters.h"
10 #include "media/base/audio_bus.h" 10 #include "media/base/audio_bus.h"
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 #if defined(OS_ANDROID) 89 #if defined(OS_ANDROID)
90 : params_(media::AudioParameters::AUDIO_PCM_LOW_LATENCY, 90 : params_(media::AudioParameters::AUDIO_PCM_LOW_LATENCY,
91 media::CHANNEL_LAYOUT_STEREO, 48000, 16, 960) { 91 media::CHANNEL_LAYOUT_STEREO, 48000, 16, 960) {
92 // Android works with a buffer size bigger than 20ms. 92 // Android works with a buffer size bigger than 20ms.
93 #else 93 #else
94 : params_(media::AudioParameters::AUDIO_PCM_LOW_LATENCY, 94 : params_(media::AudioParameters::AUDIO_PCM_LOW_LATENCY,
95 media::CHANNEL_LAYOUT_STEREO, 48000, 16, 128) { 95 media::CHANNEL_LAYOUT_STEREO, 48000, 16, 128) {
96 #endif 96 #endif
97 capturer_ = WebRtcAudioCapturer::CreateCapturer(); 97 capturer_ = WebRtcAudioCapturer::CreateCapturer();
98 capturer_->Initialize(-1, params_.channel_layout(), params_.sample_rate(), 98 capturer_->Initialize(-1, params_.channel_layout(), params_.sample_rate(),
99 params_.frames_per_buffer(), 0, std::string(), 0, 0); 99 params_.frames_per_buffer(), 0, std::string(), 0, 0,
100 params_.effects());
100 capturer_source_ = new MockCapturerSource(); 101 capturer_source_ = new MockCapturerSource();
101 EXPECT_CALL(*capturer_source_.get(), Initialize(_, capturer_.get(), 0)); 102 EXPECT_CALL(*capturer_source_.get(), Initialize(_, capturer_.get(), 0));
102 capturer_->SetCapturerSource(capturer_source_, 103 capturer_->SetCapturerSource(capturer_source_,
103 params_.channel_layout(), 104 params_.channel_layout(),
104 params_.sample_rate()); 105 params_.sample_rate(),
106 params_.effects());
105 107
106 EXPECT_CALL(*capturer_source_.get(), SetAutomaticGainControl(true)); 108 EXPECT_CALL(*capturer_source_.get(), SetAutomaticGainControl(true));
107 EXPECT_CALL(*capturer_source_.get(), Start()); 109 EXPECT_CALL(*capturer_source_.get(), Start());
108 RTCMediaConstraints constraints; 110 RTCMediaConstraints constraints;
109 ApplyFixedAudioConstraints(&constraints); 111 ApplyFixedAudioConstraints(&constraints);
110 track_ = WebRtcLocalAudioTrack::Create(std::string(), capturer_, NULL, 112 track_ = WebRtcLocalAudioTrack::Create(std::string(), capturer_, NULL,
111 NULL, &constraints); 113 NULL, &constraints);
112 static_cast<WebRtcLocalAudioSourceProvider*>( 114 static_cast<WebRtcLocalAudioSourceProvider*>(
113 track_->audio_source_provider())->SetSinkParamsForTesting(params_); 115 track_->audio_source_provider())->SetSinkParamsForTesting(params_);
114 track_->Start(); 116 track_->Start();
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 EXPECT_EQ(cached_delay.InMilliseconds(), delay_ms); 165 EXPECT_EQ(cached_delay.InMilliseconds(), delay_ms);
164 EXPECT_EQ(cached_volume, expected_volume_value); 166 EXPECT_EQ(cached_volume, expected_volume_value);
165 EXPECT_EQ(cached_key_pressed, key_pressed); 167 EXPECT_EQ(cached_key_pressed, key_pressed);
166 168
167 track_->RemoveSink(sink.get()); 169 track_->RemoveSink(sink.get());
168 EXPECT_CALL(*capturer_source_.get(), Stop()); 170 EXPECT_CALL(*capturer_source_.get(), Stop());
169 capturer_->Stop(); 171 capturer_->Stop();
170 } 172 }
171 173
172 } // namespace content 174 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/webrtc_audio_capturer.cc ('k') | content/renderer/media/webrtc_audio_device_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698