| 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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 << (rtcp_mode == RtcpMode::kCompound ? "RtcpMode::kCompound" | 93 << (rtcp_mode == RtcpMode::kCompound ? "RtcpMode::kCompound" |
| 94 : "RtcpMode::kReducedSize"); | 94 : "RtcpMode::kReducedSize"); |
| 95 ss << ", rtcp_xr: "; | 95 ss << ", rtcp_xr: "; |
| 96 ss << "{receiver_reference_time_report: " | 96 ss << "{receiver_reference_time_report: " |
| 97 << (rtcp_xr.receiver_reference_time_report ? "on" : "off"); | 97 << (rtcp_xr.receiver_reference_time_report ? "on" : "off"); |
| 98 ss << '}'; | 98 ss << '}'; |
| 99 ss << ", remb: " << (remb ? "on" : "off"); | 99 ss << ", remb: " << (remb ? "on" : "off"); |
| 100 ss << ", transport_cc: " << (transport_cc ? "on" : "off"); | 100 ss << ", transport_cc: " << (transport_cc ? "on" : "off"); |
| 101 ss << ", nack: {rtp_history_ms: " << nack.rtp_history_ms << '}'; | 101 ss << ", nack: {rtp_history_ms: " << nack.rtp_history_ms << '}'; |
| 102 ss << ", ulpfec: " << ulpfec.ToString(); | 102 ss << ", ulpfec: " << ulpfec.ToString(); |
| 103 ss << ", rtx: {"; | 103 ss << ", rtx_ssrc: " << rtx_ssrc; |
| 104 for (auto& kv : rtx) { | 104 ss << ", rtx_payload_types: {"; |
| 105 ss << kv.first << " -> "; | 105 for (auto& kv : rtx_payload_types) { |
| 106 ss << "{ssrc: " << kv.second.ssrc; | 106 ss << kv.first << " (apt) -> " << kv.second << " (pt), "; |
| 107 ss << ", payload_type: " << kv.second.payload_type; | |
| 108 ss << '}'; | |
| 109 } | 107 } |
| 110 ss << '}'; | 108 ss << '}'; |
| 111 ss << ", extensions: ["; | 109 ss << ", extensions: ["; |
| 112 for (size_t i = 0; i < extensions.size(); ++i) { | 110 for (size_t i = 0; i < extensions.size(); ++i) { |
| 113 ss << extensions[i].ToString(); | 111 ss << extensions[i].ToString(); |
| 114 if (i != extensions.size() - 1) | 112 if (i != extensions.size() - 1) |
| 115 ss << ", "; | 113 ss << ", "; |
| 116 } | 114 } |
| 117 ss << ']'; | 115 ss << ']'; |
| 118 ss << '}'; | 116 ss << '}'; |
| (...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 471 rtp_stream_receiver_.FrameDecoded(frame->picture_id); | 469 rtp_stream_receiver_.FrameDecoded(frame->picture_id); |
| 472 } else { | 470 } else { |
| 473 LOG(LS_WARNING) << "No decodable frame in " << kMaxWaitForFrameMs | 471 LOG(LS_WARNING) << "No decodable frame in " << kMaxWaitForFrameMs |
| 474 << " ms, requesting keyframe."; | 472 << " ms, requesting keyframe."; |
| 475 RequestKeyFrame(); | 473 RequestKeyFrame(); |
| 476 } | 474 } |
| 477 } | 475 } |
| 478 | 476 |
| 479 } // namespace internal | 477 } // namespace internal |
| 480 } // namespace webrtc | 478 } // namespace webrtc |
| OLD | NEW |