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

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

Issue 1713493003: Enabling rtcp-rsize negotiation and fixing some issues with it. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fixing unit test and adding more TODOs. Created 4 years, 9 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/pc/mediasession.cc ('k') | no next file » | 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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 62
63 std::string VideoSendStream::Config::Rtp::ToString() const { 63 std::string VideoSendStream::Config::Rtp::ToString() const {
64 std::stringstream ss; 64 std::stringstream ss;
65 ss << "{ssrcs: ["; 65 ss << "{ssrcs: [";
66 for (size_t i = 0; i < ssrcs.size(); ++i) { 66 for (size_t i = 0; i < ssrcs.size(); ++i) {
67 ss << ssrcs[i]; 67 ss << ssrcs[i];
68 if (i != ssrcs.size() - 1) 68 if (i != ssrcs.size() - 1)
69 ss << ", "; 69 ss << ", ";
70 } 70 }
71 ss << ']'; 71 ss << ']';
72 ss << ", rtcp_mode: "
73 << (rtcp_mode == RtcpMode::kCompound ? "RtcpMode::kCompound"
74 : "RtcpMode::kReducedSize");
72 ss << ", max_packet_size: " << max_packet_size; 75 ss << ", max_packet_size: " << max_packet_size;
73 ss << ", extensions: ["; 76 ss << ", extensions: [";
74 for (size_t i = 0; i < extensions.size(); ++i) { 77 for (size_t i = 0; i < extensions.size(); ++i) {
75 ss << extensions[i].ToString(); 78 ss << extensions[i].ToString();
76 if (i != extensions.size() - 1) 79 if (i != extensions.size() - 1)
77 ss << ", "; 80 ss << ", ";
78 } 81 }
79 ss << ']'; 82 ss << ']';
80 83
81 ss << ", nack: {rtp_history_ms: " << nack.rtp_history_ms << '}'; 84 ss << ", nack: {rtp_history_ms: " << nack.rtp_history_ms << '}';
(...skipping 578 matching lines...) Expand 10 before | Expand all | Expand 10 after
660 } 663 }
661 664
662 void VideoSendStream::OnBitrateUpdated(uint32_t bitrate_bps, 665 void VideoSendStream::OnBitrateUpdated(uint32_t bitrate_bps,
663 uint8_t fraction_loss, 666 uint8_t fraction_loss,
664 int64_t rtt) { 667 int64_t rtt) {
665 vie_encoder_.OnBitrateUpdated(bitrate_bps, fraction_loss, rtt); 668 vie_encoder_.OnBitrateUpdated(bitrate_bps, fraction_loss, rtt);
666 } 669 }
667 670
668 } // namespace internal 671 } // namespace internal
669 } // namespace webrtc 672 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/pc/mediasession.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698