Index: chrome/browser/media/cast_transport_host_filter.cc |
diff --git a/chrome/browser/media/cast_transport_host_filter.cc b/chrome/browser/media/cast_transport_host_filter.cc |
index ee31f417d3a9288a5c778dcc9886504ccf1dbd97..acdcd053acdc6fe9acee031034d544ecb782c892 100644 |
--- a/chrome/browser/media/cast_transport_host_filter.cc |
+++ b/chrome/browser/media/cast_transport_host_filter.cc |
@@ -16,8 +16,47 @@ namespace { |
// How often to send raw events. |
const int kSendRawEventsIntervalSecs = 1; |
+class TransportClient : public media::cast::CastTransportSender::Client { |
+ public: |
+ TransportClient(int32_t channel_id, |
+ cast::CastTransportHostFilter* cast_transport_host_filter) |
+ : channel_id_(channel_id), |
+ cast_transport_host_filter_(cast_transport_host_filter) {} |
+ |
+ void OnStatusChanged(media::cast::CastTransportStatus status) final; |
+ void OnLoggingEventsReceived( |
+ scoped_ptr<std::vector<media::cast::FrameEvent>> frame_events, |
+ scoped_ptr<std::vector<media::cast::PacketEvent>> packet_events) final; |
+ void ProcessRtpPacket(scoped_ptr<media::cast::Packet> packet) final; |
+ |
+ private: |
+ const int32_t channel_id_; |
+ cast::CastTransportHostFilter* const cast_transport_host_filter_; |
+ |
+ DISALLOW_COPY_AND_ASSIGN(TransportClient); |
+}; |
+ |
+void TransportClient::OnStatusChanged(media::cast::CastTransportStatus status) { |
+ cast_transport_host_filter_->Send( |
+ new CastMsg_NotifyStatusChange(channel_id_, status)); |
} |
+void TransportClient::OnLoggingEventsReceived( |
+ scoped_ptr<std::vector<media::cast::FrameEvent>> frame_events, |
+ scoped_ptr<std::vector<media::cast::PacketEvent>> packet_events) { |
+ if (frame_events->empty() && packet_events->empty()) |
+ return; |
+ cast_transport_host_filter_->Send( |
+ new CastMsg_RawEvents(channel_id_, *packet_events, *frame_events)); |
+} |
+ |
+void TransportClient::ProcessRtpPacket(scoped_ptr<media::cast::Packet> packet) { |
+ cast_transport_host_filter_->Send( |
+ new CastMsg_ReceivedPacket(channel_id_, *packet)); |
+} |
+ |
+} // namespace |
+ |
namespace cast { |
CastTransportHostFilter::CastTransportHostFilter() |
@@ -26,6 +65,12 @@ CastTransportHostFilter::CastTransportHostFilter() |
CastTransportHostFilter::~CastTransportHostFilter() {} |
+void CastTransportHostFilter::OnStatusChanged( |
+ int32_t channel_id, |
+ media::cast::CastTransportStatus status) { |
+ Send(new CastMsg_NotifyStatusChange(channel_id, status)); |
+} |
+ |
bool CastTransportHostFilter::OnMessageReceived(const IPC::Message& message) { |
bool handled = true; |
IPC_BEGIN_MESSAGE_MAP(CastTransportHostFilter, message) |
@@ -49,27 +94,6 @@ bool CastTransportHostFilter::OnMessageReceived(const IPC::Message& message) { |
return handled; |
} |
-void CastTransportHostFilter::ReceivedPacket( |
- int32_t channel_id, |
- scoped_ptr<media::cast::Packet> packet) { |
- Send(new CastMsg_ReceivedPacket(channel_id, *packet)); |
-} |
- |
-void CastTransportHostFilter::NotifyStatusChange( |
- int32_t channel_id, |
- media::cast::CastTransportStatus status) { |
- Send(new CastMsg_NotifyStatusChange(channel_id, status)); |
-} |
- |
-void CastTransportHostFilter::SendRawEvents( |
- int32_t channel_id, |
- scoped_ptr<std::vector<media::cast::FrameEvent>> frame_events, |
- scoped_ptr<std::vector<media::cast::PacketEvent>> packet_events) { |
- if (frame_events->empty() && packet_events->empty()) |
- return; |
- Send(new CastMsg_RawEvents(channel_id, *packet_events, *frame_events)); |
-} |
- |
void CastTransportHostFilter::SendRtt(int32_t channel_id, |
uint32_t ssrc, |
base::TimeDelta rtt) { |
@@ -100,24 +124,19 @@ void CastTransportHostFilter::OnNew(int32_t channel_id, |
id_map_.Remove(channel_id); |
} |
+ scoped_ptr<media::cast::UdpTransport> udp_transport( |
+ new media::cast::UdpTransport( |
+ g_browser_process->net_log(), base::ThreadTaskRunnerHandle::Get(), |
+ local_end_point, remote_end_point, |
+ base::Bind(&CastTransportHostFilter::OnStatusChanged, |
+ weak_factory_.GetWeakPtr(), channel_id))); |
+ udp_transport->SetUdpOptions(options); |
scoped_ptr<media::cast::CastTransportSender> sender = |
media::cast::CastTransportSender::Create( |
- g_browser_process->net_log(), |
- &clock_, |
- local_end_point, |
- remote_end_point, |
- make_scoped_ptr(options.DeepCopy()), |
- base::Bind(&CastTransportHostFilter::NotifyStatusChange, |
- weak_factory_.GetWeakPtr(), |
- channel_id), |
- base::Bind(&CastTransportHostFilter::SendRawEvents, |
- weak_factory_.GetWeakPtr(), |
- channel_id), |
- base::TimeDelta::FromSeconds(kSendRawEventsIntervalSecs), |
- base::Bind(&CastTransportHostFilter::ReceivedPacket, |
- weak_factory_.GetWeakPtr(), |
- channel_id), |
- base::ThreadTaskRunnerHandle::Get()); |
+ &clock_, base::TimeDelta::FromSeconds(kSendRawEventsIntervalSecs), |
+ make_scoped_ptr(new TransportClient(channel_id, this)), |
+ std::move(udp_transport), base::ThreadTaskRunnerHandle::Get()); |
+ sender->SetOptions(options); |
id_map_.AddWithID(sender.release(), channel_id); |
} |
@@ -264,5 +283,4 @@ void CastTransportHostFilter::OnSendRtcpFromRtpReceiver( |
} |
} |
- |
} // namespace cast |