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 19 matching lines...) Expand all Loading... | |
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 BWE_PACKET_LOSS_EVENT = 6; |
35 BWE_PACKET_DELAY_EVENT = 7; | 35 BWE_PACKET_DELAY_EVENT = 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_ADAPTOR_EVENT = 12; | |
40 } | 41 } |
41 | 42 |
42 // required - Indicates the type of this event | 43 // required - Indicates the type of this event |
43 optional EventType type = 2; | 44 optional EventType type = 2; |
44 | 45 |
45 // optional - but required if type == RTP_EVENT | 46 // optional - but required if type == RTP_EVENT |
46 optional RtpPacket rtp_packet = 3; | 47 optional RtpPacket rtp_packet = 3; |
47 | 48 |
48 // optional - but required if type == RTCP_EVENT | 49 // optional - but required if type == RTCP_EVENT |
49 optional RtcpPacket rtcp_packet = 4; | 50 optional RtcpPacket rtcp_packet = 4; |
50 | 51 |
51 // optional - but required if type == AUDIO_PLAYOUT_EVENT | 52 // optional - but required if type == AUDIO_PLAYOUT_EVENT |
52 optional AudioPlayoutEvent audio_playout_event = 5; | 53 optional AudioPlayoutEvent audio_playout_event = 5; |
53 | 54 |
54 // optional - but required if type == BWE_PACKET_LOSS_EVENT | 55 // optional - but required if type == BWE_PACKET_LOSS_EVENT |
55 optional BwePacketLossEvent bwe_packet_loss_event = 6; | 56 optional BwePacketLossEvent bwe_packet_loss_event = 6; |
56 | 57 |
57 // optional - but required if type == VIDEO_RECEIVER_CONFIG_EVENT | 58 // optional - but required if type == VIDEO_RECEIVER_CONFIG_EVENT |
58 optional VideoReceiveConfig video_receiver_config = 8; | 59 optional VideoReceiveConfig video_receiver_config = 8; |
59 | 60 |
60 // optional - but required if type == VIDEO_SENDER_CONFIG_EVENT | 61 // optional - but required if type == VIDEO_SENDER_CONFIG_EVENT |
61 optional VideoSendConfig video_sender_config = 9; | 62 optional VideoSendConfig video_sender_config = 9; |
62 | 63 |
63 // optional - but required if type == AUDIO_RECEIVER_CONFIG_EVENT | 64 // optional - but required if type == AUDIO_RECEIVER_CONFIG_EVENT |
64 optional AudioReceiveConfig audio_receiver_config = 10; | 65 optional AudioReceiveConfig audio_receiver_config = 10; |
65 | 66 |
66 // optional - but required if type == AUDIO_SENDER_CONFIG_EVENT | 67 // optional - but required if type == AUDIO_SENDER_CONFIG_EVENT |
67 optional AudioSendConfig audio_sender_config = 11; | 68 optional AudioSendConfig audio_sender_config = 11; |
69 | |
70 // optional - but required if type == AUDIO_NETWORK_ADAPTOR_EVENT | |
71 optional AudioNetworkAdaptorDecition audio_network_adaptor_decition = 12; | |
minyue-webrtc
2016/12/12 10:33:12
We call the output of AudioNetworkAdaptor, Runtime
michaelt
2016/12/12 10:50:08
Sure why not "AudioEncoderRuntimeConfig"
| |
68 } | 72 } |
69 | 73 |
70 message RtpPacket { | 74 message RtpPacket { |
71 // required - True if the packet is incoming w.r.t. the user logging the data | 75 // required - True if the packet is incoming w.r.t. the user logging the data |
72 optional bool incoming = 1; | 76 optional bool incoming = 1; |
73 | 77 |
74 // required | 78 // required |
75 optional MediaType type = 2; | 79 optional MediaType type = 2; |
76 | 80 |
77 // required - The size of the packet including both payload and header. | 81 // required - The size of the packet including both payload and header. |
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
220 repeated RtpHeaderExtension header_extensions = 3; | 224 repeated RtpHeaderExtension header_extensions = 3; |
221 } | 225 } |
222 | 226 |
223 message AudioSendConfig { | 227 message AudioSendConfig { |
224 // required - Synchronization source (stream identifier) for outgoing stream. | 228 // required - Synchronization source (stream identifier) for outgoing stream. |
225 optional uint32 ssrc = 1; | 229 optional uint32 ssrc = 1; |
226 | 230 |
227 // RTP header extensions used for the outgoing audio stream. | 231 // RTP header extensions used for the outgoing audio stream. |
228 repeated RtpHeaderExtension header_extensions = 2; | 232 repeated RtpHeaderExtension header_extensions = 2; |
229 } | 233 } |
234 | |
235 message AudioNetworkAdaptorDecition { | |
minyue-webrtc
2016/12/13 10:52:02
is it possible to merge this and EncoderRuntimeCon
michaelt
2016/12/13 15:44:39
Done.
| |
236 optional int32 bitrate_bps = 1; | |
237 optional int32 frame_length_ms = 2; | |
238 optional float uplink_packet_loss_fraction = 3; | |
239 optional bool enable_fec = 4; | |
240 optional bool enable_dtx = 5; | |
241 optional uint32 num_channels = 6; | |
242 } | |
OLD | NEW |