Rename some variables and methods in RTC event log.

webrtc/logging/rtc_event_log/rtc_event_log.proto

 syntax = "proto2";
 option optimize_for = LITE_RUNTIME;
 package webrtc.rtclog;
 
 enum MediaType {
   ANY = 0;
   AUDIO = 1;
   VIDEO = 2;
   DATA = 3;
 }
@@ skipping 13 matching lines @@
   // The different types of events that can occur, the UNKNOWN_EVENT entry
   // is added in case future EventTypes are added, in that case old code will
   // receive the new events as UNKNOWN_EVENT.
   enum EventType {
     UNKNOWN_EVENT = 0;
     LOG_START = 1;
     LOG_END = 2;
     RTP_EVENT = 3;
     RTCP_EVENT = 4;
     AUDIO_PLAYOUT_EVENT = 5;
-    BWE_PACKET_LOSS_EVENT = 6;
-    BWE_PACKET_DELAY_EVENT = 7;
+    LOSS_BASED_BWE_UPDATE = 6;
+    DELAY_BASED_BWE_UPDATE = 7;
     VIDEO_RECEIVER_CONFIG_EVENT = 8;
     VIDEO_SENDER_CONFIG_EVENT = 9;
     AUDIO_RECEIVER_CONFIG_EVENT = 10;
     AUDIO_SENDER_CONFIG_EVENT = 11;
     AUDIO_NETWORK_ADAPTATION_EVENT = 16;
   }
 
   // required - Indicates the type of this event
   optional EventType type = 2;
 
   // optional - but required if type == RTP_EVENT
   optional RtpPacket rtp_packet = 3;
 
   // optional - but required if type == RTCP_EVENT
   optional RtcpPacket rtcp_packet = 4;
 
   // optional - but required if type == AUDIO_PLAYOUT_EVENT
   optional AudioPlayoutEvent audio_playout_event = 5;
 
-  // optional - but required if type == BWE_PACKET_LOSS_EVENT
-  optional BwePacketLossEvent bwe_packet_loss_event = 6;
+  // optional - but required if type == LOSS_BASED_BWE_UPDATE
+  optional LossBasedBweUpdate loss_based_bwe_update = 6;
+
+  // optional - but required if type == DELAY_BASED_BWE_UPDATE
+  optional DelayBasedBweUpdate delay_based_bwe_update = 7;
 
   // optional - but required if type == VIDEO_RECEIVER_CONFIG_EVENT
   optional VideoReceiveConfig video_receiver_config = 8;
 
   // optional - but required if type == VIDEO_SENDER_CONFIG_EVENT
   optional VideoSendConfig video_sender_config = 9;
 
   // optional - but required if type == AUDIO_RECEIVER_CONFIG_EVENT
   optional AudioReceiveConfig audio_receiver_config = 10;
 
@@ skipping 29 matching lines @@
 
   // required - The whole packet including both payload and header.
   optional bytes packet_data = 3;
 }
 
 message AudioPlayoutEvent {
   // required - The SSRC of the audio stream associated with the playout event.
   optional uint32 local_ssrc = 2;
 }
 
-message BwePacketLossEvent {
+message LossBasedBweUpdate {
   // required - Bandwidth estimate (in bps) after the update.
-  optional int32 bitrate = 1;
+  optional int32 bitrate_bps = 1;
 
   // required - Fraction of lost packets since last receiver report
   // computed as floor( 256 * (#lost_packets / #total_packets) ).
   // The possible values range from 0 to 255.
   optional uint32 fraction_loss = 2;
 
   // TODO(terelius): Is this really needed? Remove or make optional?
   // required - Total number of packets that the BWE update is based on.
   optional int32 total_packets = 3;
 }
 
+message DelayBasedBweUpdate {
+  enum DetectorState {
+    BWE_NORMAL = 0;
+    BWE_UNDERUSING = 1;
+    BWE_OVERUSING = 2;
+  }
+
+  // required - Bandwidth estimate (in bps) after the update.
+  optional int32 bitrate_bps = 1;
+
+  // required - The state of the overuse detector.
+  optional DetectorState detector_state = 2;
+}
+
 // TODO(terelius): Video and audio streams could in principle share SSRC,
 // so identifying a stream based only on SSRC might not work.
 // It might be better to use a combination of SSRC and media type
 // or SSRC and port number, but for now we will rely on SSRC only.
 message VideoReceiveConfig {
   // required - Synchronization source (stream identifier) to be received.
   optional uint32 remote_ssrc = 1;
   // required - Sender SSRC used for sending RTCP (such as receiver reports).
   optional uint32 local_ssrc = 2;
 
@@ skipping 114 matching lines @@
   optional float uplink_packet_loss_fraction = 3;
 
   // Whether forward error correction (FEC) is turned on or off.
   optional bool enable_fec = 4;
 
   // Whether discontinuous transmission (DTX) is turned on or off.
   optional bool enable_dtx = 5;
 
   // Number of audio channels that each encoded packet consists of.
   optional uint32 num_channels = 6;
-}
+}