OLD | NEW |
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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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.cumulative_lost << ", "; |
132 ss << "max_ext_seq: " << rtcp_stats.extended_max_sequence_number << ", "; | 132 ss << "max_ext_seq: " << rtcp_stats.extended_max_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 << "timing_frame_info: " << timing_frame_info.ToString(); |
136 ss << '}'; | 137 ss << '}'; |
137 return ss.str(); | 138 return ss.str(); |
138 } | 139 } |
139 | 140 |
140 namespace { | 141 namespace { |
141 VideoCodec CreateDecoderVideoCodec(const VideoReceiveStream::Decoder& decoder) { | 142 VideoCodec CreateDecoderVideoCodec(const VideoReceiveStream::Decoder& decoder) { |
142 VideoCodec codec; | 143 VideoCodec codec; |
143 memset(&codec, 0, sizeof(codec)); | 144 memset(&codec, 0, sizeof(codec)); |
144 | 145 |
145 codec.plType = decoder.payload_type; | 146 codec.plType = decoder.payload_type; |
(...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
512 if (stream_is_active && !receiving_keyframe) { | 513 if (stream_is_active && !receiving_keyframe) { |
513 LOG(LS_WARNING) << "No decodable frame in " << kMaxWaitForFrameMs | 514 LOG(LS_WARNING) << "No decodable frame in " << kMaxWaitForFrameMs |
514 << " ms, requesting keyframe."; | 515 << " ms, requesting keyframe."; |
515 RequestKeyFrame(); | 516 RequestKeyFrame(); |
516 } | 517 } |
517 } | 518 } |
518 return true; | 519 return true; |
519 } | 520 } |
520 } // namespace internal | 521 } // namespace internal |
521 } // namespace webrtc | 522 } // namespace webrtc |
OLD | NEW |