Cast: Simplify code path for RTCP sender report

media/cast/transport/cast_transport_sender_impl.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 "media/cast/transport/cast_transport_sender_impl.h"
 
 #include "base/single_thread_task_runner.h"
 #include "media/cast/transport/cast_transport_config.h"
 #include "media/cast/transport/cast_transport_defines.h"
 
@@ skipping 97 matching lines @@
 
 void CastTransportSenderImpl::InsertCodedVideoFrame(
     const EncodedVideoFrame* video_frame,
     const base::TimeTicks& capture_time) {
   DCHECK(video_sender_) << "Video sender uninitialized";
   video_sender_->InsertCodedVideoFrame(video_frame, capture_time);
 }
 
 void CastTransportSenderImpl::SendRtcpFromRtpSender(
     uint32 packet_type_flags,
-    const RtcpSenderInfo& sender_info,
+    uint32 ntp_seconds,
+    uint32 ntp_fraction,
+    uint32 rtp_timestamp,
     const RtcpDlrrReportBlock& dlrr,
     uint32 sending_ssrc,
     const std::string& c_name) {
+  RtcpSenderInfo sender_info;
+  sender_info.ntp_seconds = ntp_seconds;
+  sender_info.ntp_fraction = ntp_fraction;
+  sender_info.rtp_timestamp = rtp_timestamp;
+  if (audio_sender_ && audio_sender_->ssrc() == sending_ssrc) {
+    sender_info.send_packet_count = audio_sender_->send_packet_count();
+    sender_info.send_octet_count = audio_sender_->send_octet_count();
+  } else if (video_sender_ && video_sender_->ssrc() == sending_ssrc) {
+    sender_info.send_packet_count = video_sender_->send_packet_count();
+    sender_info.send_octet_count = video_sender_->send_octet_count();
+  } else {
+    LOG(ERROR) << "Sending RTCP with an invalid SSRC.";
+    return;
+  }
   rtcp_builder_.SendRtcpFromRtpSender(
       packet_type_flags, sender_info, dlrr, sending_ssrc, c_name);
 }
 
 void CastTransportSenderImpl::ResendPackets(
     bool is_audio,
     const MissingFramesAndPacketsMap& missing_packets) {
   if (is_audio) {
     DCHECK(audio_sender_) << "Audio sender uninitialized";
     audio_sender_->ResendPackets(missing_packets);
   } else {
     DCHECK(video_sender_) << "Video sender uninitialized";
     video_sender_->ResendPackets(missing_packets);
   }
 }
 
-void CastTransportSenderImpl::SubscribeAudioRtpStatsCallback(
-    const CastTransportRtpStatistics& callback) {
-  DCHECK(audio_sender_) << "Audio sender uninitialized";
-  audio_sender_->SubscribeAudioRtpStatsCallback(callback);
-}
-
-void CastTransportSenderImpl::SubscribeVideoRtpStatsCallback(
-    const CastTransportRtpStatistics& callback) {
-  DCHECK(video_sender_) << "Video sender uninitialized";
-  video_sender_->SubscribeVideoRtpStatsCallback(callback);
-}
-
 void CastTransportSenderImpl::SendRawEvents() {
   DCHECK(event_subscriber_.get());
   DCHECK(!raw_events_callback_.is_null());
   std::vector<PacketEvent> packet_events;
   event_subscriber_->GetPacketEventsAndReset(&packet_events);
   raw_events_callback_.Run(packet_events);
 }
 
 }  // namespace transport
 }  // namespace cast
 }  // namespace media