| 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 acdcd053acdc6fe9acee031034d544ecb782c892..253b40692487e8ed5d1555cc8bb4f98277a2f786 100644
|
| --- a/chrome/browser/media/cast_transport_host_filter.cc
|
| +++ b/chrome/browser/media/cast_transport_host_filter.cc
|
| @@ -107,6 +107,11 @@ void CastTransportHostFilter::SendCastMessage(
|
| Send(new CastMsg_RtcpCastMessage(channel_id, ssrc, cast_message));
|
| }
|
|
|
| +void CastTransportHostFilter::SendReceivedPli(int32_t channel_id,
|
| + uint32_t ssrc) {
|
| + Send(new CastMsg_Pli(channel_id, ssrc));
|
| +}
|
| +
|
| void CastTransportHostFilter::OnNew(int32_t channel_id,
|
| const net::IPEndPoint& local_end_point,
|
| const net::IPEndPoint& remote_end_point,
|
| @@ -163,13 +168,12 @@ void CastTransportHostFilter::OnInitializeAudio(
|
| media::cast::CastTransportSender* sender = id_map_.Lookup(channel_id);
|
| if (sender) {
|
| sender->InitializeAudio(
|
| - config,
|
| - base::Bind(&CastTransportHostFilter::SendCastMessage,
|
| - weak_factory_.GetWeakPtr(),
|
| - channel_id, config.ssrc),
|
| + config, base::Bind(&CastTransportHostFilter::SendCastMessage,
|
| + weak_factory_.GetWeakPtr(), channel_id, config.ssrc),
|
| base::Bind(&CastTransportHostFilter::SendRtt,
|
| - weak_factory_.GetWeakPtr(),
|
| - channel_id, config.ssrc));
|
| + weak_factory_.GetWeakPtr(), channel_id, config.ssrc),
|
| + base::Bind(&CastTransportHostFilter::SendReceivedPli,
|
| + weak_factory_.GetWeakPtr(), channel_id, config.ssrc));
|
| } else {
|
| DVLOG(1)
|
| << "CastTransportHostFilter::OnInitializeAudio on non-existing channel";
|
| @@ -182,13 +186,12 @@ void CastTransportHostFilter::OnInitializeVideo(
|
| media::cast::CastTransportSender* sender = id_map_.Lookup(channel_id);
|
| if (sender) {
|
| sender->InitializeVideo(
|
| - config,
|
| - base::Bind(&CastTransportHostFilter::SendCastMessage,
|
| - weak_factory_.GetWeakPtr(),
|
| - channel_id, config.ssrc),
|
| + config, base::Bind(&CastTransportHostFilter::SendCastMessage,
|
| + weak_factory_.GetWeakPtr(), channel_id, config.ssrc),
|
| base::Bind(&CastTransportHostFilter::SendRtt,
|
| - weak_factory_.GetWeakPtr(),
|
| - channel_id, config.ssrc));
|
| + weak_factory_.GetWeakPtr(), channel_id, config.ssrc),
|
| + base::Bind(&CastTransportHostFilter::SendReceivedPli,
|
| + weak_factory_.GetWeakPtr(), channel_id, config.ssrc));
|
| } else {
|
| DVLOG(1)
|
| << "CastTransportHostFilter::OnInitializeVideo on non-existing channel";
|
| @@ -269,13 +272,11 @@ void CastTransportHostFilter::OnSendRtcpFromRtpReceiver(
|
| const media::cast::SendRtcpFromRtpReceiver_Params& params) {
|
| media::cast::CastTransportSender* sender = id_map_.Lookup(channel_id);
|
| if (sender) {
|
| - sender->SendRtcpFromRtpReceiver(params.ssrc,
|
| - params.sender_ssrc,
|
| - params.time_data,
|
| - params.cast_message.get(),
|
| - params.target_delay,
|
| - params.rtcp_events.get(),
|
| - params.rtp_receiver_statistics.get());
|
| + sender->SendRtcpFromRtpReceiver(
|
| + params.ssrc, params.sender_ssrc, params.time_data,
|
| + params.cast_message.get(), params.pli_message.get(),
|
| + params.target_delay, params.rtcp_events.get(),
|
| + params.rtp_receiver_statistics.get());
|
| } else {
|
| DVLOG(1)
|
| << "CastTransportHostFilter::OnSendRtcpFromRtpReceiver "
|
|
|