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

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

Issue 2649323010: Revert of Make RTX pt/apt reconfigurable by calling WebRtcVideoChannel2::SetRecvParameters. (Closed)
Patch Set: Created 3 years, 10 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
« no previous file with comments | « webrtc/video/video_quality_test.cc ('k') | webrtc/video_receive_stream.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
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_ssrc: " << rtx_ssrc; 103 ss << ", rtx: {";
104 ss << ", rtx_payload_types: {"; 104 for (auto& kv : rtx) {
105 for (auto& kv : rtx_payload_types) { 105 ss << kv.first << " -> ";
106 ss << kv.first << " (apt) -> " << kv.second << " (pt), "; 106 ss << "{ssrc: " << kv.second.ssrc;
107 ss << ", payload_type: " << kv.second.payload_type;
108 ss << '}';
107 } 109 }
108 ss << '}'; 110 ss << '}';
109 ss << ", extensions: ["; 111 ss << ", extensions: [";
110 for (size_t i = 0; i < extensions.size(); ++i) { 112 for (size_t i = 0; i < extensions.size(); ++i) {
111 ss << extensions[i].ToString(); 113 ss << extensions[i].ToString();
112 if (i != extensions.size() - 1) 114 if (i != extensions.size() - 1)
113 ss << ", "; 115 ss << ", ";
114 } 116 }
115 ss << ']'; 117 ss << ']';
116 ss << '}'; 118 ss << '}';
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after
469 rtp_stream_receiver_.FrameDecoded(frame->picture_id); 471 rtp_stream_receiver_.FrameDecoded(frame->picture_id);
470 } else { 472 } else {
471 LOG(LS_WARNING) << "No decodable frame in " << kMaxWaitForFrameMs 473 LOG(LS_WARNING) << "No decodable frame in " << kMaxWaitForFrameMs
472 << " ms, requesting keyframe."; 474 << " ms, requesting keyframe.";
473 RequestKeyFrame(); 475 RequestKeyFrame();
474 } 476 }
475 } 477 }
476 478
477 } // namespace internal 479 } // namespace internal
478 } // namespace webrtc 480 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/video_quality_test.cc ('k') | webrtc/video_receive_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698