Cast: Move retransmission to the transport

chrome/browser/media/cast_transport_host_filter.cc

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 0d8309a268ddcaf2c66f615453e48c0566565d11..ca40aa28152bbc01ed046d122c66387cad734709 100644
--- a/chrome/browser/media/cast_transport_host_filter.cc
+++ b/chrome/browser/media/cast_transport_host_filter.cc
@@ -36,8 +36,10 @@ bool CastTransportHostFilter::OnMessageReceived(const IPC::Message& message) {
                         OnInsertCodedVideoFrame)
     IPC_MESSAGE_HANDLER(CastHostMsg_SendSenderReport,
                         OnSendSenderReport)
-    IPC_MESSAGE_HANDLER(CastHostMsg_ResendPackets,
-                        OnResendPackets)
+    IPC_MESSAGE_HANDLER(CastHostMsg_ResendFrameForKickstart,
+                        OnResendFrameForKickstart)
+    IPC_MESSAGE_HANDLER(CastHostMsg_CancelSendingFrames,
+                        OnCancelSendingFrames)
     IPC_MESSAGE_UNHANDLED(handled = false);
   IPC_END_MESSAGE_MAP();
   return handled;
@@ -182,38 +184,48 @@ void CastTransportHostFilter::OnInsertCodedVideoFrame(
   }
 }
 
-void CastTransportHostFilter::OnSendSenderReport(
-    int32 channel_id,
-    uint32 ssrc,
-    base::TimeTicks current_time,
-    uint32 current_time_as_rtp_timestamp) {
+void CastTransportHostFilter::OnCancelSendingFrames(
+    int32 channel_id, uint32 ssrc,
+    const std::set<uint32>& frame_ids) {
   media::cast::CastTransportSender* sender =
       id_map_.Lookup(channel_id);
   if (sender) {
-    sender->SendSenderReport(ssrc,
-                             current_time,
-                             current_time_as_rtp_timestamp);
+    sender->CancelSendingFrames(ssrc, frame_ids);
   } else {
     DVLOG(1)
-        << "CastTransportHostFilter::OnSendSenderReport "
+        << "CastTransportHostFilter::OnCancelSendingFrames "
         << "on non-existing channel";
   }
 }
 
-void CastTransportHostFilter::OnResendPackets(
+void CastTransportHostFilter::OnResendFrameForKickstart(
+    int32 channel_id, uint32 ssrc, uint32 frame_id) {
+  media::cast::CastTransportSender* sender =
+      id_map_.Lookup(channel_id);
+  if (sender) {
+    sender->ResendFrameForKickstart(ssrc, frame_id);
+  } else {
+    DVLOG(1)
+        << "CastTransportHostFilter::OnResendFrameForKickstart "
+        << "on non-existing channel";
+  }
+}
+
+void CastTransportHostFilter::OnSendSenderReport(
     int32 channel_id,
-    bool is_audio,
-    const media::cast::MissingFramesAndPacketsMap& missing_packets,
-    bool cancel_rtx_if_not_in_list,
-    base::TimeDelta dedupe_window) {
+    uint32 ssrc,
+    base::TimeTicks current_time,
+    uint32 current_time_as_rtp_timestamp) {
   media::cast::CastTransportSender* sender =
       id_map_.Lookup(channel_id);
   if (sender) {
-    sender->ResendPackets(
-        is_audio, missing_packets, cancel_rtx_if_not_in_list, dedupe_window);
+    sender->SendSenderReport(ssrc,
+                             current_time,
+                             current_time_as_rtp_timestamp);
   } else {
     DVLOG(1)
-        << "CastTransportHostFilter::OnResendPackets on non-existing channel";
+        << "CastTransportHostFilter::OnSendSenderReport "
+        << "on non-existing channel";
   }
 }