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

Unified Diff: webrtc/modules/pacing/packet_router.h

Issue 2774623006: Let PacketRouter separate send and receive modules. (Closed)
Patch Set: Delete #if:ed out code. Created 3 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/pacing/packet_router.h
diff --git a/webrtc/modules/pacing/packet_router.h b/webrtc/modules/pacing/packet_router.h
index 0dc3fb53bad6ea3fb2369a981819a1c2ee708814..a3de042fdb17849acc6d6353c2f8582ebd8edb34 100644
--- a/webrtc/modules/pacing/packet_router.h
+++ b/webrtc/modules/pacing/packet_router.h
@@ -36,8 +36,18 @@ class PacketRouter : public PacedSender::PacketSender,
PacketRouter();
virtual ~PacketRouter();
- void AddRtpModule(RtpRtcp* rtp_module);
- void RemoveRtpModule(RtpRtcp* rtp_module);
+ // TODO(nisse): Delete, as soon as downstream app is updated.
+ RTC_DEPRECATED void AddRtpModule(RtpRtcp* rtp_module) {
+ AddReceiveRtpModule(rtp_module);
+ }
+ RTC_DEPRECATED void RemoveRtpModule(RtpRtcp* rtp_module) {
+ RemoveReceiveRtpModule(rtp_module);
+ }
+ void AddSendRtpModule(RtpRtcp* rtp_module);
+ void RemoveSendRtpModule(RtpRtcp* rtp_module);
+
+ void AddReceiveRtpModule(RtpRtcp* rtp_module);
+ void RemoveReceiveRtpModule(RtpRtcp* rtp_module);
// Implements PacedSender::Callback.
bool TimeToSendPacket(uint32_t ssrc,
@@ -58,7 +68,8 @@ class PacketRouter : public PacedSender::PacketSender,
private:
rtc::ThreadChecker pacer_thread_checker_;
rtc::CriticalSection modules_crit_;
- std::list<RtpRtcp*> rtp_modules_ GUARDED_BY(modules_crit_);
+ std::list<RtpRtcp*> rtp_send_modules_ GUARDED_BY(modules_crit_);
+ std::list<RtpRtcp*> rtp_receive_modules_ GUARDED_BY(modules_crit_);
the sun 2017/03/28 12:21:52 Any particular reason to use std::list? More cache
nisse-webrtc 2017/03/29 13:58:37 For the list of send modules, the code uses both p
volatile int transport_seq_;

Powered by Google App Engine
This is Rietveld 408576698