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

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

Issue 2177263002: Regression test for issue where Opus DTX status was being forgotten. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Renamed GetOpusDtx to GetOpusDtxStatus to avoid naming conflict with FakeWebRtcVoiceEngine. Created 4 years, 4 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/voice_engine/voe_codec_impl.h ('k') | webrtc/voice_engine/voe_codec_unittest.cc » ('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) 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
(...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after
369 voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel); 369 voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
370 voe::Channel* channelPtr = ch.channel(); 370 voe::Channel* channelPtr = ch.channel();
371 if (channelPtr == NULL) { 371 if (channelPtr == NULL) {
372 _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, 372 _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
373 "SetOpusDtx failed to locate channel"); 373 "SetOpusDtx failed to locate channel");
374 return -1; 374 return -1;
375 } 375 }
376 return channelPtr->SetOpusDtx(enable_dtx); 376 return channelPtr->SetOpusDtx(enable_dtx);
377 } 377 }
378 378
379 int VoECodecImpl::GetOpusDtxStatus(int channel, bool* enabled) {
380 WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
381 "GetOpusDtx(channel=%d)", channel);
382 if (!_shared->statistics().Initialized()) {
383 _shared->SetLastError(VE_NOT_INITED, kTraceError);
384 return -1;
385 }
386 voe::ChannelOwner ch = _shared->channel_manager().GetChannel(channel);
387 voe::Channel* channelPtr = ch.channel();
388 if (channelPtr == NULL) {
389 _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
390 "GetOpusDtx failed to locate channel");
391 return -1;
392 }
393 return channelPtr->GetOpusDtx(enabled);
394 }
395
379 #endif // WEBRTC_VOICE_ENGINE_CODEC_API 396 #endif // WEBRTC_VOICE_ENGINE_CODEC_API
380 397
381 } // namespace webrtc 398 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/voice_engine/voe_codec_impl.h ('k') | webrtc/voice_engine/voe_codec_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698