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

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

Issue 100823015: Cast: move net->transport (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Updating transport callback 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
« no previous file with comments | « media/cast/video_receiver/video_receiver_unittest.cc ('k') | media/cast/video_sender/video_sender.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/video_sender/video_sender.h
diff --git a/media/cast/video_sender/video_sender.h b/media/cast/video_sender/video_sender.h
index af955375ef00e3c6506d69237210611178fc2e34..671fef8d055ccafd1ea717d750f9849d9712711f 100644
--- a/media/cast/video_sender/video_sender.h
+++ b/media/cast/video_sender/video_sender.h
@@ -15,8 +15,8 @@
#include "media/cast/cast_config.h"
#include "media/cast/cast_environment.h"
#include "media/cast/congestion_control/congestion_control.h"
-#include "media/cast/net/rtp_sender/rtp_sender.h"
#include "media/cast/rtcp/rtcp.h"
+#include "media/cast/transport/rtp_sender/rtp_sender.h"
namespace crypto {
class Encryptor;
@@ -34,7 +34,6 @@ class VideoEncoder;
class LocalRtcpVideoSenderFeedback;
class LocalRtpVideoSenderStatistics;
class LocalVideoEncoderCallback;
-class PacedPacketSender;
// Not thread safe. Only called from the main cast thread.
// This class owns all objects related to sending video, objects that create RTP
@@ -48,7 +47,7 @@ class VideoSender : public base::NonThreadSafe,
VideoSender(scoped_refptr<CastEnvironment> cast_environment,
const VideoSenderConfig& video_config,
VideoEncoderController* const video_encoder_controller,
- PacedPacketSender* const paced_packet_sender);
+ transport::PacedPacketSender* const paced_packet_sender);
virtual ~VideoSender();
@@ -123,7 +122,7 @@ class VideoSender : public base::NonThreadSafe,
scoped_ptr<LocalRtpVideoSenderStatistics> rtp_video_sender_statistics_;
scoped_ptr<VideoEncoder> video_encoder_;
scoped_ptr<Rtcp> rtcp_;
- scoped_ptr<RtpSender> rtp_sender_;
+ scoped_ptr<transport::RtpSender> rtp_sender_;
VideoEncoderController* video_encoder_controller_;
uint8 max_unacked_frames_;
scoped_ptr<crypto::Encryptor> encryptor_;
« no previous file with comments | « media/cast/video_receiver/video_receiver_unittest.cc ('k') | media/cast/video_sender/video_sender.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698