| Index: media/cast/cast_sender_impl.h
|
| diff --git a/media/cast/cast_sender_impl.h b/media/cast/cast_sender_impl.h
|
| index d09a869712c798f1ae52f1a3ac26e82288f03cee..bc320f7b5452c19ba25e56a0eb6ad24c2e88b912 100644
|
| --- a/media/cast/cast_sender_impl.h
|
| +++ b/media/cast/cast_sender_impl.h
|
| @@ -6,12 +6,12 @@
|
|
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| -#include "media/cast/audio_sender/audio_sender.h"
|
| #include "media/cast/cast_config.h"
|
| #include "media/cast/cast_defines.h"
|
| #include "media/cast/cast_environment.h"
|
| #include "media/cast/cast_sender.h"
|
| -#include "media/cast/video_sender/video_sender.h"
|
| +#include "media/cast/sender/audio_sender.h"
|
| +#include "media/cast/sender/video_sender.h"
|
|
|
| namespace media {
|
| class VideoFrame;
|
| @@ -25,7 +25,7 @@ class VideoSender;
|
| class CastSenderImpl : public CastSender {
|
| public:
|
| CastSenderImpl(scoped_refptr<CastEnvironment> cast_environment,
|
| - transport::CastTransportSender* const transport_sender);
|
| + CastTransportSender* const transport_sender);
|
|
|
| virtual void InitializeAudio(
|
| const AudioSenderConfig& audio_config,
|
| @@ -42,7 +42,7 @@ class CastSenderImpl : public CastSender {
|
| virtual scoped_refptr<AudioFrameInput> audio_frame_input() OVERRIDE;
|
| virtual scoped_refptr<VideoFrameInput> video_frame_input() OVERRIDE;
|
|
|
| - virtual transport::PacketReceiverCallback packet_receiver() OVERRIDE;
|
| + virtual PacketReceiverCallback packet_receiver() OVERRIDE;
|
|
|
| private:
|
| void ReceivedPacket(scoped_ptr<Packet> packet);
|
| @@ -55,7 +55,7 @@ class CastSenderImpl : public CastSender {
|
| scoped_refptr<CastEnvironment> cast_environment_;
|
| // The transport sender is owned by the owner of the CastSender, and should be
|
| // valid throughout the lifetime of the CastSender.
|
| - transport::CastTransportSender* const transport_sender_;
|
| + CastTransportSender* const transport_sender_;
|
| uint32 ssrc_of_audio_sender_;
|
| uint32 ssrc_of_video_sender_;
|
|
|
|
|