Index: webrtc/logging/rtc_event_log/rtc_event_log2text.cc |
diff --git a/webrtc/logging/rtc_event_log/rtc_event_log2text.cc b/webrtc/logging/rtc_event_log/rtc_event_log2text.cc |
index 1dcc78b9765d5d4ab8d49822ae71556ee2388387..7467ae62ab7f47520e46e0d893f4e8f2cc636d7d 100644 |
--- a/webrtc/logging/rtc_event_log/rtc_event_log2text.cc |
+++ b/webrtc/logging/rtc_event_log/rtc_event_log2text.cc |
@@ -9,8 +9,10 @@ |
*/ |
#include <iostream> |
+#include <map> |
#include <sstream> |
#include <string> |
+#include <utility> // pair |
#include "gflags/gflags.h" |
#include "webrtc/base/checks.h" |
@@ -439,14 +441,13 @@ int main(int argc, char* argv[]) { |
size_t total_length; |
uint8_t header[IP_PACKET_SIZE]; |
webrtc::PacketDirection direction; |
- |
- parsed_stream.GetRtpHeader(i, &direction, header, &header_length, |
- &total_length); |
+ webrtc::RtpHeaderExtensionMap* extension_map = parsed_stream.GetRtpHeader( |
perkj_webrtc
2017/06/07 16:49:57
Why can't this return a webrtc::RtpHeader directly
ilnik
2017/06/08 08:43:43
I don't know why it was done like that. Maybe desi
terelius
2017/06/08 09:40:28
RTPHeader doesn't contain direction, media_type or
ilnik
2017/06/08 09:44:16
Looks like there'll be a massive overhaul of rtp_l
|
+ i, &direction, header, &header_length, &total_length); |
// Parse header to get SSRC and RTP time. |
webrtc::RtpUtility::RtpHeaderParser rtp_parser(header, header_length); |
webrtc::RTPHeader parsed_header; |
- rtp_parser.Parse(&parsed_header); |
+ rtp_parser.Parse(&parsed_header, extension_map); |
MediaType media_type = |
parsed_stream.GetMediaType(parsed_header.ssrc, direction); |
@@ -456,7 +457,31 @@ int main(int argc, char* argv[]) { |
std::cout << parsed_stream.GetTimestamp(i) << "\tRTP" |
<< StreamInfo(direction, media_type) |
<< "\tssrc=" << parsed_header.ssrc |
- << "\ttimestamp=" << parsed_header.timestamp << std::endl; |
+ << "\ttimestamp=" << parsed_header.timestamp; |
+ if (parsed_header.extension.hasAbsoluteSendTime) { |
+ std::cout << "\tAbsSendTime=" |
+ << parsed_header.extension.absoluteSendTime; |
+ } |
+ if (parsed_header.extension.hasVideoContentType) { |
+ std::cout << "\tContentType=" |
+ << static_cast<int>(parsed_header.extension.videoContentType); |
+ } |
+ if (parsed_header.extension.hasVideoRotation) { |
+ std::cout << "\tRotation=" |
+ << static_cast<int>(parsed_header.extension.videoRotation); |
+ } |
+ if (parsed_header.extension.hasTransportSequenceNumber) { |
+ std::cout << "\tTransportSeq=" |
+ << parsed_header.extension.transportSequenceNumber; |
+ } |
+ if (parsed_header.extension.hasTransmissionTimeOffset) { |
+ std::cout << "\tTransmTimeOffset=" |
+ << parsed_header.extension.transmissionTimeOffset; |
+ } |
+ if (parsed_header.extension.hasAudioLevel) { |
+ std::cout << "\tAudioLevel=" << parsed_header.extension.audioLevel; |
+ } |
+ std::cout << std::endl; |
} |
if (!FLAGS_nortcp && |
parsed_stream.GetEventType(i) == |