Cast: Deduplicate event types in cast library.

media/cast/logging/proto/raw_events.proto

 // Copyright 2014 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.
 
 // Protocol for audio messages.
 
 syntax = "proto2";
 
 option optimize_for = LITE_RUNTIME;
 
 package media.cast.proto;
 
 // Keep in sync with media/cast/logging/logging_defines.h.
 // For compatibility reasons, existing values in this enum must not be changed.
 enum EventType {
   UNKNOWN = 0;
+  
+  // Note: 1-28 are deprecated in favor of unified event types. Do not use.
   // Generic events. No longer used.
   RTT_MS = 1;
   PACKET_LOSS = 2;
   JITTER_MS = 3;
   VIDEO_ACK_RECEIVED = 4;  // Sender side frame event.
   REMB_BITRATE = 5;        // Generic event. No longer used.
   // Audio receiver.
   AUDIO_ACK_SENT = 6;
   // Video receiver.
   VIDEO_ACK_SENT = 7;
@@ skipping 17 matching lines @@
   // VIDEO_PACKET_SENT_TO_PACER = 20;  // Deprecated
   AUDIO_PACKET_SENT_TO_NETWORK = 21;
   VIDEO_PACKET_SENT_TO_NETWORK = 22;
   AUDIO_PACKET_RETRANSMITTED = 23;
   VIDEO_PACKET_RETRANSMITTED = 24;
   // Receiver-side packet events.
   AUDIO_PACKET_RECEIVED = 25;
   VIDEO_PACKET_RECEIVED = 26;
   DUPLICATE_AUDIO_PACKET_RECEIVED = 27;
   DUPLICATE_VIDEO_PACKET_RECEIVED = 28;
+  
+  
+  // New, unified event types.
+  FRAME_CAPTURE_BEGIN = 29;
+  FRAME_CAPTURE_END = 30;
+  FRAME_ENCODED = 31;
+  FRAME_ACK_RECEIVED = 32;
+  FRAME_ACK_SENT = 33;
+  FRAME_DECODED = 34;
+  FRAME_PLAYOUT = 35;
+  PACKET_SENT_TO_NETWORK = 36;
+  PACKET_RETRANSMITTED = 37;
+  PACKET_RECEIVED = 38;
 }
 
 // Each log will contain one |LogMetadata|.
 message LogMetadata {
   // |true| if the events are related to audio. |false| if they are related to
   // video.
   optional bool is_audio = 1;
 
   // Used as a reference for all event entries.
   // i.e. the original RTP timestamp for each event will be
@@ skipping 15 matching lines @@
 message AggregatedFrameEvent {
   optional uint32 relative_rtp_timestamp = 1;
 
   repeated EventType event_type = 2 [packed = true];
   
   // The internal timestamp value in milliseconds. Use
   // LogMetadata.reference_timestamp_ms_at_unix_epoch to relate to a real time
   // and date.
   repeated int64 event_timestamp_ms = 3 [packed = true];
 
-  // Only set if there is a kAudioFrameEncoded and kVideoFrameEncoded event.
+  // Only set if there is a frame encoded event.
   optional int32 encoded_frame_size = 4;
 
-  // Only set if there is a kAudioPlayoutDelay or kVideoRenderDelay event.
+  // Only set if there is a frame playout event.
   optional int32 delay_millis = 5;
 
-  // Only set if there is a kVideoFrameEncoded event.
+  // Only set if there is a video frame encoded event.
   optional bool key_frame = 6;
   
-  // Only set if there is a kVideoFrameEncoded event.
+  // Only set if there is a video frame encoded event.
   optional int32 target_bitrate = 7;
 };
 
 message BasePacketEvent {
   optional int32 packet_id = 1;
   repeated EventType event_type = 2 [packed = true];
   
   // The internal timestamp value in milliseconds. Use
   // LogMetadata.reference_timestamp_ms_at_unix_epoch to relate to a real time
   // and date.
   repeated int64 event_timestamp_ms = 3 [packed = true];
 
   // Size of the packet.
   optional int32 size = 4;
 }
 
 message AggregatedPacketEvent {
   optional uint32 relative_rtp_timestamp = 1;
   repeated BasePacketEvent base_packet_event = 2;
 };