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

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

Issue 1515073004: Correcting the check for the return code produced by AudioProcessing::ProcessReverseStream (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 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 | « no previous file | 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
(...skipping 532 matching lines...) Expand 10 before | Expand all | Expand 10 after
543 _audioLevel.ComputeLevel(_audioFrame); 543 _audioLevel.ComputeLevel(_audioFrame);
544 544
545 return 0; 545 return 0;
546 } 546 }
547 547
548 // ---------------------------------------------------------------------------- 548 // ----------------------------------------------------------------------------
549 // Private methods 549 // Private methods
550 // ---------------------------------------------------------------------------- 550 // ----------------------------------------------------------------------------
551 551
552 void OutputMixer::APMProcessReverseStream() { 552 void OutputMixer::APMProcessReverseStream() {
553 if (_audioProcessingModulePtr->ProcessReverseStream(&_audioFrame) == -1) { 553 if (_audioProcessingModulePtr->ProcessReverseStream(&_audioFrame) != 0) {
554 WEBRTC_TRACE(kTraceError, kTraceVoice, VoEId(_instanceId, -1), 554 WEBRTC_TRACE(kTraceError, kTraceVoice, VoEId(_instanceId, -1),
555 "AudioProcessingModule::ProcessReverseStream() => error"); 555 "AudioProcessingModule::ProcessReverseStream() => error");
556 } 556 }
557 } 557 }
558 558
559 int 559 int
560 OutputMixer::InsertInbandDtmfTone() 560 OutputMixer::InsertInbandDtmfTone()
561 { 561 {
562 uint16_t sampleRate(0); 562 uint16_t sampleRate(0);
563 _dtmfGenerator.GetSampleRate(sampleRate); 563 _dtmfGenerator.GetSampleRate(sampleRate);
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 _audioFrame.data_[2 * i + 1] = 0; 595 _audioFrame.data_[2 * i + 1] = 0;
596 } 596 }
597 } 597 }
598 assert(_audioFrame.samples_per_channel_ == toneSamples); 598 assert(_audioFrame.samples_per_channel_ == toneSamples);
599 599
600 return 0; 600 return 0;
601 } 601 }
602 602
603 } // namespace voe 603 } // namespace voe
604 } // namespace webrtc 604 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698