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

Unified Diff: media/cast/video_sender/video_sender.cc

Issue 100823015: Cast: move net->transport (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: clean up Created 7 years 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: media/cast/video_sender/video_sender.cc
diff --git a/media/cast/video_sender/video_sender.cc b/media/cast/video_sender/video_sender.cc
index d0d7048da18cffe0e91f91a86ab2b8e2239eb1f9..f680bcf9ceed0c94ed6c4d399376f2aa8069ab99 100644
--- a/media/cast/video_sender/video_sender.cc
+++ b/media/cast/video_sender/video_sender.cc
@@ -12,7 +12,7 @@
#include "crypto/encryptor.h"
#include "crypto/symmetric_key.h"
#include "media/cast/cast_defines.h"
-#include "media/cast/net/pacing/paced_sender.h"
+#include "media/cast/transport/pacing/paced_sender.h"
#include "media/cast/video_sender/video_encoder.h"
namespace media {
@@ -37,7 +37,7 @@ class LocalRtcpVideoSenderFeedback : public RtcpSenderFeedback {
class LocalRtpVideoSenderStatistics : public RtpSenderStatistics {
public:
- explicit LocalRtpVideoSenderStatistics(RtpSender* rtp_sender)
+ explicit LocalRtpVideoSenderStatistics(transport::RtpSender* rtp_sender)
: rtp_sender_(rtp_sender) {
}
@@ -47,7 +47,7 @@ class LocalRtpVideoSenderStatistics : public RtpSenderStatistics {
}
private:
- RtpSender* rtp_sender_;
+ transport::RtpSender* rtp_sender_;
};
VideoSender::VideoSender(
@@ -60,8 +60,10 @@ VideoSender::VideoSender(
max_frame_rate_(video_config.max_frame_rate),
cast_environment_(cast_environment),
rtcp_feedback_(new LocalRtcpVideoSenderFeedback(this)),
- rtp_sender_(new RtpSender(cast_environment, NULL, &video_config,
- paced_packet_sender)),
+ rtp_sender_(new transport::RtpSender(cast_environment,
+ NULL,
+ &video_config,
+ paced_packet_sender)),
last_acked_frame_id_(-1),
last_sent_frame_id_(-1),
duplicate_ack_(0),

Powered by Google App Engine
This is Rietveld 408576698