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

Side by Side Diff: remoting/protocol/frame_stats.cc

Issue 2767193007: [Chromoting] Send DesktopFrame::capturer_id() to client through WebrtcVideoStream (Closed)
Patch Set: crash in msan Created 3 years, 9 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 | « remoting/protocol/frame_stats.h ('k') | remoting/protocol/webrtc_video_stream.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "remoting/protocol/frame_stats.h" 5 #include "remoting/protocol/frame_stats.h"
6 6
7 #include "remoting/proto/video.pb.h" 7 #include "remoting/proto/video.pb.h"
8 #include "remoting/proto/video_stats.pb.h" 8 #include "remoting/proto/video_stats.pb.h"
9 9
10 namespace remoting { 10 namespace remoting {
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 } 126 }
127 if (send_pending_delay != base::TimeDelta::Max()) { 127 if (send_pending_delay != base::TimeDelta::Max()) {
128 message_out->set_send_pending_time_ms(send_pending_delay.InMilliseconds()); 128 message_out->set_send_pending_time_ms(send_pending_delay.InMilliseconds());
129 } 129 }
130 if (rtt_estimate != base::TimeDelta::Max()) { 130 if (rtt_estimate != base::TimeDelta::Max()) {
131 message_out->set_rtt_estimate_ms(rtt_estimate.InMilliseconds()); 131 message_out->set_rtt_estimate_ms(rtt_estimate.InMilliseconds());
132 } 132 }
133 if (bandwidth_estimate_kbps >= 0) { 133 if (bandwidth_estimate_kbps >= 0) {
134 message_out->set_bandwidth_estimate_kbps(bandwidth_estimate_kbps); 134 message_out->set_bandwidth_estimate_kbps(bandwidth_estimate_kbps);
135 } 135 }
136 if (capturer_id != webrtc::DesktopCapturerId::kUnknown) {
137 message_out->set_capturer_id(capturer_id);
138 }
136 } 139 }
137 140
138 FrameStats::FrameStats() = default; 141 FrameStats::FrameStats() = default;
139 FrameStats::FrameStats(const FrameStats&) = default; 142 FrameStats::FrameStats(const FrameStats&) = default;
140 FrameStats::~FrameStats() = default; 143 FrameStats::~FrameStats() = default;
141 144
142 } // namespace protocol 145 } // namespace protocol
143 } // namespace remoting 146 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/protocol/frame_stats.h ('k') | remoting/protocol/webrtc_video_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698