Cast: Deduplicate event types in cast library.

media/cast/logging/logging_defines.cc

Index: media/cast/logging/logging_defines.cc
diff --git a/media/cast/logging/logging_defines.cc b/media/cast/logging/logging_defines.cc
index bcb9c376b24fe270e7e185e2a4c973ed947999ca..d0dd5c8e5782a0f16682820783263b5acc1ec5b2 100644
--- a/media/cast/logging/logging_defines.cc
+++ b/media/cast/logging/logging_defines.cc
@@ -7,7 +7,7 @@
 #include "base/logging.h"
 
 #define ENUM_TO_STRING(enum) \
-  case k##enum:              \
+  case enum:                 \
     return #enum
 
 namespace media {
@@ -15,80 +15,25 @@ namespace cast {
 
 const char* CastLoggingToString(CastLoggingEvent event) {
   switch (event) {
-    // Can happen if the sender and receiver of RTCP log messages are not
-    // aligned.
-    ENUM_TO_STRING(Unknown);
-    ENUM_TO_STRING(RttMs);
-    ENUM_TO_STRING(PacketLoss);
-    ENUM_TO_STRING(JitterMs);
-    ENUM_TO_STRING(VideoAckReceived);
-    ENUM_TO_STRING(RembBitrate);
-    ENUM_TO_STRING(AudioAckSent);
-    ENUM_TO_STRING(VideoAckSent);
-    ENUM_TO_STRING(AudioFrameCaptureBegin);
-    ENUM_TO_STRING(AudioFrameCaptureEnd);
-    ENUM_TO_STRING(AudioFrameEncoded);
-    ENUM_TO_STRING(AudioPlayoutDelay);
-    ENUM_TO_STRING(AudioFrameDecoded);
-    ENUM_TO_STRING(VideoFrameCaptureBegin);
-    ENUM_TO_STRING(VideoFrameCaptureEnd);
-    ENUM_TO_STRING(VideoFrameSentToEncoder);
-    ENUM_TO_STRING(VideoFrameEncoded);
-    ENUM_TO_STRING(VideoFrameDecoded);
-    ENUM_TO_STRING(VideoRenderDelay);
-    ENUM_TO_STRING(AudioPacketSentToNetwork);
-    ENUM_TO_STRING(VideoPacketSentToNetwork);
-    ENUM_TO_STRING(AudioPacketRetransmitted);
-    ENUM_TO_STRING(VideoPacketRetransmitted);
-    ENUM_TO_STRING(AudioPacketReceived);
-    ENUM_TO_STRING(VideoPacketReceived);
-    ENUM_TO_STRING(DuplicateAudioPacketReceived);
-    ENUM_TO_STRING(DuplicateVideoPacketReceived);
+    ENUM_TO_STRING(UNKNOWN);
+    ENUM_TO_STRING(FRAME_CAPTURE_BEGIN);
+    ENUM_TO_STRING(FRAME_CAPTURE_END);
+    ENUM_TO_STRING(FRAME_ENCODED);
+    ENUM_TO_STRING(FRAME_ACK_RECEIVED);
+    ENUM_TO_STRING(FRAME_ACK_SENT);
+    ENUM_TO_STRING(FRAME_DECODED);
+    ENUM_TO_STRING(FRAME_PLAYOUT);
+    ENUM_TO_STRING(PACKET_SENT_TO_NETWORK);
+    ENUM_TO_STRING(PACKET_RETRANSMITTED);
+    ENUM_TO_STRING(PACKET_RECEIVED);
   }
   NOTREACHED();
   return "";
 }
 
-EventMediaType GetEventMediaType(CastLoggingEvent event) {
-  switch (event) {
-    case kUnknown:
-    case kRttMs:
-    case kPacketLoss:
-    case kJitterMs:
-    case kRembBitrate:
-      return OTHER_EVENT;
-    case kAudioAckSent:
-    case kAudioFrameCaptureBegin:
-    case kAudioFrameCaptureEnd:
-    case kAudioFrameEncoded:
-    case kAudioPlayoutDelay:
-    case kAudioFrameDecoded:
-    case kAudioPacketSentToNetwork:
-    case kAudioPacketRetransmitted:
-    case kAudioPacketReceived:
-    case kDuplicateAudioPacketReceived:
-      return AUDIO_EVENT;
-    case kVideoAckReceived:
-    case kVideoAckSent:
-    case kVideoFrameCaptureBegin:
-    case kVideoFrameCaptureEnd:
-    case kVideoFrameSentToEncoder:
-    case kVideoFrameEncoded:
-    case kVideoFrameDecoded:
-    case kVideoRenderDelay:
-    case kVideoPacketSentToNetwork:
-    case kVideoPacketRetransmitted:
-    case kVideoPacketReceived:
-    case kDuplicateVideoPacketReceived:
-      return VIDEO_EVENT;
-  }
-  NOTREACHED();
-  return OTHER_EVENT;
-}
-
 FrameEvent::FrameEvent()
-    : rtp_timestamp(0u), frame_id(kFrameIdUnknown), size(0u), type(kUnknown),
-      key_frame(false), target_bitrate(0) {}
+    : rtp_timestamp(0u), frame_id(kFrameIdUnknown), size(0u), type(UNKNOWN),
+      media_type(UNKNOWN_EVENT), key_frame(false), target_bitrate(0) {}
 FrameEvent::~FrameEvent() {}
 
 PacketEvent::PacketEvent()
@@ -97,7 +42,8 @@ PacketEvent::PacketEvent()
       max_packet_id(0),
       packet_id(0),
       size(0),
-      type(kUnknown) {}
+      type(UNKNOWN),
+      media_type(UNKNOWN_EVENT) {}
 PacketEvent::~PacketEvent() {}
 
 }  // namespace cast