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

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

Issue 2960363002: Implement RTP keepalive in native stack. (Closed)
Patch Set: Addressed comments. market bit set to false Created 3 years, 5 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
11 #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RTCP_IMPL_H_ 11 #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RTCP_IMPL_H_
12 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RTCP_IMPL_H_ 12 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RTCP_IMPL_H_
13 13
14 #include <memory> 14 #include <memory>
15 #include <set> 15 #include <set>
16 #include <utility> 16 #include <utility>
17 #include <vector> 17 #include <vector>
18 18
19 #include "webrtc/base/criticalsection.h" 19 #include "webrtc/base/criticalsection.h"
20 #include "webrtc/base/gtest_prod_util.h" 20 #include "webrtc/base/gtest_prod_util.h"
21 #include "webrtc/base/optional.h" 21 #include "webrtc/base/optional.h"
22 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" 22 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
23 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" 23 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
24 #include "webrtc/modules/rtp_rtcp/source/packet_loss_stats.h" 24 #include "webrtc/modules/rtp_rtcp/source/packet_loss_stats.h"
25 #include "webrtc/modules/rtp_rtcp/source/rtcp_receiver.h" 25 #include "webrtc/modules/rtp_rtcp/source/rtcp_receiver.h"
26 #include "webrtc/modules/rtp_rtcp/source/rtcp_sender.h" 26 #include "webrtc/modules/rtp_rtcp/source/rtcp_sender.h"
27 #include "webrtc/modules/rtp_rtcp/source/rtp_sender.h" 27 #include "webrtc/modules/rtp_rtcp/source/rtp_sender.h"
28 #include "webrtc/video_send_stream.h"
åsapersson 2017/07/05 15:19:55 remove?
sprang_webrtc 2017/07/05 15:56:47 Done.
28 29
29 namespace webrtc { 30 namespace webrtc {
30 31
31 class ModuleRtpRtcpImpl : public RtpRtcp, public RTCPReceiver::ModuleRtpRtcp { 32 class ModuleRtpRtcpImpl : public RtpRtcp, public RTCPReceiver::ModuleRtpRtcp {
32 public: 33 public:
33 explicit ModuleRtpRtcpImpl(const RtpRtcp::Configuration& configuration); 34 explicit ModuleRtpRtcpImpl(const RtpRtcp::Configuration& configuration);
34 35
35 // Returns the number of milliseconds until the module want a worker thread to 36 // Returns the number of milliseconds until the module want a worker thread to
36 // call Process. 37 // call Process.
37 int64_t TimeUntilNextProcess() override; 38 int64_t TimeUntilNextProcess() override;
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 329
329 bool TimeToSendFullNackList(int64_t now) const; 330 bool TimeToSendFullNackList(int64_t now) const;
330 331
331 std::unique_ptr<RTPSender> rtp_sender_; 332 std::unique_ptr<RTPSender> rtp_sender_;
332 RTCPSender rtcp_sender_; 333 RTCPSender rtcp_sender_;
333 RTCPReceiver rtcp_receiver_; 334 RTCPReceiver rtcp_receiver_;
334 335
335 const Clock* const clock_; 336 const Clock* const clock_;
336 337
337 const bool audio_; 338 const bool audio_;
338 int64_t last_process_time_; 339
340 const RtpKeepAliveConfig keepalive_config_;
339 int64_t last_bitrate_process_time_; 341 int64_t last_bitrate_process_time_;
340 int64_t last_rtt_process_time_; 342 int64_t last_rtt_process_time_;
343 int64_t next_process_time_;
344 int64_t next_keepalive_time_;
341 uint16_t packet_overhead_; 345 uint16_t packet_overhead_;
342 346
343 // Send side 347 // Send side
344 int64_t nack_last_time_sent_full_; 348 int64_t nack_last_time_sent_full_;
345 uint32_t nack_last_time_sent_full_prev_; 349 uint32_t nack_last_time_sent_full_prev_;
346 uint16_t nack_last_seq_number_sent_; 350 uint16_t nack_last_seq_number_sent_;
347 351
348 KeyFrameRequestMethod key_frame_req_method_; 352 KeyFrameRequestMethod key_frame_req_method_;
349 353
350 RemoteBitrateEstimator* remote_bitrate_; 354 RemoteBitrateEstimator* remote_bitrate_;
351 355
352 RtcpRttStats* rtt_stats_; 356 RtcpRttStats* rtt_stats_;
353 357
354 PacketLossStats send_loss_stats_; 358 PacketLossStats send_loss_stats_;
355 PacketLossStats receive_loss_stats_; 359 PacketLossStats receive_loss_stats_;
356 360
357 // The processed RTT from RtcpRttStats. 361 // The processed RTT from RtcpRttStats.
358 rtc::CriticalSection critical_section_rtt_; 362 rtc::CriticalSection critical_section_rtt_;
359 int64_t rtt_ms_; 363 int64_t rtt_ms_;
360 }; 364 };
361 365
362 } // namespace webrtc 366 } // namespace webrtc
363 367
364 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RTCP_IMPL_H_ 368 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RTCP_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698