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

Unified Diff: webrtc/modules/pacing/paced_sender.cc

Issue 1350163005: Avoid circular dependency rtp_rtcp <-> paced_sender (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase Created 5 years, 3 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
« no previous file with comments | « webrtc/modules/pacing/include/packet_router.h ('k') | webrtc/modules/pacing/pacing.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/pacing/paced_sender.cc
diff --git a/webrtc/modules/pacing/paced_sender.cc b/webrtc/modules/pacing/paced_sender.cc
index d5df4809741bafab86ee8b446c29f4ff424d692d..55c361b085080e6ac6e7cd3a2c65d2199cf1a7af 100644
--- a/webrtc/modules/pacing/paced_sender.cc
+++ b/webrtc/modules/pacing/paced_sender.cc
@@ -36,7 +36,7 @@ const int64_t kMaxIntervalTimeMs = 30;
namespace webrtc {
namespace paced_sender {
struct Packet {
- Packet(PacedSender::Priority priority,
+ Packet(RtpPacketSender::Priority priority,
uint32_t ssrc,
uint16_t seq_number,
int64_t capture_time_ms,
@@ -53,7 +53,7 @@ struct Packet {
retransmission(retransmission),
enqueue_order(enqueue_order) {}
- PacedSender::Priority priority;
+ RtpPacketSender::Priority priority;
uint32_t ssrc;
uint16_t sequence_number;
int64_t capture_time_ms;
@@ -268,9 +268,12 @@ void PacedSender::UpdateBitrate(int bitrate_kbps,
bitrate_bps_ = 1000 * bitrate_kbps;
}
-bool PacedSender::SendPacket(Priority priority, uint32_t ssrc,
- uint16_t sequence_number, int64_t capture_time_ms, size_t bytes,
- bool retransmission) {
+bool PacedSender::SendPacket(RtpPacketSender::Priority priority,
+ uint32_t ssrc,
+ uint16_t sequence_number,
+ int64_t capture_time_ms,
+ size_t bytes,
+ bool retransmission) {
CriticalSectionScoped cs(critsect_.get());
if (!enabled_) {
« no previous file with comments | « webrtc/modules/pacing/include/packet_router.h ('k') | webrtc/modules/pacing/pacing.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698