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

Side by Side Diff: webrtc/voice_engine/voe_external_media_impl.cc

Issue 2424173003: Move functionality out from AudioFrame and into AudioFrameOperations. (Closed)
Patch Set: Include order & DCHECKs. Created 4 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
« no previous file with comments | « webrtc/voice_engine/utility.cc ('k') | no next file » | 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) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 "webrtc/voice_engine/voe_external_media_impl.h" 11 #include "webrtc/voice_engine/voe_external_media_impl.h"
12 12
13 #include "webrtc/audio/utility/audio_frame_operations.h"
13 #include "webrtc/system_wrappers/include/trace.h" 14 #include "webrtc/system_wrappers/include/trace.h"
14 #include "webrtc/voice_engine/channel.h" 15 #include "webrtc/voice_engine/channel.h"
15 #include "webrtc/voice_engine/include/voe_errors.h" 16 #include "webrtc/voice_engine/include/voe_errors.h"
16 #include "webrtc/voice_engine/output_mixer.h" 17 #include "webrtc/voice_engine/output_mixer.h"
17 #include "webrtc/voice_engine/transmit_mixer.h" 18 #include "webrtc/voice_engine/transmit_mixer.h"
18 #include "webrtc/voice_engine/voice_engine_impl.h" 19 #include "webrtc/voice_engine/voice_engine_impl.h"
19 20
20 namespace webrtc { 21 namespace webrtc {
21 22
22 VoEExternalMedia* VoEExternalMedia::GetInterface(VoiceEngine* voiceEngine) { 23 VoEExternalMedia* VoEExternalMedia::GetInterface(VoiceEngine* voiceEngine) {
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 } 143 }
143 if (desired_sample_rate_hz == -1) { 144 if (desired_sample_rate_hz == -1) {
144 shared_->SetLastError(VE_BAD_ARGUMENT, kTraceError, 145 shared_->SetLastError(VE_BAD_ARGUMENT, kTraceError,
145 "GetAudioFrame() was called with bad sample rate."); 146 "GetAudioFrame() was called with bad sample rate.");
146 return -1; 147 return -1;
147 } 148 }
148 frame->sample_rate_hz_ = 149 frame->sample_rate_hz_ =
149 desired_sample_rate_hz == 0 ? -1 : desired_sample_rate_hz; 150 desired_sample_rate_hz == 0 ? -1 : desired_sample_rate_hz;
150 auto ret = channelPtr->GetAudioFrameWithMuted(channel, frame); 151 auto ret = channelPtr->GetAudioFrameWithMuted(channel, frame);
151 if (ret == MixerParticipant::AudioFrameInfo::kMuted) { 152 if (ret == MixerParticipant::AudioFrameInfo::kMuted) {
152 frame->Mute(); 153 AudioFrameOperations::Mute(frame);
153 } 154 }
154 return ret == MixerParticipant::AudioFrameInfo::kError ? -1 : 0; 155 return ret == MixerParticipant::AudioFrameInfo::kError ? -1 : 0;
155 } 156 }
156 157
157 int VoEExternalMediaImpl::SetExternalMixing(int channel, bool enable) { 158 int VoEExternalMediaImpl::SetExternalMixing(int channel, bool enable) {
158 WEBRTC_TRACE(kTraceApiCall, kTraceVoice, 159 WEBRTC_TRACE(kTraceApiCall, kTraceVoice,
159 VoEId(shared_->instance_id(), channel), 160 VoEId(shared_->instance_id(), channel),
160 "SetExternalMixing(channel=%d, enable=%d)", channel, enable); 161 "SetExternalMixing(channel=%d, enable=%d)", channel, enable);
161 if (!shared_->statistics().Initialized()) { 162 if (!shared_->statistics().Initialized()) {
162 shared_->SetLastError(VE_NOT_INITED, kTraceError); 163 shared_->SetLastError(VE_NOT_INITED, kTraceError);
163 return -1; 164 return -1;
164 } 165 }
165 voe::ChannelOwner ch = shared_->channel_manager().GetChannel(channel); 166 voe::ChannelOwner ch = shared_->channel_manager().GetChannel(channel);
166 voe::Channel* channelPtr = ch.channel(); 167 voe::Channel* channelPtr = ch.channel();
167 if (channelPtr == NULL) { 168 if (channelPtr == NULL) {
168 shared_->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, 169 shared_->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
169 "SetExternalMixing() failed to locate channel"); 170 "SetExternalMixing() failed to locate channel");
170 return -1; 171 return -1;
171 } 172 }
172 return channelPtr->SetExternalMixing(enable); 173 return channelPtr->SetExternalMixing(enable);
173 } 174 }
174 175
175 } // namespace webrtc 176 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/voice_engine/utility.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698