Cast: Deduplicate event types in cast library.

media/cast/rtcp/rtcp_receiver.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_receiver.h"
 
 #include "base/logging.h"
 #include "media/cast/rtcp/rtcp_utility.h"
 #include "media/cast/transport/cast_transport_defines.h"
 
 namespace {
 
-bool IsRtcpPacketEvent(media::cast::CastLoggingEvent event_type) {
-  return event_type == media::cast::kAudioPacketReceived ||
-         event_type == media::cast::kVideoPacketReceived ||
-         event_type == media::cast::kDuplicateAudioPacketReceived ||
-         event_type == media::cast::kDuplicateVideoPacketReceived;
-}
-
 media::cast::transport::RtcpSenderFrameStatus
 TranslateToFrameStatusFromWireFormat(uint8 status) {
   switch (status) {
     case 0:
       return media::cast::transport::kRtcpSenderFrameStatusUnknown;
     case 1:
       return media::cast::transport::kRtcpSenderFrameStatusDroppedByEncoder;
     case 2:
       return media::cast::transport::kRtcpSenderFrameStatusDroppedByFlowControl;
     case 3:
@@ skipping 442 matching lines @@
 }
 
 void RtcpReceiver::HandleApplicationSpecificCastReceiverEventLog(
     uint32 frame_rtp_timestamp,
     RtcpParser* rtcp_parser,
     RtcpReceiverEventLogMessages* event_log_messages) {
   const RtcpField& rtcp_field = rtcp_parser->Field();
 
   const uint8 event = rtcp_field.cast_receiver_log.event;
   const CastLoggingEvent event_type = TranslateToLogEventFromWireFormat(event);
-  uint16 packet_id = IsRtcpPacketEvent(event_type) ?
+  uint16 packet_id = event_type == PACKET_RECEIVED ?
       rtcp_field.cast_receiver_log.delay_delta_or_packet_id.packet_id : 0;
   const base::TimeTicks event_timestamp =
       base::TimeTicks() +
       base::TimeDelta::FromMilliseconds(
           rtcp_field.cast_receiver_log.event_timestamp_base +
           rtcp_field.cast_receiver_log.event_timestamp_delta);
 
   // The following code checks to see if we have already seen this event.
   // The algorithm works by maintaining a sliding window of events. We have
   // a queue and a set of events. We enqueue every new event and insert it
@@ skipping 122 matching lines @@
 void RtcpReceiver::HandleFIRItem(const RtcpField* rtcp_field) {
   // Is it our sender that is requested to generate a new keyframe.
   if (ssrc_ != rtcp_field->fir_item.ssrc)
     return;
 
   VLOG(2) << "Cast RTCP received FIR on our SSRC " << ssrc_;
 }
 
 }  // namespace cast
 }  // namespace media