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

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

Issue 2850793002: Replace VideoReceiveStream::Config with new rtclog::StreamConfig in RtcEventLog. (Closed)
Patch Set: Fix merge. Created 3 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
« no previous file with comments | « webrtc/tools/event_log_visualizer/analyzer.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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 69
70 bool StartLogging(rtc::PlatformFile log_file, 70 bool StartLogging(rtc::PlatformFile log_file,
71 int64_t max_size_bytes) override { 71 int64_t max_size_bytes) override {
72 RTC_NOTREACHED(); 72 RTC_NOTREACHED();
73 return false; 73 return false;
74 } 74 }
75 75
76 void StopLogging() override { RTC_NOTREACHED(); } 76 void StopLogging() override { RTC_NOTREACHED(); }
77 77
78 void LogVideoReceiveStreamConfig( 78 void LogVideoReceiveStreamConfig(
79 const webrtc::VideoReceiveStream::Config& config) override { 79 const webrtc::rtclog::StreamConfig&) override {
80 rtc::CritScope lock(&crit_); 80 RTC_NOTREACHED();
81 if (event_log_) {
82 event_log_->LogVideoReceiveStreamConfig(config);
83 }
84 } 81 }
85 82
86 void LogVideoSendStreamConfig( 83 void LogVideoSendStreamConfig(
87 const webrtc::VideoSendStream::Config& config) override { 84 const webrtc::VideoSendStream::Config& config) override {
88 rtc::CritScope lock(&crit_); 85 rtc::CritScope lock(&crit_);
89 if (event_log_) { 86 if (event_log_) {
90 event_log_->LogVideoSendStreamConfig(config); 87 event_log_->LogVideoSendStreamConfig(config);
91 } 88 }
92 } 89 }
93 90
(...skipping 3046 matching lines...) Expand 10 before | Expand all | Expand 10 after
3140 int64_t min_rtt = 0; 3137 int64_t min_rtt = 0;
3141 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) != 3138 if (_rtpRtcpModule->RTT(remoteSSRC, &rtt, &avg_rtt, &min_rtt, &max_rtt) !=
3142 0) { 3139 0) {
3143 return 0; 3140 return 0;
3144 } 3141 }
3145 return rtt; 3142 return rtt;
3146 } 3143 }
3147 3144
3148 } // namespace voe 3145 } // namespace voe
3149 } // namespace webrtc 3146 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/tools/event_log_visualizer/analyzer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698