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

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

Issue 1623543002: Refactor RtpSender and SSRCDatabase a bit. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Remove thread checker due to voe::ChannelOwner Created 4 years, 11 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 <list> 14 #include <list>
15 #include <set> 15 #include <set>
16 #include <utility> 16 #include <utility>
17 #include <vector> 17 #include <vector>
18 18
19 #include "webrtc/base/scoped_ptr.h" 19 #include "webrtc/base/scoped_ptr.h"
20 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" 20 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
21 #include "webrtc/modules/rtp_rtcp/source/packet_loss_stats.h" 21 #include "webrtc/modules/rtp_rtcp/source/packet_loss_stats.h"
22 #include "webrtc/modules/rtp_rtcp/source/rtcp_receiver.h" 22 #include "webrtc/modules/rtp_rtcp/source/rtcp_receiver.h"
23 #include "webrtc/modules/rtp_rtcp/source/rtcp_sender.h" 23 #include "webrtc/modules/rtp_rtcp/source/rtcp_sender.h"
24 #include "webrtc/modules/rtp_rtcp/source/rtp_sender.h" 24 #include "webrtc/modules/rtp_rtcp/source/rtp_sender.h"
25 #include "webrtc/modules/rtp_rtcp/source/ssrc_database.h"
25 #include "webrtc/test/testsupport/gtest_prod_util.h" 26 #include "webrtc/test/testsupport/gtest_prod_util.h"
26 27
27 namespace webrtc { 28 namespace webrtc {
28 29
29 class ModuleRtpRtcpImpl : public RtpRtcp { 30 class ModuleRtpRtcpImpl : public RtpRtcp {
30 public: 31 public:
31 explicit ModuleRtpRtcpImpl(const RtpRtcp::Configuration& configuration); 32 explicit ModuleRtpRtcpImpl(const RtpRtcp::Configuration& configuration);
32 33
33 // Returns the number of milliseconds until the module want a worker thread to 34 // Returns the number of milliseconds until the module want a worker thread to
34 // call Process. 35 // call Process.
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 void OnRequestSendReport(); 331 void OnRequestSendReport();
331 332
332 protected: 333 protected:
333 bool UpdateRTCPReceiveInformationTimers(); 334 bool UpdateRTCPReceiveInformationTimers();
334 335
335 uint32_t BitrateReceivedNow() const; 336 uint32_t BitrateReceivedNow() const;
336 337
337 // Get remote SequenceNumber. 338 // Get remote SequenceNumber.
338 uint16_t RemoteSequenceNumber() const; 339 uint16_t RemoteSequenceNumber() const;
339 340
341 SSRCDatabase ssrc_database_;
mflodman 2016/01/25 07:26:19 Drive-by and Stefan might already have commented o
342
340 RTPSender rtp_sender_; 343 RTPSender rtp_sender_;
341 344
342 RTCPSender rtcp_sender_; 345 RTCPSender rtcp_sender_;
343 RTCPReceiver rtcp_receiver_; 346 RTCPReceiver rtcp_receiver_;
344 347
345 Clock* clock_; 348 Clock* clock_;
346 349
347 private: 350 private:
348 FRIEND_TEST_ALL_PREFIXES(RtpRtcpImplTest, Rtt); 351 FRIEND_TEST_ALL_PREFIXES(RtpRtcpImplTest, Rtt);
349 FRIEND_TEST_ALL_PREFIXES(RtpRtcpImplTest, RttForReceiverOnly); 352 FRIEND_TEST_ALL_PREFIXES(RtpRtcpImplTest, RttForReceiverOnly);
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 PacketLossStats receive_loss_stats_; 384 PacketLossStats receive_loss_stats_;
382 385
383 // The processed RTT from RtcpRttStats. 386 // The processed RTT from RtcpRttStats.
384 rtc::scoped_ptr<CriticalSectionWrapper> critical_section_rtt_; 387 rtc::scoped_ptr<CriticalSectionWrapper> critical_section_rtt_;
385 int64_t rtt_ms_; 388 int64_t rtt_ms_;
386 }; 389 };
387 390
388 } // namespace webrtc 391 } // namespace webrtc
389 392
390 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RTCP_IMPL_H_ 393 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RTCP_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698