Cast: merge InsertCoded{Audio,Video}Frame into InsertFrame

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 60d7c1626f33683389407af64259fe71cc91179f..135d87c5de19878657580dc6be04278344e09942 100644
--- a/chrome/browser/media/cast_transport_host_filter.cc
+++ b/chrome/browser/media/cast_transport_host_filter.cc
@@ -31,10 +31,7 @@ bool CastTransportHostFilter::OnMessageReceived(const IPC::Message& message) {
     IPC_MESSAGE_HANDLER(CastHostMsg_Delete, OnDelete)
     IPC_MESSAGE_HANDLER(CastHostMsg_InitializeAudio, OnInitializeAudio)
     IPC_MESSAGE_HANDLER(CastHostMsg_InitializeVideo, OnInitializeVideo)
-    IPC_MESSAGE_HANDLER(CastHostMsg_InsertCodedAudioFrame,
-                        OnInsertCodedAudioFrame)
-    IPC_MESSAGE_HANDLER(CastHostMsg_InsertCodedVideoFrame,
-                        OnInsertCodedVideoFrame)
+    IPC_MESSAGE_HANDLER(CastHostMsg_InsertFrame, OnInsertFrame)
     IPC_MESSAGE_HANDLER(CastHostMsg_SendSenderReport,
                         OnSendSenderReport)
     IPC_MESSAGE_HANDLER(CastHostMsg_ResendFrameForKickstart,
@@ -172,13 +169,14 @@ void CastTransportHostFilter::OnInitializeVideo(
   }
 }
 
-void CastTransportHostFilter::OnInsertCodedAudioFrame(
+void CastTransportHostFilter::OnInsertFrame(
     int32 channel_id,
-    const media::cast::EncodedFrame& audio_frame) {
+    uint32 ssrc,
+    const media::cast::EncodedFrame& frame) {
   media::cast::CastTransportSender* sender =
       id_map_.Lookup(channel_id);
   if (sender) {
-    sender->InsertCodedAudioFrame(audio_frame);
+    sender->InsertFrame(ssrc, frame);
   } else {
     DVLOG(1)
         << "CastTransportHostFilter::OnInsertCodedAudioFrame "

[miu, 2014/08/28 20:45:29]

s/OnInsertCodedAudioFrame/OnInsertFrame/

[hubbe, 2014/08/28 22:20:56]

Done.

@@ -186,20 +184,6 @@ void CastTransportHostFilter::OnInsertCodedAudioFrame(
   }
 }
 
-void CastTransportHostFilter::OnInsertCodedVideoFrame(
-    int32 channel_id,
-    const media::cast::EncodedFrame& video_frame) {
-  media::cast::CastTransportSender* sender =
-      id_map_.Lookup(channel_id);
-  if (sender) {
-    sender->InsertCodedVideoFrame(video_frame);
-  } else {
-    DVLOG(1)
-        << "CastTransportHostFilter::OnInsertCodedVideoFrame "
-        << "on non-existing channel";
-  }
-}
-
 void CastTransportHostFilter::OnCancelSendingFrames(
     int32 channel_id, uint32 ssrc,
     const std::vector<uint32>& frame_ids) {