Cast: Deduplicate event types in cast library.

media/cast/logging/logging_raw.h

Index: media/cast/logging/logging_raw.h
diff --git a/media/cast/logging/logging_raw.h b/media/cast/logging/logging_raw.h
index 98c2bfe741a184b97606caefead304bd4de7c39b..8ed4a5996024f3af1f30d091da033b22d47d0537 100644
--- a/media/cast/logging/logging_raw.h
+++ b/media/cast/logging/logging_raw.h
@@ -27,31 +27,34 @@ class LoggingRaw : public base::NonThreadSafe {
   // Inform of new event: two types of events: frame and packet.
   // Frame events can be inserted with different parameters.
   void InsertFrameEvent(const base::TimeTicks& time_of_event,
-                        CastLoggingEvent event, uint32 rtp_timestamp,
-                        uint32 frame_id);
+                        CastLoggingEvent event, EventMediaType event_media_type,
+                        uint32 rtp_timestamp, uint32 frame_id);
 
-  // This function is only applicable for the following frame events:
-  // kAudioFrameEncoded, kVideoFrameEncoded
+  // This function is only applicable for FRAME_ENCODED event.
   // |size| - Size of encoded frame.
   // |key_frame| - Whether the frame is a key frame. This field is only
-  //               applicable for kVideoFrameEncoded event.
+  //               applicable for video event.
   // |target_bitrate| - The target bitrate of the encoder the time the frame
-  // was encoded. Only applicable for kVideoFrameEncoded event.
+  // was encoded. Only applicable for video event.
   void InsertEncodedFrameEvent(const base::TimeTicks& time_of_event,
-                                CastLoggingEvent event, uint32 rtp_timestamp,
-                                uint32 frame_id, int size, bool key_frame,
+                                CastLoggingEvent event,
+                                EventMediaType event_media_type,
+                                uint32 rtp_timestamp, uint32 frame_id,
+                                int size, bool key_frame,
                                 int target_bitrate);
 
   // Render/playout delay
-  // This function is only applicable for the following frame events:
-  // kAudioPlayoutDelay, kVideoRenderDelay
+  // This function is only applicable for FRAME_PLAYOUT event.
   void InsertFrameEventWithDelay(const base::TimeTicks& time_of_event,
-                                 CastLoggingEvent event, uint32 rtp_timestamp,
+                                 CastLoggingEvent event,
+                                 EventMediaType event_media_type,
+                                 uint32 rtp_timestamp,
                                  uint32 frame_id, base::TimeDelta delay);
 
   // Insert a packet event.
   void InsertPacketEvent(const base::TimeTicks& time_of_event,
-                         CastLoggingEvent event, uint32 rtp_timestamp,
+                         CastLoggingEvent event,
+                         EventMediaType event_media_type, uint32 rtp_timestamp,
                          uint32 frame_id, uint16 packet_id,
                          uint16 max_packet_id, size_t size);
 
@@ -68,9 +71,11 @@ class LoggingRaw : public base::NonThreadSafe {
 
  private:
   void InsertBaseFrameEvent(const base::TimeTicks& time_of_event,
-                            CastLoggingEvent event, uint32 frame_id,
-                            uint32 rtp_timestamp, base::TimeDelta delay,
-                            int size, bool key_frame, int target_bitrate);
+                            CastLoggingEvent event,
+                            EventMediaType event_media_type,
+                            uint32 frame_id, uint32 rtp_timestamp,
+                            base::TimeDelta delay, int size, bool key_frame,
+                            int target_bitrate);
 
   // List of subscriber pointers. This class does not own the subscribers.
   std::vector<RawEventSubscriber*> subscribers_;