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

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

Issue 1350163005: Avoid circular dependency rtp_rtcp <-> paced_sender (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase Created 5 years, 3 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 22 matching lines...) Expand all
33 receive_statistics(NullObjectReceiveStatistics()), 33 receive_statistics(NullObjectReceiveStatistics()),
34 outgoing_transport(nullptr), 34 outgoing_transport(nullptr),
35 intra_frame_callback(nullptr), 35 intra_frame_callback(nullptr),
36 bandwidth_callback(nullptr), 36 bandwidth_callback(nullptr),
37 transport_feedback_callback(nullptr), 37 transport_feedback_callback(nullptr),
38 rtt_stats(nullptr), 38 rtt_stats(nullptr),
39 rtcp_packet_type_counter_observer(nullptr), 39 rtcp_packet_type_counter_observer(nullptr),
40 audio_messages(NullObjectRtpAudioFeedback()), 40 audio_messages(NullObjectRtpAudioFeedback()),
41 remote_bitrate_estimator(nullptr), 41 remote_bitrate_estimator(nullptr),
42 paced_sender(nullptr), 42 paced_sender(nullptr),
43 packet_router(nullptr), 43 transport_sequence_number_allocator(nullptr),
44 send_bitrate_observer(nullptr), 44 send_bitrate_observer(nullptr),
45 send_frame_count_observer(nullptr), 45 send_frame_count_observer(nullptr),
46 send_side_delay_observer(nullptr) {} 46 send_side_delay_observer(nullptr) {}
47 47
48 RtpRtcp* RtpRtcp::CreateRtpRtcp(const RtpRtcp::Configuration& configuration) { 48 RtpRtcp* RtpRtcp::CreateRtpRtcp(const RtpRtcp::Configuration& configuration) {
49 if (configuration.clock) { 49 if (configuration.clock) {
50 return new ModuleRtpRtcpImpl(configuration); 50 return new ModuleRtpRtcpImpl(configuration);
51 } else { 51 } else {
52 // No clock implementation provided, use default clock. 52 // No clock implementation provided, use default clock.
53 RtpRtcp::Configuration configuration_copy; 53 RtpRtcp::Configuration configuration_copy;
54 memcpy(&configuration_copy, &configuration, 54 memcpy(&configuration_copy, &configuration,
55 sizeof(RtpRtcp::Configuration)); 55 sizeof(RtpRtcp::Configuration));
56 configuration_copy.clock = Clock::GetRealTimeClock(); 56 configuration_copy.clock = Clock::GetRealTimeClock();
57 return new ModuleRtpRtcpImpl(configuration_copy); 57 return new ModuleRtpRtcpImpl(configuration_copy);
58 } 58 }
59 } 59 }
60 60
61 ModuleRtpRtcpImpl::ModuleRtpRtcpImpl(const Configuration& configuration) 61 ModuleRtpRtcpImpl::ModuleRtpRtcpImpl(const Configuration& configuration)
62 : rtp_sender_(configuration.audio, 62 : rtp_sender_(configuration.audio,
63 configuration.clock, 63 configuration.clock,
64 configuration.outgoing_transport, 64 configuration.outgoing_transport,
65 configuration.audio_messages, 65 configuration.audio_messages,
66 configuration.paced_sender, 66 configuration.paced_sender,
67 configuration.packet_router, 67 configuration.transport_sequence_number_allocator,
68 configuration.transport_feedback_callback, 68 configuration.transport_feedback_callback,
69 configuration.send_bitrate_observer, 69 configuration.send_bitrate_observer,
70 configuration.send_frame_count_observer, 70 configuration.send_frame_count_observer,
71 configuration.send_side_delay_observer), 71 configuration.send_side_delay_observer),
72 rtcp_sender_(configuration.audio, 72 rtcp_sender_(configuration.audio,
73 configuration.clock, 73 configuration.clock,
74 configuration.receive_statistics, 74 configuration.receive_statistics,
75 configuration.rtcp_packet_type_counter_observer), 75 configuration.rtcp_packet_type_counter_observer),
76 rtcp_receiver_(configuration.clock, 76 rtcp_receiver_(configuration.clock,
77 configuration.receiver_only, 77 configuration.receiver_only,
(...skipping 910 matching lines...) Expand 10 before | Expand all | Expand 10 after
988 void ModuleRtpRtcpImpl::RegisterSendChannelRtpStatisticsCallback( 988 void ModuleRtpRtcpImpl::RegisterSendChannelRtpStatisticsCallback(
989 StreamDataCountersCallback* callback) { 989 StreamDataCountersCallback* callback) {
990 rtp_sender_.RegisterRtpStatisticsCallback(callback); 990 rtp_sender_.RegisterRtpStatisticsCallback(callback);
991 } 991 }
992 992
993 StreamDataCountersCallback* 993 StreamDataCountersCallback*
994 ModuleRtpRtcpImpl::GetSendChannelRtpStatisticsCallback() const { 994 ModuleRtpRtcpImpl::GetSendChannelRtpStatisticsCallback() const {
995 return rtp_sender_.GetRtpStatisticsCallback(); 995 return rtp_sender_.GetRtpStatisticsCallback();
996 } 996 }
997 } // namespace webrtc 997 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/rtp_rtcp.gypi ('k') | webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698