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

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

Issue 2018553002: Revert of Adding a some checks and switching out a few assert for RTC_[D]CHECK. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 7 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
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 2975 matching lines...) Expand 10 before | Expand all | Expand 10 after
2986 _inputExternalMediaCallbackPtr->Process( 2986 _inputExternalMediaCallbackPtr->Process(
2987 _channelId, kRecordingPerChannel, (int16_t*)_audioFrame.data_, 2987 _channelId, kRecordingPerChannel, (int16_t*)_audioFrame.data_,
2988 _audioFrame.samples_per_channel_, _audioFrame.sample_rate_hz_, 2988 _audioFrame.samples_per_channel_, _audioFrame.sample_rate_hz_,
2989 isStereo); 2989 isStereo);
2990 } 2990 }
2991 } 2991 }
2992 2992
2993 if (_includeAudioLevelIndication) { 2993 if (_includeAudioLevelIndication) {
2994 size_t length = 2994 size_t length =
2995 _audioFrame.samples_per_channel_ * _audioFrame.num_channels_; 2995 _audioFrame.samples_per_channel_ * _audioFrame.num_channels_;
2996 RTC_CHECK_LE(length, sizeof(_audioFrame.data_));
2997 if (is_muted && previous_frame_muted_) { 2996 if (is_muted && previous_frame_muted_) {
2998 rms_level_.ProcessMuted(length); 2997 rms_level_.ProcessMuted(length);
2999 } else { 2998 } else {
3000 rms_level_.Process(_audioFrame.data_, length); 2999 rms_level_.Process(_audioFrame.data_, length);
3001 } 3000 }
3002 } 3001 }
3003 previous_frame_muted_ = is_muted; 3002 previous_frame_muted_ = is_muted;
3004 3003
3005 return 0; 3004 return 0;
3006 } 3005 }
(...skipping 553 matching lines...) Expand 10 before | Expand all | Expand 10 after
3560 int64_t min_rtt = 0; 3559 int64_t min_rtt = 0;
3561 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) != 3560 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) !=
3562 0) { 3561 0) {
3563 return 0; 3562 return 0;
3564 } 3563 }
3565 return rtt; 3564 return rtt;
3566 } 3565 }
3567 3566
3568 } // namespace voe 3567 } // namespace voe
3569 } // namespace webrtc 3568 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698