[Cast] Clean-up: Merge RtpReceiver+AudioReceiver+VideoReceiver-->FrameReceiver.

media/cast/rtcp/rtcp.cc

 // Copyright 2013 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/rtcp/rtcp.h"
 
 #include "base/big_endian.h"
 #include "base/rand_util.h"
 #include "media/cast/cast_config.h"
 #include "media/cast/cast_defines.h"
@@ skipping 61 matching lines @@
   Rtcp* rtcp_;
   scoped_refptr<CastEnvironment> cast_environment_;
 };
 
 Rtcp::Rtcp(scoped_refptr<CastEnvironment> cast_environment,
            RtcpSenderFeedback* sender_feedback,
            transport::CastTransportSender* const transport_sender,
            transport::PacedPacketSender* paced_packet_sender,
            RtpReceiverStatistics* rtp_receiver_statistics, RtcpMode rtcp_mode,
            const base::TimeDelta& rtcp_interval, uint32 local_ssrc,
-           uint32 remote_ssrc, const std::string& c_name, bool is_audio)
+           uint32 remote_ssrc, const std::string& c_name,
+           EventMediaType event_media_type)
     : cast_environment_(cast_environment),
       transport_sender_(transport_sender),
       rtcp_interval_(rtcp_interval),
       rtcp_mode_(rtcp_mode),
       local_ssrc_(local_ssrc),
       remote_ssrc_(remote_ssrc),
       c_name_(c_name),
+      event_media_type_(event_media_type),
       rtp_receiver_statistics_(rtp_receiver_statistics),
       rtt_feedback_(new LocalRtcpRttFeedback(this)),
       receiver_feedback_(new LocalRtcpReceiverFeedback(this, cast_environment)),
       rtcp_sender_(new RtcpSender(cast_environment, paced_packet_sender,
                                   local_ssrc, c_name)),
       last_report_truncated_ntp_(0),
       local_clock_ahead_by_(ClockDriftSmoother::GetDefaultTimeConstant()),
       lip_sync_rtp_timestamp_(0),
       lip_sync_ntp_timestamp_(0),
       min_rtt_(base::TimeDelta::FromMilliseconds(kMaxRttMs)),
-      number_of_rtt_in_avg_(0),
-      is_audio_(is_audio) {
+      number_of_rtt_in_avg_(0) {
   rtcp_receiver_.reset(new RtcpReceiver(cast_environment, sender_feedback,
                                         receiver_feedback_.get(),
                                         rtt_feedback_.get(), local_ssrc));
   rtcp_receiver_->SetRemoteSSRC(remote_ssrc);
 }
 
 Rtcp::~Rtcp() {}
 
 // static
 bool Rtcp::IsRtcpPacket(const uint8* packet, size_t length) {
@@ skipping 275 matching lines @@
   base::TimeDelta time_to_next =
       (rtcp_interval_ / 2) + (rtcp_interval_ * random / 1000);
 
   base::TimeTicks now = cast_environment_->Clock()->NowTicks();
   next_time_to_send_rtcp_ = now + time_to_next;
 }
 
 void Rtcp::OnReceivedReceiverLog(const RtcpReceiverLogMessage& receiver_log) {
   // Add received log messages into our log system.
   RtcpReceiverLogMessage::const_iterator it = receiver_log.begin();
-  EventMediaType media_type = is_audio_ ? AUDIO_EVENT : VIDEO_EVENT;
   for (; it != receiver_log.end(); ++it) {
     uint32 rtp_timestamp = it->rtp_timestamp_;
 
     RtcpReceiverEventLogMessages::const_iterator event_it =
         it->event_log_messages_.begin();
     for (; event_it != it->event_log_messages_.end(); ++event_it) {
       switch (event_it->type) {
         case PACKET_RECEIVED:
           cast_environment_->Logging()->InsertPacketEvent(
               event_it->event_timestamp, event_it->type,
-              media_type, rtp_timestamp,
+              event_media_type_, rtp_timestamp,
               kFrameIdUnknown, event_it->packet_id, 0, 0);
           break;
         case FRAME_ACK_SENT:
         case FRAME_DECODED:
           cast_environment_->Logging()->InsertFrameEvent(
-              event_it->event_timestamp, event_it->type, media_type,
+              event_it->event_timestamp, event_it->type, event_media_type_,
               rtp_timestamp, kFrameIdUnknown);
           break;
         case FRAME_PLAYOUT:
           cast_environment_->Logging()->InsertFrameEventWithDelay(
-              event_it->event_timestamp, event_it->type, media_type,
+              event_it->event_timestamp, event_it->type, event_media_type_,
               rtp_timestamp, kFrameIdUnknown, event_it->delay_delta);
           break;
         default:
           VLOG(2) << "Received log message via RTCP that we did not expect: "
                   << static_cast<int>(event_it->type);
           break;
       }
     }
   }
 }
 
 }  // namespace cast
 }  // namespace media