| Index: webrtc/logging/rtc_event_log/rtc_event_log.proto
|
| diff --git a/webrtc/logging/rtc_event_log/rtc_event_log.proto b/webrtc/logging/rtc_event_log/rtc_event_log.proto
|
| index e80772297997ce2b088404d8ff83395b71fab4f8..8f654f982bd71dbb11e6c3efdfc2e220d74b21fa 100644
|
| --- a/webrtc/logging/rtc_event_log/rtc_event_log.proto
|
| +++ b/webrtc/logging/rtc_event_log/rtc_event_log.proto
|
| @@ -31,8 +31,8 @@ message Event {
|
| 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;
|
| @@ -52,8 +52,11 @@ message Event {
|
| // 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;
|
| @@ -103,9 +106,9 @@ message AudioPlayoutEvent {
|
| 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) ).
|
| @@ -117,6 +120,20 @@ message BwePacketLossEvent {
|
| 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
|
| @@ -251,4 +268,4 @@ message AudioNetworkAdaptation {
|
|
|
| // Number of audio channels that each encoded packet consists of.
|
| optional uint32 num_channels = 6;
|
| -}
|
| +}
|
|
|