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

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

Issue 1493403003: modules/rtp_rtcp/include folder cleared of lint warnings (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase 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 | « webrtc/video/vie_channel.cc ('k') | 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 3251 matching lines...) Expand 10 before | Expand all | Expand 10 after
3262 } 3262 }
3263 return 0; 3263 return 0;
3264 } 3264 }
3265 3265
3266 int 3266 int
3267 Channel::GetREDStatus(bool& enabled, int& redPayloadtype) 3267 Channel::GetREDStatus(bool& enabled, int& redPayloadtype)
3268 { 3268 {
3269 enabled = audio_coding_->REDStatus(); 3269 enabled = audio_coding_->REDStatus();
3270 if (enabled) 3270 if (enabled)
3271 { 3271 {
3272 int8_t payloadType(0); 3272 int8_t payloadType = 0;
3273 if (_rtpRtcpModule->SendREDPayloadType(payloadType) != 0) 3273 if (_rtpRtcpModule->SendREDPayloadType(&payloadType) != 0) {
3274 {
3275 _engineStatisticsPtr->SetLastError( 3274 _engineStatisticsPtr->SetLastError(
3276 VE_RTP_RTCP_MODULE_ERROR, kTraceError, 3275 VE_RTP_RTCP_MODULE_ERROR, kTraceError,
3277 "GetREDStatus() failed to retrieve RED PT from RTP/RTCP " 3276 "GetREDStatus() failed to retrieve RED PT from RTP/RTCP "
3278 "module"); 3277 "module");
3279 return -1; 3278 return -1;
3280 } 3279 }
3281 redPayloadtype = payloadType; 3280 redPayloadtype = payloadType;
3282 return 0; 3281 return 0;
3283 } 3282 }
3284 return 0; 3283 return 0;
(...skipping 801 matching lines...) Expand 10 before | Expand all | Expand 10 after
4086 int64_t min_rtt = 0; 4085 int64_t min_rtt = 0;
4087 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) 4086 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt)
4088 != 0) { 4087 != 0) {
4089 return 0; 4088 return 0;
4090 } 4089 }
4091 return rtt; 4090 return rtt;
4092 } 4091 }
4093 4092
4094 } // namespace voe 4093 } // namespace voe
4095 } // namespace webrtc 4094 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/vie_channel.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698