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

Side by Side Diff: webrtc/video/video_send_stream.cc

Issue 2525293002: Sent bitrate stats are incorrect if FlexFEC is configured. (Closed)
Patch Set: address comment Created 4 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/send_statistics_proxy_unittest.cc ('k') | webrtc/video_send_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 /* 1 /*
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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 #include "webrtc/video/video_send_stream.h" 10 #include "webrtc/video/video_send_stream.h"
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 ss << "encode_fps: " << encode_frame_rate << ", "; 207 ss << "encode_fps: " << encode_frame_rate << ", ";
208 ss << "encode_ms: " << avg_encode_time_ms << ", "; 208 ss << "encode_ms: " << avg_encode_time_ms << ", ";
209 ss << "encode_usage_perc: " << encode_usage_percent << ", "; 209 ss << "encode_usage_perc: " << encode_usage_percent << ", ";
210 ss << "target_bps: " << target_media_bitrate_bps << ", "; 210 ss << "target_bps: " << target_media_bitrate_bps << ", ";
211 ss << "media_bps: " << media_bitrate_bps << ", "; 211 ss << "media_bps: " << media_bitrate_bps << ", ";
212 ss << "preferred_media_bitrate_bps: " << preferred_media_bitrate_bps << ", "; 212 ss << "preferred_media_bitrate_bps: " << preferred_media_bitrate_bps << ", ";
213 ss << "suspended: " << (suspended ? "true" : "false") << ", "; 213 ss << "suspended: " << (suspended ? "true" : "false") << ", ";
214 ss << "bw_adapted: " << (bw_limited_resolution ? "true" : "false"); 214 ss << "bw_adapted: " << (bw_limited_resolution ? "true" : "false");
215 ss << '}'; 215 ss << '}';
216 for (const auto& substream : substreams) { 216 for (const auto& substream : substreams) {
217 if (!substream.second.is_rtx) { 217 if (!substream.second.is_rtx && !substream.second.is_flexfec) {
218 ss << " {ssrc: " << substream.first << ", "; 218 ss << " {ssrc: " << substream.first << ", ";
219 ss << substream.second.ToString(); 219 ss << substream.second.ToString();
220 ss << '}'; 220 ss << '}';
221 } 221 }
222 } 222 }
223 return ss.str(); 223 return ss.str();
224 } 224 }
225 225
226 std::string VideoSendStream::StreamStats::ToString() const { 226 std::string VideoSendStream::StreamStats::ToString() const {
227 std::stringstream ss; 227 std::stringstream ss;
(...skipping 984 matching lines...) Expand 10 before | Expand all | Expand 10 after
1212 } 1212 }
1213 1213
1214 void VideoSendStreamImpl::SetTransportOverhead( 1214 void VideoSendStreamImpl::SetTransportOverhead(
1215 int transport_overhead_per_packet) { 1215 int transport_overhead_per_packet) {
1216 for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) 1216 for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_)
1217 rtp_rtcp->SetTransportOverhead(transport_overhead_per_packet); 1217 rtp_rtcp->SetTransportOverhead(transport_overhead_per_packet);
1218 } 1218 }
1219 1219
1220 } // namespace internal 1220 } // namespace internal
1221 } // namespace webrtc 1221 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/send_statistics_proxy_unittest.cc ('k') | webrtc/video_send_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698