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

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

Issue 1329083005: Add TransportFeedback adapter, adapting remote feedback to bwe estiamtor (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Bad merge, test issue 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 17 matching lines...) Expand all
28 28
29 RtpRtcp::Configuration::Configuration() 29 RtpRtcp::Configuration::Configuration()
30 : id(-1), 30 : id(-1),
31 audio(false), 31 audio(false),
32 receiver_only(false), 32 receiver_only(false),
33 clock(nullptr), 33 clock(nullptr),
34 receive_statistics(NullObjectReceiveStatistics()), 34 receive_statistics(NullObjectReceiveStatistics()),
35 outgoing_transport(nullptr), 35 outgoing_transport(nullptr),
36 intra_frame_callback(nullptr), 36 intra_frame_callback(nullptr),
37 bandwidth_callback(nullptr), 37 bandwidth_callback(nullptr),
38 transport_feedback_callback(nullptr),
38 rtt_stats(nullptr), 39 rtt_stats(nullptr),
39 rtcp_packet_type_counter_observer(nullptr), 40 rtcp_packet_type_counter_observer(nullptr),
40 audio_messages(NullObjectRtpAudioFeedback()), 41 audio_messages(NullObjectRtpAudioFeedback()),
41 remote_bitrate_estimator(nullptr), 42 remote_bitrate_estimator(nullptr),
42 paced_sender(nullptr), 43 paced_sender(nullptr),
43 packet_router(nullptr), 44 packet_router(nullptr),
44 send_bitrate_observer(nullptr), 45 send_bitrate_observer(nullptr),
45 send_frame_count_observer(nullptr), 46 send_frame_count_observer(nullptr),
46 send_side_delay_observer(nullptr) { 47 send_side_delay_observer(nullptr) {}
47 }
48 48
49 RtpRtcp* RtpRtcp::CreateRtpRtcp(const RtpRtcp::Configuration& configuration) { 49 RtpRtcp* RtpRtcp::CreateRtpRtcp(const RtpRtcp::Configuration& configuration) {
50 if (configuration.clock) { 50 if (configuration.clock) {
51 return new ModuleRtpRtcpImpl(configuration); 51 return new ModuleRtpRtcpImpl(configuration);
52 } else { 52 } else {
53 // No clock implementation provided, use default clock. 53 // No clock implementation provided, use default clock.
54 RtpRtcp::Configuration configuration_copy; 54 RtpRtcp::Configuration configuration_copy;
55 memcpy(&configuration_copy, &configuration, 55 memcpy(&configuration_copy, &configuration,
56 sizeof(RtpRtcp::Configuration)); 56 sizeof(RtpRtcp::Configuration));
57 configuration_copy.clock = Clock::GetRealTimeClock(); 57 configuration_copy.clock = Clock::GetRealTimeClock();
58 return new ModuleRtpRtcpImpl(configuration_copy); 58 return new ModuleRtpRtcpImpl(configuration_copy);
59 } 59 }
60 } 60 }
61 61
62 ModuleRtpRtcpImpl::ModuleRtpRtcpImpl(const Configuration& configuration) 62 ModuleRtpRtcpImpl::ModuleRtpRtcpImpl(const Configuration& configuration)
63 : rtp_sender_(configuration.id, 63 : rtp_sender_(configuration.id,
64 configuration.audio, 64 configuration.audio,
65 configuration.clock, 65 configuration.clock,
66 configuration.outgoing_transport, 66 configuration.outgoing_transport,
67 configuration.audio_messages, 67 configuration.audio_messages,
68 configuration.paced_sender, 68 configuration.paced_sender,
69 configuration.packet_router, 69 configuration.packet_router,
70 configuration.send_time_callback, 70 configuration.transport_feedback_callback,
71 configuration.send_bitrate_observer, 71 configuration.send_bitrate_observer,
72 configuration.send_frame_count_observer, 72 configuration.send_frame_count_observer,
73 configuration.send_side_delay_observer), 73 configuration.send_side_delay_observer),
74 rtcp_sender_(configuration.id, 74 rtcp_sender_(configuration.id,
75 configuration.audio, 75 configuration.audio,
76 configuration.clock, 76 configuration.clock,
77 configuration.receive_statistics, 77 configuration.receive_statistics,
78 configuration.rtcp_packet_type_counter_observer), 78 configuration.rtcp_packet_type_counter_observer),
79 rtcp_receiver_(configuration.id, 79 rtcp_receiver_(configuration.id,
80 configuration.clock, 80 configuration.clock,
(...skipping 912 matching lines...) Expand 10 before | Expand all | Expand 10 after
993 void ModuleRtpRtcpImpl::RegisterSendChannelRtpStatisticsCallback( 993 void ModuleRtpRtcpImpl::RegisterSendChannelRtpStatisticsCallback(
994 StreamDataCountersCallback* callback) { 994 StreamDataCountersCallback* callback) {
995 rtp_sender_.RegisterRtpStatisticsCallback(callback); 995 rtp_sender_.RegisterRtpStatisticsCallback(callback);
996 } 996 }
997 997
998 StreamDataCountersCallback* 998 StreamDataCountersCallback*
999 ModuleRtpRtcpImpl::GetSendChannelRtpStatisticsCallback() const { 999 ModuleRtpRtcpImpl::GetSendChannelRtpStatisticsCallback() const {
1000 return rtp_sender_.GetRtpStatisticsCallback(); 1000 return rtp_sender_.GetRtpStatisticsCallback();
1001 } 1001 }
1002 } // namespace webrtc 1002 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698