| OLD | NEW |
| 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 417 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 428 if (_audioFrame.num_channels_ == 1) | 428 if (_audioFrame.num_channels_ == 1) |
| 429 { | 429 { |
| 430 AudioFrameOperations::MonoToStereo(&_audioFrame); | 430 AudioFrameOperations::MonoToStereo(&_audioFrame); |
| 431 } | 431 } |
| 432 else | 432 else |
| 433 { | 433 { |
| 434 // Pure stereo mode (we are receiving a stereo signal). | 434 // Pure stereo mode (we are receiving a stereo signal). |
| 435 } | 435 } |
| 436 | 436 |
| 437 assert(_audioFrame.num_channels_ == 2); | 437 assert(_audioFrame.num_channels_ == 2); |
| 438 AudioFrameOperations::Scale(_panLeft, _panRight, _audioFrame); | 438 AudioFrameOperations::Scale(_panLeft, _panRight, &_audioFrame); |
| 439 } | 439 } |
| 440 | 440 |
| 441 // --- Far-end Voice Quality Enhancement (AudioProcessing Module) | 441 // --- Far-end Voice Quality Enhancement (AudioProcessing Module) |
| 442 if (feed_data_to_apm) { | 442 if (feed_data_to_apm) { |
| 443 if (_audioProcessingModulePtr->ProcessReverseStream(&_audioFrame) != 0) { | 443 if (_audioProcessingModulePtr->ProcessReverseStream(&_audioFrame) != 0) { |
| 444 WEBRTC_TRACE(kTraceWarning, kTraceVoice, VoEId(_instanceId, -1), | 444 WEBRTC_TRACE(kTraceWarning, kTraceVoice, VoEId(_instanceId, -1), |
| 445 "AudioProcessingModule::ProcessReverseStream() => error"); | 445 "AudioProcessingModule::ProcessReverseStream() => error"); |
| 446 RTC_NOTREACHED(); | 446 RTC_NOTREACHED(); |
| 447 } | 447 } |
| 448 } | 448 } |
| 449 | 449 |
| 450 // --- Measure audio level (0-9) for the combined signal | 450 // --- Measure audio level (0-9) for the combined signal |
| 451 _audioLevel.ComputeLevel(_audioFrame); | 451 _audioLevel.ComputeLevel(_audioFrame); |
| 452 | 452 |
| 453 return 0; | 453 return 0; |
| 454 } | 454 } |
| 455 } // namespace voe | 455 } // namespace voe |
| 456 } // namespace webrtc | 456 } // namespace webrtc |
| OLD | NEW |