OLD | NEW |
1 syntax = "proto2"; | 1 syntax = "proto2"; |
2 option optimize_for = LITE_RUNTIME; | 2 option optimize_for = LITE_RUNTIME; |
3 package webrtc.rtclog; | 3 package webrtc.rtclog; |
4 | 4 |
5 enum MediaType { | 5 enum MediaType { |
6 ANY = 0; | 6 ANY = 0; |
7 AUDIO = 1; | 7 AUDIO = 1; |
8 VIDEO = 2; | 8 VIDEO = 2; |
9 DATA = 3; | 9 DATA = 3; |
10 } | 10 } |
(...skipping 13 matching lines...) Expand all Loading... |
24 // The different types of events that can occur, the UNKNOWN_EVENT entry | 24 // The different types of events that can occur, the UNKNOWN_EVENT entry |
25 // is added in case future EventTypes are added, in that case old code will | 25 // is added in case future EventTypes are added, in that case old code will |
26 // receive the new events as UNKNOWN_EVENT. | 26 // receive the new events as UNKNOWN_EVENT. |
27 enum EventType { | 27 enum EventType { |
28 UNKNOWN_EVENT = 0; | 28 UNKNOWN_EVENT = 0; |
29 LOG_START = 1; | 29 LOG_START = 1; |
30 LOG_END = 2; | 30 LOG_END = 2; |
31 RTP_EVENT = 3; | 31 RTP_EVENT = 3; |
32 RTCP_EVENT = 4; | 32 RTCP_EVENT = 4; |
33 AUDIO_PLAYOUT_EVENT = 5; | 33 AUDIO_PLAYOUT_EVENT = 5; |
34 BWE_PACKET_LOSS_EVENT = 6; | 34 LOSS_BASED_BWE_UPDATE = 6; |
35 BWE_PACKET_DELAY_EVENT = 7; | 35 DELAY_BASED_BWE_UPDATE = 7; |
36 VIDEO_RECEIVER_CONFIG_EVENT = 8; | 36 VIDEO_RECEIVER_CONFIG_EVENT = 8; |
37 VIDEO_SENDER_CONFIG_EVENT = 9; | 37 VIDEO_SENDER_CONFIG_EVENT = 9; |
38 AUDIO_RECEIVER_CONFIG_EVENT = 10; | 38 AUDIO_RECEIVER_CONFIG_EVENT = 10; |
39 AUDIO_SENDER_CONFIG_EVENT = 11; | 39 AUDIO_SENDER_CONFIG_EVENT = 11; |
40 AUDIO_NETWORK_ADAPTATION_EVENT = 16; | 40 AUDIO_NETWORK_ADAPTATION_EVENT = 16; |
41 } | 41 } |
42 | 42 |
43 // required - Indicates the type of this event | 43 // required - Indicates the type of this event |
44 optional EventType type = 2; | 44 optional EventType type = 2; |
45 | 45 |
46 // optional - but required if type == RTP_EVENT | 46 // optional - but required if type == RTP_EVENT |
47 optional RtpPacket rtp_packet = 3; | 47 optional RtpPacket rtp_packet = 3; |
48 | 48 |
49 // optional - but required if type == RTCP_EVENT | 49 // optional - but required if type == RTCP_EVENT |
50 optional RtcpPacket rtcp_packet = 4; | 50 optional RtcpPacket rtcp_packet = 4; |
51 | 51 |
52 // optional - but required if type == AUDIO_PLAYOUT_EVENT | 52 // optional - but required if type == AUDIO_PLAYOUT_EVENT |
53 optional AudioPlayoutEvent audio_playout_event = 5; | 53 optional AudioPlayoutEvent audio_playout_event = 5; |
54 | 54 |
55 // optional - but required if type == BWE_PACKET_LOSS_EVENT | 55 // optional - but required if type == LOSS_BASED_BWE_UPDATE |
56 optional BwePacketLossEvent bwe_packet_loss_event = 6; | 56 optional LossBasedBweUpdate loss_based_bwe_update = 6; |
57 | 57 |
58 // optional - but required if type == BWE_PACKET_DELAY_EVENT | 58 // optional - but required if type == DELAY_BASED_BWE_UPDATE |
59 optional BwePacketDelayEvent bwe_packet_delay_event = 7; | 59 optional DelayBasedBweUpdate delay_based_bwe_update = 7; |
60 | 60 |
61 // optional - but required if type == VIDEO_RECEIVER_CONFIG_EVENT | 61 // optional - but required if type == VIDEO_RECEIVER_CONFIG_EVENT |
62 optional VideoReceiveConfig video_receiver_config = 8; | 62 optional VideoReceiveConfig video_receiver_config = 8; |
63 | 63 |
64 // optional - but required if type == VIDEO_SENDER_CONFIG_EVENT | 64 // optional - but required if type == VIDEO_SENDER_CONFIG_EVENT |
65 optional VideoSendConfig video_sender_config = 9; | 65 optional VideoSendConfig video_sender_config = 9; |
66 | 66 |
67 // optional - but required if type == AUDIO_RECEIVER_CONFIG_EVENT | 67 // optional - but required if type == AUDIO_RECEIVER_CONFIG_EVENT |
68 optional AudioReceiveConfig audio_receiver_config = 10; | 68 optional AudioReceiveConfig audio_receiver_config = 10; |
69 | 69 |
(...skipping 29 matching lines...) Expand all Loading... |
99 | 99 |
100 // required - The whole packet including both payload and header. | 100 // required - The whole packet including both payload and header. |
101 optional bytes packet_data = 3; | 101 optional bytes packet_data = 3; |
102 } | 102 } |
103 | 103 |
104 message AudioPlayoutEvent { | 104 message AudioPlayoutEvent { |
105 // required - The SSRC of the audio stream associated with the playout event. | 105 // required - The SSRC of the audio stream associated with the playout event. |
106 optional uint32 local_ssrc = 2; | 106 optional uint32 local_ssrc = 2; |
107 } | 107 } |
108 | 108 |
109 message BwePacketLossEvent { | 109 message LossBasedBweUpdate { |
110 // required - Bandwidth estimate (in bps) after the update. | 110 // required - Bandwidth estimate (in bps) after the update. |
111 optional int32 bitrate = 1; | 111 optional int32 bitrate_bps = 1; |
112 | 112 |
113 // required - Fraction of lost packets since last receiver report | 113 // required - Fraction of lost packets since last receiver report |
114 // computed as floor( 256 * (#lost_packets / #total_packets) ). | 114 // computed as floor( 256 * (#lost_packets / #total_packets) ). |
115 // The possible values range from 0 to 255. | 115 // The possible values range from 0 to 255. |
116 optional uint32 fraction_loss = 2; | 116 optional uint32 fraction_loss = 2; |
117 | 117 |
118 // TODO(terelius): Is this really needed? Remove or make optional? | 118 // TODO(terelius): Is this really needed? Remove or make optional? |
119 // required - Total number of packets that the BWE update is based on. | 119 // required - Total number of packets that the BWE update is based on. |
120 optional int32 total_packets = 3; | 120 optional int32 total_packets = 3; |
121 } | 121 } |
122 | 122 |
123 message BwePacketDelayEvent { | 123 message DelayBasedBweUpdate { |
124 enum DetectorState { | 124 enum DetectorState { |
125 BWE_NORMAL = 0; | 125 BWE_NORMAL = 0; |
126 BWE_UNDERUSING = 1; | 126 BWE_UNDERUSING = 1; |
127 BWE_OVERUSING = 2; | 127 BWE_OVERUSING = 2; |
128 } | 128 } |
129 | 129 |
130 // required - Bandwidth estimate (in bps) after the update. | 130 // required - Bandwidth estimate (in bps) after the update. |
131 optional int32 bitrate = 1; | 131 optional int32 bitrate_bps = 1; |
132 | 132 |
133 // required - The state of the overuse detector. | 133 // required - The state of the overuse detector. |
134 optional DetectorState detector_state = 2; | 134 optional DetectorState detector_state = 2; |
135 } | 135 } |
136 | 136 |
137 // TODO(terelius): Video and audio streams could in principle share SSRC, | 137 // TODO(terelius): Video and audio streams could in principle share SSRC, |
138 // so identifying a stream based only on SSRC might not work. | 138 // so identifying a stream based only on SSRC might not work. |
139 // It might be better to use a combination of SSRC and media type | 139 // It might be better to use a combination of SSRC and media type |
140 // or SSRC and port number, but for now we will rely on SSRC only. | 140 // or SSRC and port number, but for now we will rely on SSRC only. |
141 message VideoReceiveConfig { | 141 message VideoReceiveConfig { |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
262 | 262 |
263 // Whether forward error correction (FEC) is turned on or off. | 263 // Whether forward error correction (FEC) is turned on or off. |
264 optional bool enable_fec = 4; | 264 optional bool enable_fec = 4; |
265 | 265 |
266 // Whether discontinuous transmission (DTX) is turned on or off. | 266 // Whether discontinuous transmission (DTX) is turned on or off. |
267 optional bool enable_dtx = 5; | 267 optional bool enable_dtx = 5; |
268 | 268 |
269 // Number of audio channels that each encoded packet consists of. | 269 // Number of audio channels that each encoded packet consists of. |
270 optional uint32 num_channels = 6; | 270 optional uint32 num_channels = 6; |
271 } | 271 } |
OLD | NEW |