| 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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 : audio(false), | 47 : audio(false), |
| 48 receiver_only(false), | 48 receiver_only(false), |
| 49 clock(nullptr), | 49 clock(nullptr), |
| 50 receive_statistics(NullObjectReceiveStatistics()), | 50 receive_statistics(NullObjectReceiveStatistics()), |
| 51 outgoing_transport(nullptr), | 51 outgoing_transport(nullptr), |
| 52 intra_frame_callback(nullptr), | 52 intra_frame_callback(nullptr), |
| 53 bandwidth_callback(nullptr), | 53 bandwidth_callback(nullptr), |
| 54 transport_feedback_callback(nullptr), | 54 transport_feedback_callback(nullptr), |
| 55 rtt_stats(nullptr), | 55 rtt_stats(nullptr), |
| 56 rtcp_packet_type_counter_observer(nullptr), | 56 rtcp_packet_type_counter_observer(nullptr), |
| 57 audio_messages(NullObjectRtpAudioFeedback()), | |
| 58 remote_bitrate_estimator(nullptr), | 57 remote_bitrate_estimator(nullptr), |
| 59 paced_sender(nullptr), | 58 paced_sender(nullptr), |
| 60 transport_sequence_number_allocator(nullptr), | 59 transport_sequence_number_allocator(nullptr), |
| 61 send_bitrate_observer(nullptr), | 60 send_bitrate_observer(nullptr), |
| 62 send_frame_count_observer(nullptr), | 61 send_frame_count_observer(nullptr), |
| 63 send_side_delay_observer(nullptr), | 62 send_side_delay_observer(nullptr), |
| 64 event_log(nullptr) {} | 63 event_log(nullptr) {} |
| 65 | 64 |
| 66 RtpRtcp* RtpRtcp::CreateRtpRtcp(const RtpRtcp::Configuration& configuration) { | 65 RtpRtcp* RtpRtcp::CreateRtpRtcp(const RtpRtcp::Configuration& configuration) { |
| 67 if (configuration.clock) { | 66 if (configuration.clock) { |
| 68 return new ModuleRtpRtcpImpl(configuration); | 67 return new ModuleRtpRtcpImpl(configuration); |
| 69 } else { | 68 } else { |
| 70 // No clock implementation provided, use default clock. | 69 // No clock implementation provided, use default clock. |
| 71 RtpRtcp::Configuration configuration_copy; | 70 RtpRtcp::Configuration configuration_copy; |
| 72 memcpy(&configuration_copy, &configuration, | 71 memcpy(&configuration_copy, &configuration, |
| 73 sizeof(RtpRtcp::Configuration)); | 72 sizeof(RtpRtcp::Configuration)); |
| 74 configuration_copy.clock = Clock::GetRealTimeClock(); | 73 configuration_copy.clock = Clock::GetRealTimeClock(); |
| 75 return new ModuleRtpRtcpImpl(configuration_copy); | 74 return new ModuleRtpRtcpImpl(configuration_copy); |
| 76 } | 75 } |
| 77 } | 76 } |
| 78 | 77 |
| 79 ModuleRtpRtcpImpl::ModuleRtpRtcpImpl(const Configuration& configuration) | 78 ModuleRtpRtcpImpl::ModuleRtpRtcpImpl(const Configuration& configuration) |
| 80 : rtp_sender_(configuration.audio, | 79 : rtp_sender_(configuration.audio, |
| 81 configuration.clock, | 80 configuration.clock, |
| 82 configuration.outgoing_transport, | 81 configuration.outgoing_transport, |
| 83 configuration.audio_messages, | |
| 84 configuration.paced_sender, | 82 configuration.paced_sender, |
| 85 configuration.transport_sequence_number_allocator, | 83 configuration.transport_sequence_number_allocator, |
| 86 configuration.transport_feedback_callback, | 84 configuration.transport_feedback_callback, |
| 87 configuration.send_bitrate_observer, | 85 configuration.send_bitrate_observer, |
| 88 configuration.send_frame_count_observer, | 86 configuration.send_frame_count_observer, |
| 89 configuration.send_side_delay_observer, | 87 configuration.send_side_delay_observer, |
| 90 configuration.event_log), | 88 configuration.event_log), |
| 91 rtcp_sender_(configuration.audio, | 89 rtcp_sender_(configuration.audio, |
| 92 configuration.clock, | 90 configuration.clock, |
| 93 configuration.receive_statistics, | 91 configuration.receive_statistics, |
| (...skipping 904 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 998 void ModuleRtpRtcpImpl::RegisterSendChannelRtpStatisticsCallback( | 996 void ModuleRtpRtcpImpl::RegisterSendChannelRtpStatisticsCallback( |
| 999 StreamDataCountersCallback* callback) { | 997 StreamDataCountersCallback* callback) { |
| 1000 rtp_sender_.RegisterRtpStatisticsCallback(callback); | 998 rtp_sender_.RegisterRtpStatisticsCallback(callback); |
| 1001 } | 999 } |
| 1002 | 1000 |
| 1003 StreamDataCountersCallback* | 1001 StreamDataCountersCallback* |
| 1004 ModuleRtpRtcpImpl::GetSendChannelRtpStatisticsCallback() const { | 1002 ModuleRtpRtcpImpl::GetSendChannelRtpStatisticsCallback() const { |
| 1005 return rtp_sender_.GetRtpStatisticsCallback(); | 1003 return rtp_sender_.GetRtpStatisticsCallback(); |
| 1006 } | 1004 } |
| 1007 } // namespace webrtc | 1005 } // namespace webrtc |
| OLD | NEW |