Skip to content

GitLab

T
tangled
Commit d823699d authored by Harald Alvestrand's avatar Harald Alvestrand Committed by Commit Bot
Browse files
Options

Fix issues in RTCStats-helper.js for WPT 

Make a number of stats optional because their generation
depends on specific states; they're not always present.

Check a number of stats only if the kind is the right one.

Bug: None
Change-Id: I7f3e307b0f0f14df0f62bc2ac3a226018640f873
Reviewed-on: https://chromium-review.googlesource.com/880983Reviewed-by: default avatarHenrik Boström <hbos@chromium.org>
Commit-Queue: Harald Alvestrand <hta@chromium.org>
Cr-Commit-Position: refs/heads/master@{#531386}
parent 1b97e93c
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 38 deletions
third_party/WebKit/LayoutTests/external/wpt/webrtc/RTCPeerConnection-getStats.https-expected.txt
View file @ d823699d
......@@ -11,6 +11,6 @@ FAIL getStats() with no argument should return stats report containing peer-conn
FAIL getStats() with no argument should return stats for no-stream tracks assert_true: Expect stats report to have stats object with id RTCMediaStreamTrack_sender_5 expected true got false
FAIL getStats() on track associated with RtpSender should return stats report containing outbound-rtp stats promise_test: Unhandled rejection with value: object "TypeError: Failed to execute 'getStats' on 'RTCPeerConnection': The callback provided as parameter 1 is not a function."
FAIL getStats() on track associated with RtpReceiver should return stats report containing inbound-rtp stats pc.addTransceiver is not a function
FAIL getStats() with connected peer connections having tracks and data channel should return all mandatory to implement stats assert_unreached: test failed with error: Error: assert_equals: Expect dictionary.issuerCertificateId to be string expected "string" but got "undefined" Reached unreachable code
FAIL getStats() with connected peer connections having tracks and data channel should return all mandatory to implement stats assert_unreached: test failed with error: Error: assert_true: Expect dictionary.dataChannelIdentifier to be integer expected true got false Reached unreachable code
Harness: the test ran to completion.
third_party/WebKit/LayoutTests/external/wpt/webrtc/RTCStats-helper.js
View file @ d823699d
......@@ -178,7 +178,7 @@ function validateRtpStreamStats(statsReport, stats) {
assert_optional_unsigned_int_field(stats, 'firCount');
assert_optional_unsigned_int_field(stats, 'pliCount');
assert_unsigned_int_field(stats, 'nackCount');
assert_optional_unsigned_int_field(stats, 'nackCount');
assert_optional_unsigned_int_field(stats, 'sliCount');
assert_optional_unsigned_int_field(stats, 'qpSum');
}
......@@ -211,15 +211,15 @@ function validateCodecStats(statsReport, stats) {
validateRtcStats(statsReport, stats);
assert_unsigned_int_field(stats, 'payloadType');
assert_enum_field(stats, 'codecType', ['encode', 'decode']);
assert_optional_enum_field(stats, 'codecType', ['encode', 'decode']);
validateOptionalIdField(statsReport, stats, 'transportId', 'transport');
assert_optional_string_field(stats, 'mimeType');
assert_unsigned_int_field(stats, 'clockRate');
assert_unsigned_int_field(stats, 'channels');
assert_optional_unsigned_int_field(stats, 'channels');
assert_string_field(stats, 'sdpFmtpLine');
assert_optional_string_field(stats, 'sdpFmtpLine');
assert_optional_string_field(stats, 'implementation');
}
......@@ -365,7 +365,9 @@ function validateOutboundRtpStreamStats(statsReport, stats) {
assert_optional_number_field(stats, 'lastPacketSentTimestamp');
assert_optional_number_field(stats, 'targetBitrate');
assert_unsigned_int_field(stats, 'framesEncoded');
if (stats['mediaType'] == 'video') {
assert_unsigned_int_field(stats, 'framesEncoded');
}
assert_optional_number_field(stats, 'totalEncodeTime');
assert_optional_number_field(stats, 'averageRTCPInterval');
}
......@@ -526,35 +528,38 @@ function validateMediaStreamTrackStats(statsReport, stats) {
assert_optional_enum_field(stats, 'kind', ['audio', 'video']);
assert_optional_number_field(stats, 'estimatedPlayoutTimestamp');
if (stats['kind'] === 'video') {
assert_unsigned_int_field(stats, 'frameWidth');
assert_unsigned_int_field(stats, 'frameHeight');
assert_number_field(stats, 'framesPerSecond');
if (stats['framesSent']) {
assert_optional_unsigned_int_field(stats, 'framesCaptured');
assert_unsigned_int_field(stats, 'framesSent');
assert_optional_unsigned_int_field(stats, 'keyFramesSent');
} else {
assert_unsigned_int_field(stats, 'framesReceived');
assert_optional_unsigned_int_field(stats, 'keyFramesReceived');
assert_unsigned_int_field(stats, 'framesDecoded');
assert_unsigned_int_field(stats, 'framesDropped');
assert_unsigned_int_field(stats, 'framesCorrupted');
}
assert_unsigned_int_field(stats, 'frameWidth');
assert_unsigned_int_field(stats, 'frameHeight');
assert_number_field(stats, 'framesPerSecond');
assert_optional_unsigned_int_field(stats, 'framesCaptured');
assert_unsigned_int_field(stats, 'framesSent');
assert_optional_unsigned_int_field(stats, 'keyFramesSent');
assert_unsigned_int_field(stats, 'framesReceived');
assert_optional_unsigned_int_field(stats, 'keyFramesReceived');
assert_unsigned_int_field(stats, 'framesDecoded');
assert_unsigned_int_field(stats, 'framesDropped');
assert_unsigned_int_field(stats, 'framesCorrupted');
assert_optional_unsigned_int_field(stats, 'partialFramesLost');
assert_optional_unsigned_int_field(stats, 'fullFramesLost');
assert_number_field(stats, 'audioLevel');
assert_optional_number_field(stats, 'totalAudioEnergy');
assert_optional_boolean_field(stats, 'voiceActivityFlag');
assert_optional_number_field(stats, 'echoReturnLoss');
assert_optional_number_field(stats, 'echoReturnLossEnhancement');
assert_optional_unsigned_int_field(stats, 'totalSamplesSent');
assert_optional_unsigned_int_field(stats, 'totalSamplesReceived');
assert_optional_number_field(stats, 'totalSamplesDuration');
assert_optional_unsigned_int_field(stats, 'concealedSamples');
assert_optional_unsigned_int_field(stats, 'concealmentEvents');
assert_optional_number_field(stats, 'jitterBufferDelay');
assert_optional_unsigned_int_field(stats, 'partialFramesLost');
assert_optional_unsigned_int_field(stats, 'fullFramesLost');
} else {
assert_number_field(stats, 'audioLevel');
assert_optional_number_field(stats, 'totalAudioEnergy');
assert_optional_boolean_field(stats, 'voiceActivityFlag');
assert_optional_number_field(stats, 'echoReturnLoss');
assert_optional_number_field(stats, 'echoReturnLossEnhancement');
assert_optional_unsigned_int_field(stats, 'totalSamplesSent');
assert_optional_unsigned_int_field(stats, 'totalSamplesReceived');
assert_optional_number_field(stats, 'totalSamplesDuration');
assert_optional_unsigned_int_field(stats, 'concealedSamples');
assert_optional_unsigned_int_field(stats, 'concealmentEvents');
assert_optional_number_field(stats, 'jitterBufferDelay');
}
assert_optional_enum_field(stats, 'priority',
['very-low', 'low', 'medium', 'high']);
......@@ -651,7 +656,8 @@ function validateTransportStats(statsReport, stats) {
assert_unsigned_int_field(stats, 'bytesSent');
assert_unsigned_int_field(stats, 'bytesReceived');
validateIdField(statsReport, stats, 'rtcpTransportStatsId', 'transport');
validateOptionalIdField(statsReport, stats, 'rtcpTransportStatsId',
'transport');
assert_optional_enum_field(stats, 'iceRole',
['controlling', 'controlled']);
......@@ -721,7 +727,7 @@ function validateIceCandidateStats(statsReport, stats) {
['host', 'srflx', 'prflx', 'relay']);
assert_int_field(stats, 'priority');
assert_string_field(stats, 'url');
assert_optional_string_field(stats, 'url');
assert_optional_string_field(stats, 'relayProtocol');
assert_optional_boolean_field(stats, 'deleted');
}
......@@ -788,7 +794,7 @@ function validateIceCandidatePairStats(statsReport, stats) {
assert_optional_unsigned_int_field(stats, 'packetsSent');
assert_optional_unsigned_int_field(stats, 'packetsReceived');
assert_unsigned_int_field(stats, 'bytesSent');
assert_unsigned_int_field(stats, 'byteReceived');
assert_unsigned_int_field(stats, 'bytesReceived');
assert_optional_number_field(stats, 'lastPacketSentTimestamp');
assert_optional_number_field(stats, 'lastPacketReceivedTimestamp');
......@@ -834,5 +840,5 @@ function validateCertificateStats(statsReport, stats) {
assert_string_field(stats, 'fingerprint');
assert_string_field(stats, 'fingerprintAlgorithm');
assert_string_field(stats, 'base64Certificate');
assert_string_field(stats, 'issuerCertificateId');
assert_optional_string_field(stats, 'issuerCertificateId');
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment