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

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

Issue 2484143002: Wire up FlexfecSender in RTPSender and add unit tests. (Closed)
Patch Set: Rebase. Created 4 years, 1 month 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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 counter->payload_bytes += packet.payload_size(); 60 counter->payload_bytes += packet.payload_size();
61 } 61 }
62 62
63 } // namespace 63 } // namespace
64 64
65 RTPSender::RTPSender( 65 RTPSender::RTPSender(
66 bool audio, 66 bool audio,
67 Clock* clock, 67 Clock* clock,
68 Transport* transport, 68 Transport* transport,
69 RtpPacketSender* paced_sender, 69 RtpPacketSender* paced_sender,
70 FlexfecSender* flexfec_sender,
70 TransportSequenceNumberAllocator* sequence_number_allocator, 71 TransportSequenceNumberAllocator* sequence_number_allocator,
71 TransportFeedbackObserver* transport_feedback_observer, 72 TransportFeedbackObserver* transport_feedback_observer,
72 BitrateStatisticsObserver* bitrate_callback, 73 BitrateStatisticsObserver* bitrate_callback,
73 FrameCountObserver* frame_count_observer, 74 FrameCountObserver* frame_count_observer,
74 SendSideDelayObserver* send_side_delay_observer, 75 SendSideDelayObserver* send_side_delay_observer,
75 RtcEventLog* event_log, 76 RtcEventLog* event_log,
76 SendPacketObserver* send_packet_observer, 77 SendPacketObserver* send_packet_observer,
77 RateLimiter* retransmission_rate_limiter) 78 RateLimiter* retransmission_rate_limiter)
78 : clock_(clock), 79 : clock_(clock),
79 // TODO(holmer): Remove this conversion? 80 // TODO(holmer): Remove this conversion?
80 clock_delta_ms_(clock_->TimeInMilliseconds() - rtc::TimeMillis()), 81 clock_delta_ms_(clock_->TimeInMilliseconds() - rtc::TimeMillis()),
81 random_(clock_->TimeInMicroseconds()), 82 random_(clock_->TimeInMicroseconds()),
82 audio_configured_(audio), 83 audio_configured_(audio),
83 audio_(audio ? new RTPSenderAudio(clock, this) : nullptr), 84 audio_(audio ? new RTPSenderAudio(clock, this) : nullptr),
84 video_(audio ? nullptr : new RTPSenderVideo(clock, this)), 85 video_(audio ? nullptr : new RTPSenderVideo(clock, this, flexfec_sender)),
85 paced_sender_(paced_sender), 86 paced_sender_(paced_sender),
86 transport_sequence_number_allocator_(sequence_number_allocator), 87 transport_sequence_number_allocator_(sequence_number_allocator),
87 transport_feedback_observer_(transport_feedback_observer), 88 transport_feedback_observer_(transport_feedback_observer),
88 last_capture_time_ms_sent_(0), 89 last_capture_time_ms_sent_(0),
89 transport_(transport), 90 transport_(transport),
90 sending_media_(true), // Default to sending media. 91 sending_media_(true), // Default to sending media.
91 max_payload_length_(IP_PACKET_SIZE - 28), // Default is IP-v4/UDP. 92 max_payload_length_(IP_PACKET_SIZE - 28), // Default is IP-v4/UDP.
92 payload_type_(-1), 93 payload_type_(-1),
93 payload_type_map_(), 94 payload_type_map_(),
94 rtp_header_extension_map_(), 95 rtp_header_extension_map_(),
(...skipping 1142 matching lines...) Expand 10 before | Expand all | Expand 10 after
1237 rtc::CritScope lock(&send_critsect_); 1238 rtc::CritScope lock(&send_critsect_);
1238 1239
1239 RtpState state; 1240 RtpState state;
1240 state.sequence_number = sequence_number_rtx_; 1241 state.sequence_number = sequence_number_rtx_;
1241 state.start_timestamp = timestamp_offset_; 1242 state.start_timestamp = timestamp_offset_;
1242 1243
1243 return state; 1244 return state;
1244 } 1245 }
1245 1246
1246 } // namespace webrtc 1247 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_sender.h ('k') | webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698