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

Side by Side Diff: trunk/src/content/renderer/media/webrtc_audio_capturer_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 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());
101 capturer_source_ = new MockCapturerSource(); 100 capturer_source_ = new MockCapturerSource();
102 EXPECT_CALL(*capturer_source_.get(), Initialize(_, capturer_.get(), 0)); 101 EXPECT_CALL(*capturer_source_.get(), Initialize(_, capturer_.get(), 0));
103 capturer_->SetCapturerSource(capturer_source_, 102 capturer_->SetCapturerSource(capturer_source_,
104 params_.channel_layout(), 103 params_.channel_layout(),
105 params_.sample_rate(), 104 params_.sample_rate());
106 params_.effects());
107 105
108 EXPECT_CALL(*capturer_source_.get(), SetAutomaticGainControl(true)); 106 EXPECT_CALL(*capturer_source_.get(), SetAutomaticGainControl(true));
109 EXPECT_CALL(*capturer_source_.get(), Start()); 107 EXPECT_CALL(*capturer_source_.get(), Start());
110 RTCMediaConstraints constraints; 108 RTCMediaConstraints constraints;
111 ApplyFixedAudioConstraints(&constraints); 109 ApplyFixedAudioConstraints(&constraints);
112 track_ = WebRtcLocalAudioTrack::Create(std::string(), capturer_, NULL, 110 track_ = WebRtcLocalAudioTrack::Create(std::string(), capturer_, NULL,
113 NULL, &constraints); 111 NULL, &constraints);
114 static_cast<WebRtcLocalAudioSourceProvider*>( 112 static_cast<WebRtcLocalAudioSourceProvider*>(
115 track_->audio_source_provider())->SetSinkParamsForTesting(params_); 113 track_->audio_source_provider())->SetSinkParamsForTesting(params_);
116 track_->Start(); 114 track_->Start();
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 EXPECT_EQ(cached_delay.InMilliseconds(), delay_ms); 163 EXPECT_EQ(cached_delay.InMilliseconds(), delay_ms);
166 EXPECT_EQ(cached_volume, expected_volume_value); 164 EXPECT_EQ(cached_volume, expected_volume_value);
167 EXPECT_EQ(cached_key_pressed, key_pressed); 165 EXPECT_EQ(cached_key_pressed, key_pressed);
168 166
169 track_->RemoveSink(sink.get()); 167 track_->RemoveSink(sink.get());
170 EXPECT_CALL(*capturer_source_.get(), Stop()); 168 EXPECT_CALL(*capturer_source_.get(), Stop());
171 capturer_->Stop(); 169 capturer_->Stop();
172 } 170 }
173 171
174 } // namespace content 172 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698