Cast: Refactor RTCP handling

chrome/browser/media/cast_transport_host_filter_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/callback.h"
 #include "base/message_loop/message_loop.h"
 #include "base/time/default_tick_clock.h"
 #include "chrome/browser/media/cast_transport_host_filter.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "media/cast/logging/logging_defines.h"
@@ skipping 66 matching lines @@
 }
 
 TEST_F(CastTransportHostFilterTest, SimpleMessages) {
   // Create a cast transport sender.
   const int32 kChannelId = 42;
   CastHostMsg_New new_msg(kChannelId, receive_endpoint_);
   FakeSend(new_msg);
 
   media::cast::CastTransportRtpConfig audio_config;
   audio_config.stored_frames = 10;
+  audio_config.ssrc = 1;
+  audio_config.feedback_ssrc = 2;
   CastHostMsg_InitializeAudio init_audio_msg(kChannelId, audio_config);
   FakeSend(init_audio_msg);
 
   media::cast::CastTransportRtpConfig video_config;
   video_config.stored_frames = 10;
+  video_config.ssrc = 11;
+  video_config.feedback_ssrc = 12;
   CastHostMsg_InitializeVideo init_video_msg(kChannelId, video_config);
   FakeSend(init_video_msg);
 
   media::cast::EncodedFrame audio_frame;
   audio_frame.dependency = media::cast::EncodedFrame::KEY;
   audio_frame.frame_id = 1;
   audio_frame.referenced_frame_id = 1;
   audio_frame.rtp_timestamp = 47;
   const int kSamples = 47;
   const int kBytesPerSample = 2;
   const int kChannels = 2;
   audio_frame.data = std::string(kSamples * kBytesPerSample * kChannels, 'q');
   CastHostMsg_InsertCodedAudioFrame insert_coded_audio_frame(
       kChannelId, audio_frame);
   FakeSend(insert_coded_audio_frame);
 
   media::cast::EncodedFrame video_frame;
   video_frame.dependency = media::cast::EncodedFrame::KEY;
   video_frame.frame_id = 1;
   video_frame.referenced_frame_id = 1;
   // Let's make sure we try a few kb so multiple packets
   // are generated.
   const int kVideoDataSize = 4711;
   video_frame.data = std::string(kVideoDataSize, 'p');
   CastHostMsg_InsertCodedVideoFrame insert_coded_video_frame(
       kChannelId, video_frame);
   FakeSend(insert_coded_video_frame);
 
-  media::cast::SendRtcpFromRtpSenderData rtcp_data;
-  rtcp_data.packet_type_flags = 0;
-  rtcp_data.sending_ssrc = 0;
-  rtcp_data.c_name = "FNRD";
-  media::cast::RtcpDlrrReportBlock dlrr;
-  dlrr.last_rr = 7;
-  dlrr.delay_since_last_rr = 8;
-  CastHostMsg_SendRtcpFromRtpSender rtcp_msg(
-      kChannelId, rtcp_data, dlrr);
+  CastHostMsg_SendSenderReport rtcp_msg(
+      kChannelId, 1, base::TimeTicks(), 2);
   FakeSend(rtcp_msg);
 
   media::cast::MissingFramesAndPacketsMap missing_packets;
   missing_packets[1].insert(4);
   missing_packets[1].insert(7);
   CastHostMsg_ResendPackets resend_msg(
       kChannelId, false, missing_packets, true, base::TimeDelta());
   FakeSend(resend_msg);
 
   CastHostMsg_Delete delete_msg(kChannelId);
   FakeSend(delete_msg);
 }
 
 }  // namespace