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

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

Issue 2125183002: Change GetPlayoutTimestamp message from Error to Info (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 5 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 | « 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 3207 matching lines...) Expand 10 before | Expand all | Expand 10 after
3218 } 3218 }
3219 3219
3220 int Channel::GetPlayoutTimestamp(unsigned int& timestamp) { 3220 int Channel::GetPlayoutTimestamp(unsigned int& timestamp) {
3221 uint32_t playout_timestamp_rtp = 0; 3221 uint32_t playout_timestamp_rtp = 0;
3222 { 3222 {
3223 rtc::CritScope lock(&video_sync_lock_); 3223 rtc::CritScope lock(&video_sync_lock_);
3224 playout_timestamp_rtp = playout_timestamp_rtp_; 3224 playout_timestamp_rtp = playout_timestamp_rtp_;
3225 } 3225 }
3226 if (playout_timestamp_rtp == 0) { 3226 if (playout_timestamp_rtp == 0) {
3227 _engineStatisticsPtr->SetLastError( 3227 _engineStatisticsPtr->SetLastError(
3228 VE_CANNOT_RETRIEVE_VALUE, kTraceError, 3228 VE_CANNOT_RETRIEVE_VALUE, kTraceStateInfo,
3229 "GetPlayoutTimestamp() failed to retrieve timestamp"); 3229 "GetPlayoutTimestamp() failed to retrieve timestamp");
3230 return -1; 3230 return -1;
3231 } 3231 }
3232 timestamp = playout_timestamp_rtp; 3232 timestamp = playout_timestamp_rtp;
3233 return 0; 3233 return 0;
3234 } 3234 }
3235 3235
3236 int Channel::SetInitTimestamp(unsigned int timestamp) { 3236 int Channel::SetInitTimestamp(unsigned int timestamp) {
3237 WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, _channelId), 3237 WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, _channelId),
3238 "Channel::SetInitTimestamp()"); 3238 "Channel::SetInitTimestamp()");
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
3562 int64_t min_rtt = 0; 3562 int64_t min_rtt = 0;
3563 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) != 3563 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) !=
3564 0) { 3564 0) {
3565 return 0; 3565 return 0;
3566 } 3566 }
3567 return rtt; 3567 return rtt;
3568 } 3568 }
3569 3569
3570 } // namespace voe 3570 } // namespace voe
3571 } // namespace webrtc 3571 } // 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