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

Side by Side Diff: webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc

Issue 1392513002: Disable pacer disabling. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Remove RTP FIR + test refactoring Created 5 years, 2 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) 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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 collision_detected_(false), 86 collision_detected_(false),
87 last_process_time_(configuration.clock->TimeInMilliseconds()), 87 last_process_time_(configuration.clock->TimeInMilliseconds()),
88 last_bitrate_process_time_(configuration.clock->TimeInMilliseconds()), 88 last_bitrate_process_time_(configuration.clock->TimeInMilliseconds()),
89 last_rtt_process_time_(configuration.clock->TimeInMilliseconds()), 89 last_rtt_process_time_(configuration.clock->TimeInMilliseconds()),
90 packet_overhead_(28), // IPV4 UDP. 90 packet_overhead_(28), // IPV4 UDP.
91 padding_index_(static_cast<size_t>(-1)), // Start padding at first child. 91 padding_index_(static_cast<size_t>(-1)), // Start padding at first child.
92 nack_method_(kNackOff), 92 nack_method_(kNackOff),
93 nack_last_time_sent_full_(0), 93 nack_last_time_sent_full_(0),
94 nack_last_time_sent_full_prev_(0), 94 nack_last_time_sent_full_prev_(0),
95 nack_last_seq_number_sent_(0), 95 nack_last_seq_number_sent_(0),
96 key_frame_req_method_(kKeyFrameReqFirRtp), 96 key_frame_req_method_(kKeyFrameReqPliRtcp),
97 remote_bitrate_(configuration.remote_bitrate_estimator), 97 remote_bitrate_(configuration.remote_bitrate_estimator),
98 rtt_stats_(configuration.rtt_stats), 98 rtt_stats_(configuration.rtt_stats),
99 critical_section_rtt_(CriticalSectionWrapper::CreateCriticalSection()), 99 critical_section_rtt_(CriticalSectionWrapper::CreateCriticalSection()),
100 rtt_ms_(0) { 100 rtt_ms_(0) {
101 send_video_codec_.codecType = kVideoCodecUnknown; 101 send_video_codec_.codecType = kVideoCodecUnknown;
102 102
103 // Make sure that RTCP objects are aware of our SSRC. 103 // Make sure that RTCP objects are aware of our SSRC.
104 uint32_t SSRC = rtp_sender_.SSRC(); 104 uint32_t SSRC = rtp_sender_.SSRC();
105 rtcp_sender_.SetSSRC(SSRC); 105 rtcp_sender_.SetSSRC(SSRC);
106 SetRtcpReceiverSsrcs(SSRC); 106 SetRtcpReceiverSsrcs(SSRC);
(...skipping 697 matching lines...) Expand 10 before | Expand all | Expand 10 after
804 } 804 }
805 805
806 int32_t ModuleRtpRtcpImpl::SetKeyFrameRequestMethod( 806 int32_t ModuleRtpRtcpImpl::SetKeyFrameRequestMethod(
807 const KeyFrameRequestMethod method) { 807 const KeyFrameRequestMethod method) {
808 key_frame_req_method_ = method; 808 key_frame_req_method_ = method;
809 return 0; 809 return 0;
810 } 810 }
811 811
812 int32_t ModuleRtpRtcpImpl::RequestKeyFrame() { 812 int32_t ModuleRtpRtcpImpl::RequestKeyFrame() {
813 switch (key_frame_req_method_) { 813 switch (key_frame_req_method_) {
814 case kKeyFrameReqFirRtp:
815 return rtp_sender_.SendRTPIntraRequest();
816 case kKeyFrameReqPliRtcp: 814 case kKeyFrameReqPliRtcp:
817 return SendRTCP(kRtcpPli); 815 return SendRTCP(kRtcpPli);
818 case kKeyFrameReqFirRtcp: 816 case kKeyFrameReqFirRtcp:
819 return SendRTCP(kRtcpFir); 817 return SendRTCP(kRtcpFir);
820 } 818 }
821 return -1; 819 return -1;
822 } 820 }
823 821
824 int32_t ModuleRtpRtcpImpl::SendRTCPSliceLossIndication( 822 int32_t ModuleRtpRtcpImpl::SendRTCPSliceLossIndication(
825 const uint8_t picture_id) { 823 const uint8_t picture_id) {
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
987 void ModuleRtpRtcpImpl::RegisterSendChannelRtpStatisticsCallback( 985 void ModuleRtpRtcpImpl::RegisterSendChannelRtpStatisticsCallback(
988 StreamDataCountersCallback* callback) { 986 StreamDataCountersCallback* callback) {
989 rtp_sender_.RegisterRtpStatisticsCallback(callback); 987 rtp_sender_.RegisterRtpStatisticsCallback(callback);
990 } 988 }
991 989
992 StreamDataCountersCallback* 990 StreamDataCountersCallback*
993 ModuleRtpRtcpImpl::GetSendChannelRtpStatisticsCallback() const { 991 ModuleRtpRtcpImpl::GetSendChannelRtpStatisticsCallback() const {
994 return rtp_sender_.GetRtpStatisticsCallback(); 992 return rtp_sender_.GetRtpStatisticsCallback();
995 } 993 }
996 } // namespace webrtc 994 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc ('k') | webrtc/modules/rtp_rtcp/source/rtp_sender.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698