| OLD | NEW |
| 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 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 178 config_.rtp.fec.red_payload_type, | 178 config_.rtp.fec.red_payload_type, |
| 179 config_.rtp.fec.ulpfec_payload_type); | 179 config_.rtp.fec.ulpfec_payload_type); |
| 180 } | 180 } |
| 181 | 181 |
| 182 if (config_.rtp.rtcp_xr.receiver_reference_time_report) | 182 if (config_.rtp.rtcp_xr.receiver_reference_time_report) |
| 183 rtp_rtcp_->SetRtcpXrRrtrStatus(true); | 183 rtp_rtcp_->SetRtcpXrRrtrStatus(true); |
| 184 | 184 |
| 185 // Stats callback for CNAME changes. | 185 // Stats callback for CNAME changes. |
| 186 rtp_rtcp_->RegisterRtcpStatisticsCallback(receive_stats_proxy); | 186 rtp_rtcp_->RegisterRtcpStatisticsCallback(receive_stats_proxy); |
| 187 | 187 |
| 188 process_thread_->RegisterModule(rtp_receive_statistics_.get()); | |
| 189 process_thread_->RegisterModule(rtp_rtcp_.get()); | 188 process_thread_->RegisterModule(rtp_rtcp_.get()); |
| 190 } | 189 } |
| 191 | 190 |
| 192 RtpStreamReceiver::~RtpStreamReceiver() { | 191 RtpStreamReceiver::~RtpStreamReceiver() { |
| 193 process_thread_->DeRegisterModule(rtp_receive_statistics_.get()); | |
| 194 process_thread_->DeRegisterModule(rtp_rtcp_.get()); | 192 process_thread_->DeRegisterModule(rtp_rtcp_.get()); |
| 195 | 193 |
| 196 packet_router_->RemoveRtpModule(rtp_rtcp_.get()); | 194 packet_router_->RemoveRtpModule(rtp_rtcp_.get()); |
| 197 rtp_rtcp_->SetREMBStatus(false); | 195 rtp_rtcp_->SetREMBStatus(false); |
| 198 remb_->RemoveReceiveChannel(rtp_rtcp_.get()); | 196 remb_->RemoveReceiveChannel(rtp_rtcp_.get()); |
| 199 UpdateHistograms(); | 197 UpdateHistograms(); |
| 200 } | 198 } |
| 201 | 199 |
| 202 bool RtpStreamReceiver::SetReceiveCodec(const VideoCodec& video_codec) { | 200 bool RtpStreamReceiver::SetReceiveCodec(const VideoCodec& video_codec) { |
| 203 int8_t old_pltype = -1; | 201 int8_t old_pltype = -1; |
| (...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 536 const std::string& extension, int id) { | 534 const std::string& extension, int id) { |
| 537 // One-byte-extension local identifiers are in the range 1-14 inclusive. | 535 // One-byte-extension local identifiers are in the range 1-14 inclusive. |
| 538 RTC_DCHECK_GE(id, 1); | 536 RTC_DCHECK_GE(id, 1); |
| 539 RTC_DCHECK_LE(id, 14); | 537 RTC_DCHECK_LE(id, 14); |
| 540 RTC_DCHECK(RtpExtension::IsSupportedForVideo(extension)); | 538 RTC_DCHECK(RtpExtension::IsSupportedForVideo(extension)); |
| 541 RTC_CHECK(rtp_header_parser_->RegisterRtpHeaderExtension( | 539 RTC_CHECK(rtp_header_parser_->RegisterRtpHeaderExtension( |
| 542 StringToRtpExtensionType(extension), id)); | 540 StringToRtpExtensionType(extension), id)); |
| 543 } | 541 } |
| 544 | 542 |
| 545 } // namespace webrtc | 543 } // namespace webrtc |
| OLD | NEW |