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

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: New tests, DCHECKS, style and default member initializers. 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
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 #ifndef WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API 21 #ifndef WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API
21 #error "Deprecated" 22 #error "Deprecated"
22 #endif 23 #endif
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 } 153 }
153 if (desired_sample_rate_hz == -1) { 154 if (desired_sample_rate_hz == -1) {
154 shared_->SetLastError(VE_BAD_ARGUMENT, kTraceError, 155 shared_->SetLastError(VE_BAD_ARGUMENT, kTraceError,
155 "GetAudioFrame() was called with bad sample rate."); 156 "GetAudioFrame() was called with bad sample rate.");
156 return -1; 157 return -1;
157 } 158 }
158 frame->sample_rate_hz_ = 159 frame->sample_rate_hz_ =
159 desired_sample_rate_hz == 0 ? -1 : desired_sample_rate_hz; 160 desired_sample_rate_hz == 0 ? -1 : desired_sample_rate_hz;
160 auto ret = channelPtr->GetAudioFrameWithMuted(channel, frame); 161 auto ret = channelPtr->GetAudioFrameWithMuted(channel, frame);
161 if (ret == MixerParticipant::AudioFrameInfo::kMuted) { 162 if (ret == MixerParticipant::AudioFrameInfo::kMuted) {
162 frame->Mute(); 163 AudioFrameOperations::Mute(frame);
163 } 164 }
164 return ret == MixerParticipant::AudioFrameInfo::kError ? -1 : 0; 165 return ret == MixerParticipant::AudioFrameInfo::kError ? -1 : 0;
165 } 166 }
166 167
167 int VoEExternalMediaImpl::SetExternalMixing(int channel, bool enable) { 168 int VoEExternalMediaImpl::SetExternalMixing(int channel, bool enable) {
168 WEBRTC_TRACE(kTraceApiCall, kTraceVoice, 169 WEBRTC_TRACE(kTraceApiCall, kTraceVoice,
169 VoEId(shared_->instance_id(), channel), 170 VoEId(shared_->instance_id(), channel),
170 "SetExternalMixing(channel=%d, enable=%d)", channel, enable); 171 "SetExternalMixing(channel=%d, enable=%d)", channel, enable);
171 if (!shared_->statistics().Initialized()) { 172 if (!shared_->statistics().Initialized()) {
172 shared_->SetLastError(VE_NOT_INITED, kTraceError); 173 shared_->SetLastError(VE_NOT_INITED, kTraceError);
173 return -1; 174 return -1;
174 } 175 }
175 voe::ChannelOwner ch = shared_->channel_manager().GetChannel(channel); 176 voe::ChannelOwner ch = shared_->channel_manager().GetChannel(channel);
176 voe::Channel* channelPtr = ch.channel(); 177 voe::Channel* channelPtr = ch.channel();
177 if (channelPtr == NULL) { 178 if (channelPtr == NULL) {
178 shared_->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, 179 shared_->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
179 "SetExternalMixing() failed to locate channel"); 180 "SetExternalMixing() failed to locate channel");
180 return -1; 181 return -1;
181 } 182 }
182 return channelPtr->SetExternalMixing(enable); 183 return channelPtr->SetExternalMixing(enable);
183 } 184 }
184 185
185 #endif // WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API 186 #endif // WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API
186 187
187 } // namespace webrtc 188 } // namespace webrtc
OLDNEW
« webrtc/audio/utility/audio_frame_operations.cc ('K') | « webrtc/voice_engine/utility.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698