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

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

Issue 3000273002: Reverse |rtx_payload_types| map, and rename. (Closed)
Patch Set: 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
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 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 ss << ", rtcp_xr: "; 87 ss << ", rtcp_xr: ";
88 ss << "{receiver_reference_time_report: " 88 ss << "{receiver_reference_time_report: "
89 << (rtcp_xr.receiver_reference_time_report ? "on" : "off"); 89 << (rtcp_xr.receiver_reference_time_report ? "on" : "off");
90 ss << '}'; 90 ss << '}';
91 ss << ", remb: " << (remb ? "on" : "off"); 91 ss << ", remb: " << (remb ? "on" : "off");
92 ss << ", transport_cc: " << (transport_cc ? "on" : "off"); 92 ss << ", transport_cc: " << (transport_cc ? "on" : "off");
93 ss << ", nack: {rtp_history_ms: " << nack.rtp_history_ms << '}'; 93 ss << ", nack: {rtp_history_ms: " << nack.rtp_history_ms << '}';
94 ss << ", ulpfec: " << ulpfec.ToString(); 94 ss << ", ulpfec: " << ulpfec.ToString();
95 ss << ", rtx_ssrc: " << rtx_ssrc; 95 ss << ", rtx_ssrc: " << rtx_ssrc;
96 ss << ", rtx_payload_types: {"; 96 ss << ", rtx_payload_types: {";
97 for (auto& kv : rtx_payload_types) { 97 for (auto& kv : media_pt_by_rtx_pt) {
98 ss << kv.first << " (apt) -> " << kv.second << " (pt), "; 98 ss << kv.first << " (pt) -> " << kv.second << " (apt), ";
99 } 99 }
100 ss << '}'; 100 ss << '}';
101 ss << ", extensions: ["; 101 ss << ", extensions: [";
102 for (size_t i = 0; i < extensions.size(); ++i) { 102 for (size_t i = 0; i < extensions.size(); ++i) {
103 ss << extensions[i].ToString(); 103 ss << extensions[i].ToString();
104 if (i != extensions.size() - 1) 104 if (i != extensions.size() - 1)
105 ss << ", "; 105 ss << ", ";
106 } 106 }
107 ss << ']'; 107 ss << ']';
108 ss << '}'; 108 ss << '}';
(...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after
544 if (stream_is_active && !receiving_keyframe) { 544 if (stream_is_active && !receiving_keyframe) {
545 LOG(LS_WARNING) << "No decodable frame in " << wait_ms 545 LOG(LS_WARNING) << "No decodable frame in " << wait_ms
546 << " ms, requesting keyframe."; 546 << " ms, requesting keyframe.";
547 RequestKeyFrame(); 547 RequestKeyFrame();
548 } 548 }
549 } 549 }
550 return true; 550 return true;
551 } 551 }
552 } // namespace internal 552 } // namespace internal
553 } // namespace webrtc 553 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698