OLD | NEW |
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 402 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
413 | 413 |
414 // RTP/RTCP initialization. | 414 // RTP/RTCP initialization. |
415 for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) { | 415 for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) { |
416 module_process_thread_->RegisterModule(rtp_rtcp); | 416 module_process_thread_->RegisterModule(rtp_rtcp); |
417 congestion_controller_->packet_router()->AddRtpModule(rtp_rtcp); | 417 congestion_controller_->packet_router()->AddRtpModule(rtp_rtcp); |
418 } | 418 } |
419 | 419 |
420 video_sender_->RegisterProtectionCallback(this); | 420 video_sender_->RegisterProtectionCallback(this); |
421 | 421 |
422 for (size_t i = 0; i < config_.rtp.extensions.size(); ++i) { | 422 for (size_t i = 0; i < config_.rtp.extensions.size(); ++i) { |
423 const std::string& extension = config_.rtp.extensions[i].name; | 423 const std::string& extension = config_.rtp.extensions[i].uri; |
424 int id = config_.rtp.extensions[i].id; | 424 int id = config_.rtp.extensions[i].id; |
425 // One-byte-extension local identifiers are in the range 1-14 inclusive. | 425 // One-byte-extension local identifiers are in the range 1-14 inclusive. |
426 RTC_DCHECK_GE(id, 1); | 426 RTC_DCHECK_GE(id, 1); |
427 RTC_DCHECK_LE(id, 14); | 427 RTC_DCHECK_LE(id, 14); |
428 RTC_DCHECK(RtpExtension::IsSupportedForVideo(extension)); | 428 RTC_DCHECK(RtpExtension::IsSupportedForVideo(extension)); |
429 for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) { | 429 for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) { |
430 RTC_CHECK_EQ(0, rtp_rtcp->RegisterSendRtpHeaderExtension( | 430 RTC_CHECK_EQ(0, rtp_rtcp->RegisterSendRtpHeaderExtension( |
431 StringToRtpExtensionType(extension), id)); | 431 StringToRtpExtensionType(extension), id)); |
432 } | 432 } |
433 } | 433 } |
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
801 &module_nack_rate); | 801 &module_nack_rate); |
802 *sent_video_rate_bps += module_video_rate; | 802 *sent_video_rate_bps += module_video_rate; |
803 *sent_nack_rate_bps += module_nack_rate; | 803 *sent_nack_rate_bps += module_nack_rate; |
804 *sent_fec_rate_bps += module_fec_rate; | 804 *sent_fec_rate_bps += module_fec_rate; |
805 } | 805 } |
806 return 0; | 806 return 0; |
807 } | 807 } |
808 | 808 |
809 } // namespace internal | 809 } // namespace internal |
810 } // namespace webrtc | 810 } // namespace webrtc |
OLD | NEW |