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

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

Issue 2992043002: Renamed fields in common_types.h/RtcpStatistics. (Closed)
Patch Set: Rebase on new master Created 3 years, 4 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/video/send_statistics_proxy_unittest.cc ('k') | webrtc/video/video_send_stream.cc » ('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 10
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 ss << "decode_fps: " << decode_frame_rate << ", "; 121 ss << "decode_fps: " << decode_frame_rate << ", ";
122 ss << "render_fps: " << render_frame_rate << ", "; 122 ss << "render_fps: " << render_frame_rate << ", ";
123 ss << "decode_ms: " << decode_ms << ", "; 123 ss << "decode_ms: " << decode_ms << ", ";
124 ss << "max_decode_ms: " << max_decode_ms << ", "; 124 ss << "max_decode_ms: " << max_decode_ms << ", ";
125 ss << "cur_delay_ms: " << current_delay_ms << ", "; 125 ss << "cur_delay_ms: " << current_delay_ms << ", ";
126 ss << "targ_delay_ms: " << target_delay_ms << ", "; 126 ss << "targ_delay_ms: " << target_delay_ms << ", ";
127 ss << "jb_delay_ms: " << jitter_buffer_ms << ", "; 127 ss << "jb_delay_ms: " << jitter_buffer_ms << ", ";
128 ss << "min_playout_delay_ms: " << min_playout_delay_ms << ", "; 128 ss << "min_playout_delay_ms: " << min_playout_delay_ms << ", ";
129 ss << "discarded: " << discarded_packets << ", "; 129 ss << "discarded: " << discarded_packets << ", ";
130 ss << "sync_offset_ms: " << sync_offset_ms << ", "; 130 ss << "sync_offset_ms: " << sync_offset_ms << ", ";
131 ss << "cum_loss: " << rtcp_stats.cumulative_lost << ", "; 131 ss << "cum_loss: " << rtcp_stats.packets_lost << ", ";
132 ss << "max_ext_seq: " << rtcp_stats.extended_max_sequence_number << ", "; 132 ss << "max_ext_seq: " << rtcp_stats.extended_highest_sequence_number << ", ";
133 ss << "nack: " << rtcp_packet_type_counts.nack_packets << ", "; 133 ss << "nack: " << rtcp_packet_type_counts.nack_packets << ", ";
134 ss << "fir: " << rtcp_packet_type_counts.fir_packets << ", "; 134 ss << "fir: " << rtcp_packet_type_counts.fir_packets << ", ";
135 ss << "pli: " << rtcp_packet_type_counts.pli_packets; 135 ss << "pli: " << rtcp_packet_type_counts.pli_packets;
136 ss << '}'; 136 ss << '}';
137 return ss.str(); 137 return ss.str();
138 } 138 }
139 139
140 namespace { 140 namespace {
141 VideoCodec CreateDecoderVideoCodec(const VideoReceiveStream::Decoder& decoder) { 141 VideoCodec CreateDecoderVideoCodec(const VideoReceiveStream::Decoder& decoder) {
142 VideoCodec codec; 142 VideoCodec codec;
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 if (stream_is_active && !receiving_keyframe) { 526 if (stream_is_active && !receiving_keyframe) {
527 LOG(LS_WARNING) << "No decodable frame in " << kMaxWaitForFrameMs 527 LOG(LS_WARNING) << "No decodable frame in " << kMaxWaitForFrameMs
528 << " ms, requesting keyframe."; 528 << " ms, requesting keyframe.";
529 RequestKeyFrame(); 529 RequestKeyFrame();
530 } 530 }
531 } 531 }
532 return true; 532 return true;
533 } 533 }
534 } // namespace internal 534 } // namespace internal
535 } // namespace webrtc 535 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/send_statistics_proxy_unittest.cc ('k') | webrtc/video/video_send_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698