Cast: Deduplicate event types in cast library.

- Remove k{Audio,Video}XXX event types and add in kXXX event types to
be shared between audio and video.
- Changed RTCP event mapping to accept both k{A,V}XXX and kXXX event
type encodings from the receiver. Old encodings get mapped to the
unified types on sender side.
- Changed reciever reference implementation to always send new unified
event types.
- Changed LoggingImpl::Insert{Frame,Packet}Event calls to take
additional EventMediaType argument.
- Added a param in RTCP to indicate whether receiver events
from incoming ssrc are audio or video events.
- Remove generic event types.
- Remove other unused events
-- kVideoFrameSentToEncoder
-- k{AV}PacketSentToPacer
-- kDuplicate{AV}PacketReceived


BUG=365829

Review URL: https://codereview.chromium.org/270493003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269473 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 24 insertions, 43 deletions

diff --git a/media/cast/logging/logging_defines.h b/media/cast/logging/logging_defines.h
index f1d5c81..2af95d6 100644
--- a/media/cast/logging/logging_defines.h
+++ b/media/cast/logging/logging_defines.h
@@ -19,50 +19,28 @@ static const uint32 kFrameIdUnknown = 0xFFFFFFFF;
 typedef uint32 RtpTimestamp;
 
 enum CastLoggingEvent {
-  kUnknown,
-  // Generic events. These are no longer used.
-  kRttMs,
-  kPacketLoss,
-  kJitterMs,
-  kVideoAckReceived,  // Sender side frame event.
-  kRembBitrate,       // Generic event. No longer used.
+  UNKNOWN,
+  // Sender side frame events.
+  FRAME_CAPTURE_BEGIN,
+  FRAME_CAPTURE_END,
+  FRAME_ENCODED,
+  FRAME_ACK_RECEIVED,
   // Receiver side frame events.
-  kAudioAckSent,
-  kVideoAckSent,
-  // Audio sender.
-  kAudioFrameCaptureBegin,
-  kAudioFrameCaptureEnd,
-  kAudioFrameEncoded,
-  // Audio receiver.
-  kAudioFrameDecoded,
-  kAudioPlayoutDelay,
-  // Video sender.
-  kVideoFrameCaptureBegin,
-  kVideoFrameCaptureEnd,
-  kVideoFrameSentToEncoder,  // Deprecated
-  kVideoFrameEncoded,
-  // Video receiver.
-  kVideoFrameDecoded,
-  kVideoRenderDelay,
-  // Send-side packet events.
-  kAudioPacketSentToNetwork,
-  kVideoPacketSentToNetwork,
-  kAudioPacketRetransmitted,
-  kVideoPacketRetransmitted,
-  // Receive-side packet events.
-  kAudioPacketReceived,
-  kVideoPacketReceived,
-  kDuplicateAudioPacketReceived,
-  kDuplicateVideoPacketReceived,
-  kNumOfLoggingEvents = kDuplicateVideoPacketReceived
+  FRAME_ACK_SENT,
+  FRAME_DECODED,
+  FRAME_PLAYOUT,
+  // Sender side packet events.
+  PACKET_SENT_TO_NETWORK,
+  PACKET_RETRANSMITTED,
+  // Receiver side packet events.
+  PACKET_RECEIVED,
+  kNumOfLoggingEvents = PACKET_RECEIVED
 };
 
 const char* CastLoggingToString(CastLoggingEvent event);
 
 // CastLoggingEvent are classified into one of three following types.
-enum EventMediaType { AUDIO_EVENT, VIDEO_EVENT, OTHER_EVENT };
-
-EventMediaType GetEventMediaType(CastLoggingEvent event);
+enum EventMediaType { AUDIO_EVENT, VIDEO_EVENT, UNKNOWN_EVENT };
 
 struct FrameEvent {
   FrameEvent();
@@ -70,7 +48,8 @@ struct FrameEvent {
 
   RtpTimestamp rtp_timestamp;
   uint32 frame_id;
-  // Size of encoded frame. Only set for kVideoFrameEncoded event.
+
+  // Size of encoded frame. Only set for FRAME_ENCODED event.
   size_t size;
 
   // Time of event logged.
@@ -78,15 +57,16 @@ struct FrameEvent {
 
   CastLoggingEvent type;
 
-  // Render / playout delay. Only set for kAudioPlayoutDelay and
-  // kVideoRenderDelay events.
+  EventMediaType media_type;
+
+  // Render / playout delay. Only set for FRAME_PLAYOUT events.
   base::TimeDelta delay_delta;
 
-  // Whether the frame is a key frame. Only set for kVideoFrameEncoded event.
+  // Whether the frame is a key frame. Only set for video FRAME_ENCODED event.
   bool key_frame;
 
   // The requested target bitrate of the encoder at the time the frame is
-  // encoded. Only set for kVideoFrameEncoded event.
+  // encoded. Only set for video FRAME_ENCODED event.
   int target_bitrate;
 };
 
@@ -103,6 +83,7 @@ struct PacketEvent {
   // Time of event logged.
   base::TimeTicks timestamp;
   CastLoggingEvent type;
+  EventMediaType media_type;
 };
 
 }  // namespace cast