| 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 21 matching lines...) Expand all Loading... |
| 32 #include "webrtc/system_wrappers/include/clock.h" | 32 #include "webrtc/system_wrappers/include/clock.h" |
| 33 #include "webrtc/system_wrappers/include/field_trial.h" | 33 #include "webrtc/system_wrappers/include/field_trial.h" |
| 34 #include "webrtc/video/call_stats.h" | 34 #include "webrtc/video/call_stats.h" |
| 35 #include "webrtc/video/receive_statistics_proxy.h" | 35 #include "webrtc/video/receive_statistics_proxy.h" |
| 36 #include "webrtc/video_receive_stream.h" | 36 #include "webrtc/video_receive_stream.h" |
| 37 | 37 |
| 38 namespace webrtc { | 38 namespace webrtc { |
| 39 | 39 |
| 40 std::string VideoReceiveStream::Decoder::ToString() const { | 40 std::string VideoReceiveStream::Decoder::ToString() const { |
| 41 std::stringstream ss; | 41 std::stringstream ss; |
| 42 ss << "{decoder: " << (decoder ? "(VideoDecoder)" : "nullptr"); | 42 ss << "{decoder: " << (decoder ? "(VideoDecoder)" : "null"); |
| 43 ss << ", payload_type: " << payload_type; | 43 ss << ", payload_type: " << payload_type; |
| 44 ss << ", payload_name: " << payload_name; | 44 ss << ", payload_name: " << payload_name; |
| 45 ss << ", codec_params: {"; | 45 ss << ", codec_params: {"; |
| 46 for (const auto& it : codec_params) | 46 for (const auto& it : codec_params) |
| 47 ss << it.first << ": " << it.second; | 47 ss << it.first << ": " << it.second; |
| 48 ss << '}'; | 48 ss << '}'; |
| 49 ss << '}'; | 49 ss << '}'; |
| 50 | 50 |
| 51 return ss.str(); | 51 return ss.str(); |
| 52 } | 52 } |
| 53 | 53 |
| 54 std::string VideoReceiveStream::Config::ToString() const { | 54 std::string VideoReceiveStream::Config::ToString() const { |
| 55 std::stringstream ss; | 55 std::stringstream ss; |
| 56 ss << "{decoders: ["; | 56 ss << "{decoders: ["; |
| 57 for (size_t i = 0; i < decoders.size(); ++i) { | 57 for (size_t i = 0; i < decoders.size(); ++i) { |
| 58 ss << decoders[i].ToString(); | 58 ss << decoders[i].ToString(); |
| 59 if (i != decoders.size() - 1) | 59 if (i != decoders.size() - 1) |
| 60 ss << ", "; | 60 ss << ", "; |
| 61 } | 61 } |
| 62 ss << ']'; | 62 ss << ']'; |
| 63 ss << ", rtp: " << rtp.ToString(); | 63 ss << ", rtp: " << rtp.ToString(); |
| 64 ss << ", renderer: " << (renderer ? "(renderer)" : "nullptr"); | 64 ss << ", renderer: " << (renderer ? "(renderer)" : "null"); |
| 65 ss << ", render_delay_ms: " << render_delay_ms; | 65 ss << ", render_delay_ms: " << render_delay_ms; |
| 66 if (!sync_group.empty()) | 66 if (!sync_group.empty()) |
| 67 ss << ", sync_group: " << sync_group; | 67 ss << ", sync_group: " << sync_group; |
| 68 ss << ", pre_decode_callback: " | 68 ss << ", pre_decode_callback: " |
| 69 << (pre_decode_callback ? "(EncodedFrameObserver)" : "nullptr"); | 69 << (pre_decode_callback ? "(EncodedFrameObserver)" : "null"); |
| 70 ss << ", target_delay_ms: " << target_delay_ms; | 70 ss << ", target_delay_ms: " << target_delay_ms; |
| 71 ss << '}'; | 71 ss << '}'; |
| 72 | 72 |
| 73 return ss.str(); | 73 return ss.str(); |
| 74 } | 74 } |
| 75 | 75 |
| 76 std::string VideoReceiveStream::Config::Rtp::ToString() const { | 76 std::string VideoReceiveStream::Config::Rtp::ToString() const { |
| 77 std::stringstream ss; | 77 std::stringstream ss; |
| 78 ss << "{remote_ssrc: " << remote_ssrc; | 78 ss << "{remote_ssrc: " << remote_ssrc; |
| 79 ss << ", local_ssrc: " << local_ssrc; | 79 ss << ", local_ssrc: " << local_ssrc; |
| (...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 501 LOG(LS_WARNING) << "No decodable frame in " << kMaxWaitForFrameMs | 501 LOG(LS_WARNING) << "No decodable frame in " << kMaxWaitForFrameMs |
| 502 << " ms, requesting keyframe."; | 502 << " ms, requesting keyframe."; |
| 503 RequestKeyFrame(); | 503 RequestKeyFrame(); |
| 504 } | 504 } |
| 505 } else { | 505 } else { |
| 506 video_receiver_.Decode(kMaxDecodeWaitTimeMs); | 506 video_receiver_.Decode(kMaxDecodeWaitTimeMs); |
| 507 } | 507 } |
| 508 } | 508 } |
| 509 } // namespace internal | 509 } // namespace internal |
| 510 } // namespace webrtc | 510 } // namespace webrtc |
| OLD | NEW |