zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure rtp_rtcp module doesn't directly reference anything in the pacer module, and remove build dependencies on it.

Browse Source 
BUG=

Review URL: https://codereview.webrtc.org/1350163005

Cr-Commit-Position: refs/heads/master@{#10005}
This commit is contained in:
sprang
2015-09-21 15:11:14 -07:00
committed by Commit bot
parent 04ac81f2fd
commit ebbf8a805b
23 changed files with 161 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
webrtc/modules/pacing/include/packet_router.h
View File

@ -19,15 +19,19 @@
#include "webrtc/base/thread_annotations.h"
#include "webrtc/common_types.h"
#include "webrtc/modules/pacing/include/paced_sender.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
#include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h"
namespace webrtc {
class RtpRtcp;
namespace rtcp {
class TransportFeedback;
} // namespace rtcp
// PacketRouter routes outgoing data to the correct sending RTP module, based
// on the simulcast layer in RTPVideoHeader.
class PacketRouter : public PacedSender::Callback {
class PacketRouter : public PacedSender::Callback,
public TransportSequenceNumberAllocator {
public:
PacketRouter();
virtual ~PacketRouter();
@ -44,7 +48,7 @@ class PacketRouter : public PacedSender::Callback {
size_t TimeToSendPadding(size_t bytes) override;
void SetTransportWideSequenceNumber(uint16_t sequence_number);
uint16_t AllocateSequenceNumber();
uint16_t AllocateSequenceNumber() override;
// Send transport feedback packet to send-side.
virtual bool SendFeedback(rtcp::TransportFeedback* packet);