| 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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 | 101 |
| 102 const BitrateStatistics& | 102 const BitrateStatistics& |
| 103 RTPSender::BitrateAggregator::BitrateObserver::statistics() const { | 103 RTPSender::BitrateAggregator::BitrateObserver::statistics() const { |
| 104 return statistics_; | 104 return statistics_; |
| 105 } | 105 } |
| 106 | 106 |
| 107 RTPSender::RTPSender( | 107 RTPSender::RTPSender( |
| 108 bool audio, | 108 bool audio, |
| 109 Clock* clock, | 109 Clock* clock, |
| 110 Transport* transport, | 110 Transport* transport, |
| 111 RtpAudioFeedback* audio_feedback, | |
| 112 RtpPacketSender* paced_sender, | 111 RtpPacketSender* paced_sender, |
| 113 TransportSequenceNumberAllocator* sequence_number_allocator, | 112 TransportSequenceNumberAllocator* sequence_number_allocator, |
| 114 TransportFeedbackObserver* transport_feedback_observer, | 113 TransportFeedbackObserver* transport_feedback_observer, |
| 115 BitrateStatisticsObserver* bitrate_callback, | 114 BitrateStatisticsObserver* bitrate_callback, |
| 116 FrameCountObserver* frame_count_observer, | 115 FrameCountObserver* frame_count_observer, |
| 117 SendSideDelayObserver* send_side_delay_observer, | 116 SendSideDelayObserver* send_side_delay_observer, |
| 118 RtcEventLog* event_log) | 117 RtcEventLog* event_log) |
| 119 : clock_(clock), | 118 : clock_(clock), |
| 120 // TODO(holmer): Remove this conversion when we remove the use of | 119 // TODO(holmer): Remove this conversion when we remove the use of |
| 121 // TickTime. | 120 // TickTime. |
| 122 clock_delta_ms_(clock_->TimeInMilliseconds() - | 121 clock_delta_ms_(clock_->TimeInMilliseconds() - |
| 123 TickTime::MillisecondTimestamp()), | 122 TickTime::MillisecondTimestamp()), |
| 124 random_(clock_->TimeInMicroseconds()), | 123 random_(clock_->TimeInMicroseconds()), |
| 125 bitrates_(bitrate_callback), | 124 bitrates_(bitrate_callback), |
| 126 total_bitrate_sent_(clock, bitrates_.total_bitrate_observer()), | 125 total_bitrate_sent_(clock, bitrates_.total_bitrate_observer()), |
| 127 audio_configured_(audio), | 126 audio_configured_(audio), |
| 128 audio_(audio ? new RTPSenderAudio(clock, this, audio_feedback) : nullptr), | 127 audio_(audio ? new RTPSenderAudio(clock, this) : nullptr), |
| 129 video_(audio ? nullptr : new RTPSenderVideo(clock, this)), | 128 video_(audio ? nullptr : new RTPSenderVideo(clock, this)), |
| 130 paced_sender_(paced_sender), | 129 paced_sender_(paced_sender), |
| 131 transport_sequence_number_allocator_(sequence_number_allocator), | 130 transport_sequence_number_allocator_(sequence_number_allocator), |
| 132 transport_feedback_observer_(transport_feedback_observer), | 131 transport_feedback_observer_(transport_feedback_observer), |
| 133 last_capture_time_ms_sent_(0), | 132 last_capture_time_ms_sent_(0), |
| 134 transport_(transport), | 133 transport_(transport), |
| 135 sending_media_(true), // Default to sending media. | 134 sending_media_(true), // Default to sending media. |
| 136 max_payload_length_(IP_PACKET_SIZE - 28), // Default is IP-v4/UDP. | 135 max_payload_length_(IP_PACKET_SIZE - 28), // Default is IP-v4/UDP. |
| 137 packet_over_head_(28), | 136 packet_over_head_(28), |
| 138 payload_type_(-1), | 137 payload_type_(-1), |
| (...skipping 1772 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1911 rtc::CritScope lock(&send_critsect_); | 1910 rtc::CritScope lock(&send_critsect_); |
| 1912 | 1911 |
| 1913 RtpState state; | 1912 RtpState state; |
| 1914 state.sequence_number = sequence_number_rtx_; | 1913 state.sequence_number = sequence_number_rtx_; |
| 1915 state.start_timestamp = start_timestamp_; | 1914 state.start_timestamp = start_timestamp_; |
| 1916 | 1915 |
| 1917 return state; | 1916 return state; |
| 1918 } | 1917 } |
| 1919 | 1918 |
| 1920 } // namespace webrtc | 1919 } // namespace webrtc |
| OLD | NEW |