| Index: chrome/renderer/media/cast_transport_sender_ipc.h
|
| diff --git a/chrome/renderer/media/cast_transport_sender_ipc.h b/chrome/renderer/media/cast_transport_sender_ipc.h
|
| index 1e02a2769768df3ec41faa3303e2bd9f1ab9d7aa..2228b23bea197faeaa6d9c3ba67de00eca1dead9 100644
|
| --- a/chrome/renderer/media/cast_transport_sender_ipc.h
|
| +++ b/chrome/renderer/media/cast_transport_sender_ipc.h
|
| @@ -8,7 +8,7 @@
|
| #include "base/message_loop/message_loop_proxy.h"
|
| #include "ipc/ipc_channel_proxy.h"
|
| #include "media/cast/logging/logging_defines.h"
|
| -#include "media/cast/transport/cast_transport_sender.h"
|
| +#include "media/cast/net/cast_transport_sender.h"
|
|
|
| // This implementation of the CastTransportSender interface
|
| // communicates with the browser process over IPC and relays
|
| @@ -16,54 +16,54 @@
|
| // The primary reason for this arrangement is to give the
|
| // renderer less direct control over the UDP sockets.
|
| class CastTransportSenderIPC
|
| - : public media::cast::transport::CastTransportSender {
|
| + : public media::cast::CastTransportSender {
|
| public:
|
| CastTransportSenderIPC(
|
| const net::IPEndPoint& remote_end_point,
|
| - const media::cast::transport::CastTransportStatusCallback& status_cb,
|
| - const media::cast::transport::BulkRawEventsCallback& raw_events_cb);
|
| + const media::cast::CastTransportStatusCallback& status_cb,
|
| + const media::cast::BulkRawEventsCallback& raw_events_cb);
|
|
|
| virtual ~CastTransportSenderIPC();
|
|
|
| - // media::cast::transport::CastTransportSender implementation.
|
| + // media::cast::CastTransportSender implementation.
|
| virtual void SetPacketReceiver(
|
| - const media::cast::transport::PacketReceiverCallback& packet_callback)
|
| + const media::cast::PacketReceiverCallback& packet_callback)
|
| OVERRIDE;
|
| virtual void InitializeAudio(
|
| - const media::cast::transport::CastTransportRtpConfig& config) OVERRIDE;
|
| + const media::cast::CastTransportRtpConfig& config) OVERRIDE;
|
| virtual void InitializeVideo(
|
| - const media::cast::transport::CastTransportRtpConfig& config) OVERRIDE;
|
| + const media::cast::CastTransportRtpConfig& config) OVERRIDE;
|
| virtual void InsertCodedAudioFrame(
|
| - const media::cast::transport::EncodedFrame& audio_frame) OVERRIDE;
|
| + const media::cast::EncodedFrame& audio_frame) OVERRIDE;
|
| virtual void InsertCodedVideoFrame(
|
| - const media::cast::transport::EncodedFrame& video_frame) OVERRIDE;
|
| + const media::cast::EncodedFrame& video_frame) OVERRIDE;
|
| virtual void SendRtcpFromRtpSender(
|
| uint32 packet_type_flags,
|
| uint32 ntp_seconds,
|
| uint32 ntp_fraction,
|
| uint32 rtp_timestamp,
|
| - const media::cast::transport::RtcpDlrrReportBlock& dlrr,
|
| + const media::cast::RtcpDlrrReportBlock& dlrr,
|
| uint32 sending_ssrc,
|
| const std::string& c_name) OVERRIDE;
|
| virtual void ResendPackets(
|
| bool is_audio,
|
| - const media::cast::transport::MissingFramesAndPacketsMap& missing_packets,
|
| + const media::cast::MissingFramesAndPacketsMap& missing_packets,
|
| bool cancel_rtx_if_not_in_list,
|
| base::TimeDelta dedupe_window)
|
| OVERRIDE;
|
|
|
| - void OnReceivedPacket(const media::cast::transport::Packet& packet);
|
| + void OnReceivedPacket(const media::cast::Packet& packet);
|
| void OnNotifyStatusChange(
|
| - media::cast::transport::CastTransportStatus status);
|
| + media::cast::CastTransportStatus status);
|
| void OnRawEvents(const std::vector<media::cast::PacketEvent>& packet_events);
|
|
|
| private:
|
| void Send(IPC::Message* message);
|
|
|
| int32 channel_id_;
|
| - media::cast::transport::PacketReceiverCallback packet_callback_;
|
| - media::cast::transport::CastTransportStatusCallback status_callback_;
|
| - media::cast::transport::BulkRawEventsCallback raw_events_callback_;
|
| + media::cast::PacketReceiverCallback packet_callback_;
|
| + media::cast::CastTransportStatusCallback status_callback_;
|
| + media::cast::BulkRawEventsCallback raw_events_callback_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(CastTransportSenderIPC);
|
| };
|
|
|