| 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 return true; | 44 return true; |
| 45 } | 45 } |
| 46 return false; | 46 return false; |
| 47 } | 47 } |
| 48 | 48 |
| 49 std::string VideoReceiveStream::Decoder::ToString() const { | 49 std::string VideoReceiveStream::Decoder::ToString() const { |
| 50 std::stringstream ss; | 50 std::stringstream ss; |
| 51 ss << "{decoder: " << (decoder ? "(VideoDecoder)" : "nullptr"); | 51 ss << "{decoder: " << (decoder ? "(VideoDecoder)" : "nullptr"); |
| 52 ss << ", payload_type: " << payload_type; | 52 ss << ", payload_type: " << payload_type; |
| 53 ss << ", payload_name: " << payload_name; | 53 ss << ", payload_name: " << payload_name; |
| 54 ss << ", decoder_specific: {"; | 54 ss << ", codec_params: {"; |
| 55 ss << " h264_extra_settings: " | 55 for (const auto& it : codec_params) |
| 56 << (decoder_specific.h264_extra_settings ? "(h264_extra_settings)" | 56 ss << it.first << ": " << it.second; |
| 57 : "nullptr"); | |
| 58 ss << '}'; | 57 ss << '}'; |
| 59 ss << '}'; | 58 ss << '}'; |
| 60 | 59 |
| 61 return ss.str(); | 60 return ss.str(); |
| 62 } | 61 } |
| 63 | 62 |
| 64 std::string VideoReceiveStream::Config::ToString() const { | 63 std::string VideoReceiveStream::Config::ToString() const { |
| 65 std::stringstream ss; | 64 std::stringstream ss; |
| 66 ss << "{decoders: ["; | 65 ss << "{decoders: ["; |
| 67 for (size_t i = 0; i < decoders.size(); ++i) { | 66 for (size_t i = 0; i < decoders.size(); ++i) { |
| (...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 483 RequestKeyFrame(); | 482 RequestKeyFrame(); |
| 484 } | 483 } |
| 485 } | 484 } |
| 486 | 485 |
| 487 void VideoReceiveStream::RequestKeyFrame() { | 486 void VideoReceiveStream::RequestKeyFrame() { |
| 488 rtp_stream_receiver_.RequestKeyFrame(); | 487 rtp_stream_receiver_.RequestKeyFrame(); |
| 489 } | 488 } |
| 490 | 489 |
| 491 } // namespace internal | 490 } // namespace internal |
| 492 } // namespace webrtc | 491 } // namespace webrtc |
| OLD | NEW |