Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(313)

Side by Side Diff: webrtc/call/rtc_event_log.proto

Issue 1348113003: Update to the RtcEventLog protobuf to remove the DebugEvent message. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@audio_playout_timing
Patch Set: Rebase. Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/call/rtc_event_log.cc ('k') | webrtc/call/rtc_event_log_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 5
6 enum MediaType { 6 enum MediaType {
7 ANY = 0; 7 ANY = 0;
8 AUDIO = 1; 8 AUDIO = 1;
9 VIDEO = 2; 9 VIDEO = 2;
10 DATA = 3; 10 DATA = 3;
(...skipping 11 matching lines...) Expand all
22 22
23 message Event { 23 message Event {
24 // required - Elapsed wallclock time in us since the start of the log. 24 // required - Elapsed wallclock time in us since the start of the log.
25 optional int64 timestamp_us = 1; 25 optional int64 timestamp_us = 1;
26 26
27 // The different types of events that can occur, the UNKNOWN_EVENT entry 27 // The different types of events that can occur, the UNKNOWN_EVENT entry
28 // is added in case future EventTypes are added, in that case old code will 28 // is added in case future EventTypes are added, in that case old code will
29 // receive the new events as UNKNOWN_EVENT. 29 // receive the new events as UNKNOWN_EVENT.
30 enum EventType { 30 enum EventType {
31 UNKNOWN_EVENT = 0; 31 UNKNOWN_EVENT = 0;
32 RTP_EVENT = 1; 32 LOG_START = 1;
33 RTCP_EVENT = 2; 33 LOG_END = 2;
34 DEBUG_EVENT = 3; 34 RTP_EVENT = 3;
35 VIDEO_RECEIVER_CONFIG_EVENT = 4; 35 RTCP_EVENT = 4;
36 VIDEO_SENDER_CONFIG_EVENT = 5; 36 AUDIO_PLAYOUT_EVENT = 5;
37 AUDIO_RECEIVER_CONFIG_EVENT = 6; 37 VIDEO_RECEIVER_CONFIG_EVENT = 6;
38 AUDIO_SENDER_CONFIG_EVENT = 7; 38 VIDEO_SENDER_CONFIG_EVENT = 7;
39 AUDIO_RECEIVER_CONFIG_EVENT = 8;
40 AUDIO_SENDER_CONFIG_EVENT = 9;
39 } 41 }
40 42
41 // required - Indicates the type of this event 43 // required - Indicates the type of this event
42 optional EventType type = 2; 44 optional EventType type = 2;
43 45
44 // optional - but required if type == RTP_EVENT 46 // optional - but required if type == RTP_EVENT
45 optional RtpPacket rtp_packet = 3; 47 optional RtpPacket rtp_packet = 3;
46 48
47 // optional - but required if type == RTCP_EVENT 49 // optional - but required if type == RTCP_EVENT
48 optional RtcpPacket rtcp_packet = 4; 50 optional RtcpPacket rtcp_packet = 4;
49 51
50 // optional - but required if type == DEBUG_EVENT 52 // optional - but required if type == AUDIO_PLAYOUT_EVENT
51 optional DebugEvent debug_event = 5; 53 optional AudioPlayoutEvent audio_playout_event = 5;
52 54
53 // optional - but required if type == VIDEO_RECEIVER_CONFIG_EVENT 55 // optional - but required if type == VIDEO_RECEIVER_CONFIG_EVENT
54 optional VideoReceiveConfig video_receiver_config = 6; 56 optional VideoReceiveConfig video_receiver_config = 6;
55 57
56 // optional - but required if type == VIDEO_SENDER_CONFIG_EVENT 58 // optional - but required if type == VIDEO_SENDER_CONFIG_EVENT
57 optional VideoSendConfig video_sender_config = 7; 59 optional VideoSendConfig video_sender_config = 7;
58 60
59 // optional - but required if type == AUDIO_RECEIVER_CONFIG_EVENT 61 // optional - but required if type == AUDIO_RECEIVER_CONFIG_EVENT
60 optional AudioReceiveConfig audio_receiver_config = 8; 62 optional AudioReceiveConfig audio_receiver_config = 8;
61 63
(...skipping 23 matching lines...) Expand all
85 // required - True if the packet is incoming w.r.t. the user logging the data 87 // required - True if the packet is incoming w.r.t. the user logging the data
86 optional bool incoming = 1; 88 optional bool incoming = 1;
87 89
88 // required 90 // required
89 optional MediaType type = 2; 91 optional MediaType type = 2;
90 92
91 // required - The whole packet including both payload and header. 93 // required - The whole packet including both payload and header.
92 optional bytes packet_data = 3; 94 optional bytes packet_data = 3;
93 } 95 }
94 96
95 97 message AudioPlayoutEvent {
96 message DebugEvent { 98 // required - The SSRC of the audio stream associated with the playout event.
97 // Indicates the type of the debug event.
98 // LOG_START and LOG_END indicate the start and end of the log respectively.
99 // AUDIO_PLAYOUT indicates a call to the PlayoutData10Ms() function in ACM.
100 enum EventType {
101 UNKNOWN_EVENT = 0;
102 LOG_START = 1;
103 LOG_END = 2;
104 AUDIO_PLAYOUT = 3;
105 }
106
107 // required
108 optional EventType type = 1;
109
110 // required if type == AUDIO_PLAYOUT
111 optional uint32 local_ssrc = 2; 99 optional uint32 local_ssrc = 2;
112 } 100 }
113 101
114 102
115 // TODO(terelius): Video and audio streams could in principle share SSRC, 103 // TODO(terelius): Video and audio streams could in principle share SSRC,
116 // so identifying a stream based only on SSRC might not work. 104 // so identifying a stream based only on SSRC might not work.
117 // It might be better to use a combination of SSRC and media type 105 // It might be better to use a combination of SSRC and media type
118 // or SSRC and port number, but for now we will rely on SSRC only. 106 // or SSRC and port number, but for now we will rely on SSRC only.
119 message VideoReceiveConfig { 107 message VideoReceiveConfig {
120 // required - Synchronization source (stream identifier) to be received. 108 // required - Synchronization source (stream identifier) to be received.
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 message EncoderConfig { 203 message EncoderConfig {
216 // required 204 // required
217 optional string name = 1; 205 optional string name = 1;
218 206
219 // required 207 // required
220 optional sint32 payload_type = 2; 208 optional sint32 payload_type = 2;
221 } 209 }
222 210
223 211
224 message AudioReceiveConfig { 212 message AudioReceiveConfig {
225 // TODO(terelius): Add audio-receive config. 213 // required - Synchronization source (stream identifier) to be received.
214 optional uint32 remote_ssrc = 1;
215
216 // required - Sender SSRC used for sending RTCP (such as receiver reports).
217 optional uint32 local_ssrc = 2;
218
219 // RTP header extensions used for the received audio stream.
220 repeated RtpHeaderExtension header_extensions = 3;
226 } 221 }
227 222
228 223
229 message AudioSendConfig { 224 message AudioSendConfig {
230 // TODO(terelius): Add audio-receive config. 225 // required - Synchronization source (stream identifier) for outgoing stream.
226 optional uint32 ssrc = 1;
227
228 // RTP header extensions used for the outgoing audio stream.
229 repeated RtpHeaderExtension header_extensions = 2;
231 } 230 }
OLDNEW
« no previous file with comments | « webrtc/call/rtc_event_log.cc ('k') | webrtc/call/rtc_event_log_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698