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

Side by Side Diff: webrtc/call/call_unittest.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
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 10
11 #include <list> 11 #include <list>
12 #include <memory> 12 #include <memory>
13 13
14 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
15 15
16 #include "webrtc/api/call/audio_state.h" 16 #include "webrtc/api/call/audio_state.h"
17 #include "webrtc/call.h" 17 #include "webrtc/call.h"
18 #include "webrtc/modules/audio_coding/codecs/mock/mock_audio_decoder_factory.h" 18 #include "webrtc/modules/audio_coding/codecs/mock/mock_audio_decoder_factory.h"
19 #include "webrtc/test/mock_voice_engine.h" 19 #include "webrtc/test/mock_voice_engine.h"
20 20
21 namespace { 21 namespace {
22 22
23 struct CallHelper { 23 struct CallHelper {
24 explicit CallHelper( 24 explicit CallHelper(
25 rtc::scoped_refptr<webrtc::AudioDecoderFactory> decoder_factory = nullptr) 25 rtc::scoped_refptr<webrtc::AudioDecoderFactory> decoder_factory = nullptr)
26 : voice_engine_(decoder_factory) { 26 : voice_engine_(decoder_factory) {
27 webrtc::AudioState::Config audio_state_config; 27 webrtc::AudioState::Config audio_state_config;
28 audio_state_config.voice_engine = &voice_engine_; 28 audio_state_config.voice_engine = &voice_engine_;
29 webrtc::Call::Config config; 29 webrtc::Call::Config config;
30 config.audio_state = webrtc::AudioState::Create(audio_state_config); 30 config.audio_state =
31 webrtc::AudioState::Create(audio_state_config, nullptr);
31 call_.reset(webrtc::Call::Create(config)); 32 call_.reset(webrtc::Call::Create(config));
32 } 33 }
33 34
34 webrtc::Call* operator->() { return call_.get(); } 35 webrtc::Call* operator->() { return call_.get(); }
35 36
36 private: 37 private:
37 testing::NiceMock<webrtc::test::MockVoiceEngine> voice_engine_; 38 testing::NiceMock<webrtc::test::MockVoiceEngine> voice_engine_;
38 std::unique_ptr<webrtc::Call> call_; 39 std::unique_ptr<webrtc::Call> call_;
39 }; 40 };
40 } // namespace 41 } // namespace
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 streams.push_front(stream); 111 streams.push_front(stream);
111 } 112 }
112 } 113 }
113 for (auto s : streams) { 114 for (auto s : streams) {
114 call->DestroyAudioReceiveStream(s); 115 call->DestroyAudioReceiveStream(s);
115 } 116 }
116 streams.clear(); 117 streams.clear();
117 } 118 }
118 } 119 }
119 } // namespace webrtc 120 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698