Cast: Deduplicate event types in cast library.

media/cast/transport/pacing/paced_sender.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/transport/pacing/paced_sender.h"
 
 #include "base/big_endian.h"
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 
 namespace media {
 namespace cast {
 namespace transport {
 
 namespace {
 
 static const int64 kPacingIntervalMs = 10;
 // Each frame will be split into no more than kPacingMaxBurstsPerFrame
 // bursts of packets.
 static const size_t kPacingMaxBurstsPerFrame = 3;
 static const size_t kTargetBurstSize = 10;
 static const size_t kMaxBurstSize = 20;
 
-using media::cast::CastLoggingEvent;
-
-CastLoggingEvent GetLoggingEvent(bool is_audio, bool retransmit) {
-  if (retransmit) {
-    return is_audio ? media::cast::kAudioPacketRetransmitted
-                    : media::cast::kVideoPacketRetransmitted;
-  } else {
-    return is_audio ? media::cast::kAudioPacketSentToNetwork
-                    : media::cast::kVideoPacketSentToNetwork;
-  }
-}
-
 }  // namespace
 
-
+// static
 PacketKey PacedPacketSender::MakePacketKey(const base::TimeTicks& ticks,
                                            uint32 ssrc,
                                            uint16 packet_id) {
   return std::make_pair(ticks, std::make_pair(ssrc, packet_id));
 }
 
 PacedSender::PacedSender(
     base::TickClock* clock,
     LoggingImpl* logging,
     PacketSender* transport,
@@ skipping 176 matching lines @@
   bool is_audio;
   if (ssrc == audio_ssrc_) {
     is_audio = true;
   } else if (ssrc == video_ssrc_) {
     is_audio = false;
   } else {
     DVLOG(3) << "Got unknown ssrc " << ssrc << " when logging packet event";
     return;
   }
 
-  CastLoggingEvent event = GetLoggingEvent(is_audio, retransmit);
-
-  logging_->InsertSinglePacketEvent(clock_->NowTicks(), event, packet);
+  CastLoggingEvent event = retransmit ?
+      PACKET_RETRANSMITTED : PACKET_SENT_TO_NETWORK;
+  EventMediaType media_type = is_audio ? AUDIO_EVENT : VIDEO_EVENT;
+  logging_->InsertSinglePacketEvent(clock_->NowTicks(), event, media_type,
+      packet);
 }
 
 }  // namespace transport
 }  // namespace cast
 }  // namespace media