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

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: Created 4 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
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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 61
62 std::string VideoSendStream::Config::Rtp::ToString() const { 62 std::string VideoSendStream::Config::Rtp::ToString() const {
63 std::stringstream ss; 63 std::stringstream ss;
64 ss << "{ssrcs: ["; 64 ss << "{ssrcs: [";
65 for (size_t i = 0; i < ssrcs.size(); ++i) { 65 for (size_t i = 0; i < ssrcs.size(); ++i) {
66 ss << ssrcs[i]; 66 ss << ssrcs[i];
67 if (i != ssrcs.size() - 1) 67 if (i != ssrcs.size() - 1)
68 ss << ", "; 68 ss << ", ";
69 } 69 }
70 ss << ']'; 70 ss << ']';
71 ss << ", rtcp_mode: "
72 << (rtcp_mode == RtcpMode::kCompound ? "RtcpMode::kCompound"
73 : "RtcpMode::kReducedSize");
71 ss << ", max_packet_size: " << max_packet_size; 74 ss << ", max_packet_size: " << max_packet_size;
72 ss << ", extensions: ["; 75 ss << ", extensions: [";
73 for (size_t i = 0; i < extensions.size(); ++i) { 76 for (size_t i = 0; i < extensions.size(); ++i) {
74 ss << extensions[i].ToString(); 77 ss << extensions[i].ToString();
75 if (i != extensions.size() - 1) 78 if (i != extensions.size() - 1)
76 ss << ", "; 79 ss << ", ";
77 } 80 }
78 ss << ']'; 81 ss << ']';
79 82
80 ss << ", nack: {rtp_history_ms: " << nack.rtp_history_ms << '}'; 83 ss << ", nack: {rtp_history_ms: " << nack.rtp_history_ms << '}';
(...skipping 543 matching lines...) Expand 10 before | Expand all | Expand 10 after
624 used_ssrcs.resize(static_cast<size_t>(video_codec.numberOfSimulcastStreams)); 627 used_ssrcs.resize(static_cast<size_t>(video_codec.numberOfSimulcastStreams));
625 vie_encoder_.SetSsrcs(used_ssrcs); 628 vie_encoder_.SetSsrcs(used_ssrcs);
626 629
627 // Restart the media flow 630 // Restart the media flow
628 vie_encoder_.Restart(); 631 vie_encoder_.Restart();
629 632
630 return true; 633 return true;
631 } 634 }
632 } // namespace internal 635 } // namespace internal
633 } // namespace webrtc 636 } // namespace webrtc
OLDNEW
« webrtc/media/engine/webrtcvideoengine2.cc ('K') | « webrtc/pc/mediasession.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698