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

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

Issue 2973363002: Explicitly inform PacketRouter which RTP-RTCP modules are REMB-candidates (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
« no previous file with comments | « webrtc/modules/pacing/packet_router_unittest.cc ('k') | webrtc/video/video_send_stream.cc » ('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) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 last_packet_log_ms_(-1), 106 last_packet_log_ms_(-1),
107 rtp_rtcp_(CreateRtpRtcpModule(rtp_receive_statistics_.get(), 107 rtp_rtcp_(CreateRtpRtcpModule(rtp_receive_statistics_.get(),
108 transport, 108 transport,
109 rtt_stats, 109 rtt_stats,
110 receive_stats_proxy, 110 receive_stats_proxy,
111 packet_router)), 111 packet_router)),
112 complete_frame_callback_(complete_frame_callback), 112 complete_frame_callback_(complete_frame_callback),
113 keyframe_request_sender_(keyframe_request_sender), 113 keyframe_request_sender_(keyframe_request_sender),
114 timing_(timing), 114 timing_(timing),
115 has_received_frame_(false) { 115 has_received_frame_(false) {
116 packet_router_->AddReceiveRtpModule(rtp_rtcp_.get()); 116 constexpr bool remb_candidate = true;
117 packet_router_->AddReceiveRtpModule(rtp_rtcp_.get(), remb_candidate);
117 rtp_receive_statistics_->RegisterRtpStatisticsCallback(receive_stats_proxy); 118 rtp_receive_statistics_->RegisterRtpStatisticsCallback(receive_stats_proxy);
118 rtp_receive_statistics_->RegisterRtcpStatisticsCallback(receive_stats_proxy); 119 rtp_receive_statistics_->RegisterRtcpStatisticsCallback(receive_stats_proxy);
119 120
120 RTC_DCHECK(config_.rtp.rtcp_mode != RtcpMode::kOff) 121 RTC_DCHECK(config_.rtp.rtcp_mode != RtcpMode::kOff)
121 << "A stream should not be configured with RTCP disabled. This value is " 122 << "A stream should not be configured with RTCP disabled. This value is "
122 "reserved for internal usage."; 123 "reserved for internal usage.";
123 RTC_DCHECK(config_.rtp.remote_ssrc != 0); 124 RTC_DCHECK(config_.rtp.remote_ssrc != 0);
124 // TODO(pbos): What's an appropriate local_ssrc for receive-only streams? 125 // TODO(pbos): What's an appropriate local_ssrc for receive-only streams?
125 RTC_DCHECK(config_.rtp.local_ssrc != 0); 126 RTC_DCHECK(config_.rtp.local_ssrc != 0);
126 RTC_DCHECK(config_.rtp.remote_ssrc != config_.rtp.local_ssrc); 127 RTC_DCHECK(config_.rtp.remote_ssrc != config_.rtp.local_ssrc);
(...skipping 553 matching lines...) Expand 10 before | Expand all | Expand 10 after
680 return; 681 return;
681 682
682 if (!sprop_decoder.DecodeSprop(sprop_base64_it->second.c_str())) 683 if (!sprop_decoder.DecodeSprop(sprop_base64_it->second.c_str()))
683 return; 684 return;
684 685
685 tracker_.InsertSpsPpsNalus(sprop_decoder.sps_nalu(), 686 tracker_.InsertSpsPpsNalus(sprop_decoder.sps_nalu(),
686 sprop_decoder.pps_nalu()); 687 sprop_decoder.pps_nalu());
687 } 688 }
688 689
689 } // namespace webrtc 690 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/pacing/packet_router_unittest.cc ('k') | webrtc/video/video_send_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698