zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add content type information to Encoded Images and add corresponding RTP extension header.

Browse Source 
Use it to separate UMA e2e delay metric between screenshare from video.
Content type extension is set based on encoder settings and processed and decoders.

Also,
Fix full-stack-tests to calculate RTT correctly, so new metric could be tested.

BUG=webrtc:7420

Review-Url: https://codereview.webrtc.org/2772033002
Cr-Commit-Position: refs/heads/master@{#17640}
This commit is contained in:
ilnik
2017-04-11 01:46:04 -07:00
committed by Commit bot
parent 93cda2ebde
commit 64e739aeae
48 changed files with 465 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
webrtc/modules/rtp_rtcp/source/rtp_utility.cc
View File

@ -254,6 +254,10 @@ bool RtpHeaderParser::Parse(RTPHeader* header,
header->extension.playout_delay.min_ms = -1;
header->extension.playout_delay.max_ms = -1;
// May not be present in packet.
header->extension.hasVideoContentType = false;
header->extension.videoContentType = VideoContentType::UNSPECIFIED;
if (X) {
/* RTP header extension, RFC 3550.
0 1 2 3
@ -446,6 +450,25 @@ void RtpHeaderParser::ParseOneByteExtensionHeader(
max_playout_delay * PlayoutDelayLimits::kGranularityMs;
break;
}
case kRtpExtensionVideoContentType: {
if (len != 0) {
LOG(LS_WARNING) << "Incorrect video content type len: " << len;
return;
}
// 0 1
// 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
// | ID | len=0 | Content type |
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
if (ptr[0] <
static_cast<uint8_t>(VideoContentType::TOTAL_CONTENT_TYPES)) {
header->extension.hasVideoContentType = true;
header->extension.videoContentType =
static_cast<VideoContentType>(ptr[0]);
}
break;
}
case kRtpExtensionNone:
case kRtpExtensionNumberOfExtensions: {
RTC_NOTREACHED() << "Invalid extension type: " << type;