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

Side by Side Diff: webrtc/media/engine/fakewebrtcvoiceengine.h

Issue 2969213002: External APM usage downstream dependency support cleanup (Closed)
Patch Set: Changes in response to reviewer commments Created 3 years, 5 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
« no previous file with comments | « webrtc/audio/audio_state.cc ('k') | webrtc/voice_engine/include/voe_base.h » ('j') | 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) 2010 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2010 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
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 webrtc::AudioProcessing* audioproc, 65 webrtc::AudioProcessing* audioproc,
66 const rtc::scoped_refptr<webrtc::AudioDecoderFactory>& 66 const rtc::scoped_refptr<webrtc::AudioDecoderFactory>&
67 decoder_factory)) { 67 decoder_factory)) {
68 inited_ = true; 68 inited_ = true;
69 return 0; 69 return 0;
70 } 70 }
71 WEBRTC_FUNC(Terminate, ()) { 71 WEBRTC_FUNC(Terminate, ()) {
72 inited_ = false; 72 inited_ = false;
73 return 0; 73 return 0;
74 } 74 }
75 // TODO(peah): Remove this when downstream dependencies have properly been
76 // resolved.
77 webrtc::AudioProcessing* audio_processing() override { return nullptr; }
78 webrtc::AudioDeviceModule* audio_device_module() override { 75 webrtc::AudioDeviceModule* audio_device_module() override {
79 return nullptr; 76 return nullptr;
80 } 77 }
81 webrtc::voe::TransmitMixer* transmit_mixer() override { 78 webrtc::voe::TransmitMixer* transmit_mixer() override {
82 return transmit_mixer_; 79 return transmit_mixer_;
83 } 80 }
84 WEBRTC_FUNC(CreateChannel, ()) { 81 WEBRTC_FUNC(CreateChannel, ()) {
85 return CreateChannel(webrtc::VoEBase::ChannelConfig()); 82 return CreateChannel(webrtc::VoEBase::ChannelConfig());
86 } 83 }
87 WEBRTC_FUNC(CreateChannel, (const webrtc::VoEBase::ChannelConfig& config)) { 84 WEBRTC_FUNC(CreateChannel, (const webrtc::VoEBase::ChannelConfig& config)) {
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 std::map<int, Channel*> channels_; 126 std::map<int, Channel*> channels_;
130 bool fail_create_channel_ = false; 127 bool fail_create_channel_ = false;
131 webrtc::voe::TransmitMixer* transmit_mixer_ = nullptr; 128 webrtc::voe::TransmitMixer* transmit_mixer_ = nullptr;
132 129
133 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(FakeWebRtcVoiceEngine); 130 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(FakeWebRtcVoiceEngine);
134 }; 131 };
135 132
136 } // namespace cricket 133 } // namespace cricket
137 134
138 #endif // WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVOICEENGINE_H_ 135 #endif // WEBRTC_MEDIA_ENGINE_FAKEWEBRTCVOICEENGINE_H_
OLDNEW
« no previous file with comments | « webrtc/audio/audio_state.cc ('k') | webrtc/voice_engine/include/voe_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698