returns the average (down to nearest int), max and min of
// an int array.
@@ -32,3 +32,282 @@ function arrayMin(array) {
}
return Math.min.apply(Math, array);
}
+
+// Enumerates the new standard compliant stats using local and remote track ids.
+function enumerateStats(stats, localTrackIds, remoteTrackIds) {
+ // Create an object structure with all the needed stats and types that we care
+ // about. This allows to map the getStats stats to other stats names.
+ var statsObject = {
+ audio: {
+ local: {
+ audioLevel: 0.0,
+ bytesSent: 0,
+ clockRate: 0,
+ codecId: '',
+ mimeType: '',
+ packetsSent: 0,
+ payloadType: 0,
+ timestamp: 0.0,
+ trackId: '',
+ transportId: '',
+ },
+ remote: {
+ audioLevel: 0.0,
+ bytesReceived: 0,
+ clockRate: 0,
+ codecId: '',
+ fractionLost: 0,
+ jitter: 0,
+ mimeType: '',
+ packetsLost: -1,
+ packetsReceived: 0,
+ payloadType: 0,
+ timestamp: 0.0,
+ trackId: '',
+ transportId: '',
+ }
+ },
+ video: {
+ local: {
+ bytesSent: 0,
+ clockRate: 0,
+ codecId: '',
+ firCount: 0,
+ framesEncoded: 0,
+ frameHeight: 0,
+ framesSent: -1,
+ frameWidth: 0,
+ nackCount: 0,
+ packetsSent: -1,
+ payloadType: 0,
+ pliCount: 0,
+ qpSum: 0,
+ timestamp: 0.0,
+ trackId: '',
+ transportId: '',
+ },
+ remote: {
+ bytesReceived: -1,
+ clockRate: 0,
+ codecId: '',
+ firCount: -1,
+ fractionLost: 0,
+ frameHeight: 0,
+ framesDecoded: 0,
+ framesDropped: 0,
+ framesReceived: 0,
+ frameWidth: 0,
+ nackCount: -1,
+ packetsLost: -1,
+ packetsReceived: 0,
+ payloadType: 0,
+ pliCount: -1,
+ qpSum: 0,
+ timestamp: 0.0,
+ trackId: '',
+ transportId: '',
+ }
+ },
+ connection: {
+ availableOutgoingBitrate: 0,
+ bytesReceived: 0,
+ bytesSent: 0,
+ consentRequestsSent: 0,
+ currentRoundTripTime: 0.0,
+ localCandidateId: '',
+ localCandidateType: '',
+ localIp: '',
+ localPort: 0,
+ localPriority: 0,
+ localProtocol: '',
+ remoteCandidateId: '',
+ remoteCandidateType: '',
+ remoteIp: '',
+ remotePort: 0,
+ remotePriority: 0,
+ remoteProtocol: '',
+ requestsReceived: 0,
+ requestsSent: 0,
+ responsesReceived: 0,
+ responsesSent: 0,
+ timestamp: 0.0,
+ totalRoundTripTime: 0.0,
+ }
+ };
+
+ // Need to find the codec, local and remote ID's first.
+ if (stats) {
+ stats.forEach(function(report, stat) {
+ switch(report.type) {
+ case 'outbound-rtp':
+ if (report.hasOwnProperty('trackId')) {
+ if (report.trackId.indexOf(localTrackIds.audio) !== 1 &
+ localTrackIds.audio !== '') {
+ statsObject.audio.local.bytesSent = report.bytesSent;
+ statsObject.audio.local.codecId = report.codecId;
+ statsObject.audio.local.packetsSent = report.packetsSent;
+ statsObject.audio.local.timestamp = report.timestamp;
+ statsObject.audio.local.trackId = report.trackId;
+ statsObject.audio.local.transportId = report.transportId;
+ } else if (report.trackId.indexOf(localTrackIds.video) !== 1 &
+ localTrackIds.video !== '') {
+ statsObject.video.local.bytesSent = report.bytesSent;
+ statsObject.video.local.codecId = report.codecId;
+ statsObject.video.local.firCount = report.firCount;
+ statsObject.video.local.framesEncoded = report.framesEncoded;
+ statsObject.video.local.framesSent = report.framesSent;
+ statsObject.video.local.packetsSent = report.packetsSent;
+ statsObject.video.local.pliCount = report.pliCount;
+ statsObject.video.local.qpSum = report.qpSum;
+ statsObject.video.local.timestamp = report.timestamp;
+ statsObject.video.local.trackId = report.trackId;
+ statsObject.video.local.transportId = report.transportId;
+ }
+ }
+ break;
+ case 'inbound-rtp':
+ if (report.hasOwnProperty('trackId')) {
+ if (report.trackId.indexOf(remoteTrackIds.audio) !== 1 &
+ remoteTrackIds.audio !== '') {
+ statsObject.audio.remote.bytesReceived = report.bytesReceived;
+ statsObject.audio.remote.codecId = report.codecId;
+ statsObject.audio.remote.fractionLost = report.fractionLost;
+ statsObject.audio.remote.jitter = report.jitter;
+ statsObject.audio.remote.packetsLost = report.packetsLost;
+ statsObject.audio.remote.packetsReceived = report.packetsReceived;
+ statsObject.audio.remote.timestamp = report.timestamp;
+ statsObject.audio.remote.trackId = report.trackId;
+ statsObject.audio.remote.transportId = report.transportId;
+ }
+ if (report.trackId.indexOf(remoteTrackIds.video) !== 1 &
+ remoteTrackIds.video !== '') {
+ statsObject.video.remote.bytesReceived = report.bytesReceived;
+ statsObject.video.remote.codecId = report.codecId;
+ statsObject.video.remote.firCount = report.firCount;
+ statsObject.video.remote.fractionLost = report.fractionLost;
+ statsObject.video.remote.nackCount = report.nackCount;
+ statsObject.video.remote.packetsLost = report.packetsLost;
+ statsObject.video.remote.packetsReceived = report.packetsReceived;
+ statsObject.video.remote.pliCount = report.pliCount;
+ statsObject.video.remote.qpSum = report.qpSum;
+ statsObject.video.remote.timestamp = report.timestamp;
+ statsObject.video.remote.trackId = report.trackId;
+ statsObject.video.remote.transportId = report.transportId;
+ }
+ }
+ break;
+ case 'candidate-pair':
+ if (report.hasOwnProperty('availableOutgoingBitrate')) {
+ statsObject.connection.availableOutgoingBitrate =
+ report.availableOutgoingBitrate;
+ statsObject.connection.bytesReceived = report.bytesReceived;
+ statsObject.connection.bytesSent = report.bytesSent;
+ statsObject.connection.consentRequestsSent =
+ report.consentRequestsSent;
+ statsObject.connection.currentRoundTripTime =
+ report.currentRoundTripTime;
+ statsObject.connection.localCandidateId = report.localCandidateId;
+ statsObject.connection.remoteCandidateId = report.remoteCandidateId;
+ statsObject.connection.requestsReceived = report.requestsReceived;
+ statsObject.connection.requestsSent = report.requestsSent;
+ statsObject.connection.responsesReceived = report.responsesReceived;
+ statsObject.connection.responsesSent = report.responsesSent;
+ statsObject.connection.timestamp = report.timestamp;
+ statsObject.connection.totalRoundTripTime =
+ report.totalRoundTripTime;
+ }
+ break;
+ default:
+ return;
+ }
+ }.bind());
+
+ // Using the codec, local and remote candidate ID's to find the rest of the
+ // relevant stats.
+ stats.forEach(function(report) {
+ switch(report.type) {
+ case 'track':
+ if (report.hasOwnProperty('trackIdentifier')) {
+ if (report.trackIdentifier.indexOf(localTrackIds.video) !== 1 &
+ localTrackIds.video !== '') {
+ statsObject.video.local.frameHeight = report.frameHeight;
+ statsObject.video.local.framesSent = report.framesSent;
+ statsObject.video.local.frameWidth = report.frameWidth;
+ }
+ if (report.trackIdentifier.indexOf(remoteTrackIds.video) !== 1 &
+ remoteTrackIds.video !== '') {
+ statsObject.video.remote.frameHeight = report.frameHeight;
+ statsObject.video.remote.framesDecoded = report.framesDecoded;
+ statsObject.video.remote.framesDropped = report.framesDropped;
+ statsObject.video.remote.framesReceived = report.framesReceived;
+ statsObject.video.remote.frameWidth = report.frameWidth;
+ }
+ if (report.trackIdentifier.indexOf(localTrackIds.audio) !== 1 &
+ localTrackIds.audio !== '') {
+ statsObject.audio.local.audioLevel = report.audioLevel ;
+ }
+ if (report.trackIdentifier.indexOf(remoteTrackIds.audio) !== 1 &
+ remoteTrackIds.audio !== '') {
+ statsObject.audio.remote.audioLevel = report.audioLevel;
+ }
+ }
+ break;
+ case 'codec':
+ if (report.hasOwnProperty('id')) {
+ if (report.id.indexOf(statsObject.audio.local.codecId) !== 1 &
+ localTrackIds.audio !== '') {
+ statsObject.audio.local.clockRate = report.clockRate;
+ statsObject.audio.local.mimeType = report.mimeType;
+ statsObject.audio.local.payloadType = report.payloadType;
+ }
+ if (report.id.indexOf(statsObject.audio.remote.codecId) !== 1 &
+ remoteTrackIds.audio !== '') {
+ statsObject.audio.remote.clockRate = report.clockRate;
+ statsObject.audio.remote.mimeType = report.mimeType;
+ statsObject.audio.remote.payloadType = report.payloadType;
+ }
+ if (report.id.indexOf(statsObject.video.local.codecId) !== 1 &
+ localTrackIds.video !== '') {
+ statsObject.video.local.clockRate = report.clockRate;
+ statsObject.video.local.mimeType = report.mimeType;
+ statsObject.video.local.payloadType = report.payloadType;
+ }
+ if (report.id.indexOf(statsObject.video.remote.codecId) !== 1 &
+ remoteTrackIds.video !== '') {
+ statsObject.video.remote.clockRate = report.clockRate;
+ statsObject.video.remote.mimeType = report.mimeType;
+ statsObject.video.remote.payloadType = report.payloadType;
+ }
+ }
+ break;
+ case 'local-candidate':
+ if (report.hasOwnProperty('id')) {
+ if (report.id.indexOf(
+ statsObject.connection.localCandidateId) !== -1) {
+ statsObject.connection.localIp = report.ip;
+ statsObject.connection.localPort = report.port;
+ statsObject.connection.localPriority = report.priority;
+ statsObject.connection.localProtocol = report.protocol;
+ statsObject.connection.localType = report.candidateType;
+ }
+ }
+ break;
+ case 'remote-candidate':
+ if (report.hasOwnProperty('id')) {
+ if (report.id.indexOf(
+ statsObject.connection.remoteCandidateId) !== -1) {
+ statsObject.connection.remoteIp = report.ip;
+ statsObject.connection.remotePort = report.port;
+ statsObject.connection.remotePriority = report.priority;
+ statsObject.connection.remoteProtocol = report.protocol;
+ statsObject.connection.remoteType = report.candidateType;
+ }
+ }
+ break;
+ default:
+ return;
+ }
+ }.bind());
+ }
+ return statsObject;
+}
diff --git a/src/js/videoframechecker.js b/src/js/videoframechecker.js
new file mode 100644
index 00000000..41160f23
--- /dev/null
+++ b/src/js/videoframechecker.js
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree.
+ */
+'use strict';
+
+function VideoFrameChecker(videoElement) {
+ this.frameStats = {
+ numFrozenFrames: 0,
+ numBlackFrames: 0,
+ numFrames: 0
+ };
+
+ this.running_ = true;
+
+ this.nonBlackPixelLumaThreshold = 20;
+ this.previousFrame_ = [];
+ this.identicalFrameSsimThreshold = 0.985;
+ this.frameComparator = new Ssim();
+
+ this.canvas_ = document.createElement('canvas');
+ this.videoElement_ = videoElement;
+ this.listener_ = this.checkVideoFrame_.bind(this);
+ this.videoElement_.addEventListener('play', this.listener_, false);
+}
+
+VideoFrameChecker.prototype = {
+ stop: function() {
+ this.videoElement_.removeEventListener('play' , this.listener_);
+ this.running_ = false;
+ },
+
+ getCurrentImageData_: function() {
+ this.canvas_.width = this.videoElement_.width;
+ this.canvas_.height = this.videoElement_.height;
+
+ var context = this.canvas_.getContext('2d');
+ context.drawImage(this.videoElement_, 0, 0, this.canvas_.width,
+ this.canvas_.height);
+ return context.getImageData(0, 0, this.canvas_.width, this.canvas_.height);
+ },
+
+ checkVideoFrame_: function() {
+ if (!this.running_) {
+ return;
+ }
+ if (this.videoElement_.ended) {
+ return;
+ }
+
+ var imageData = this.getCurrentImageData_();
+
+ if (this.isBlackFrame_(imageData.data, imageData.data.length)) {
+ this.frameStats.numBlackFrames++;
+ }
+
+ if (this.frameComparator.calculate(this.previousFrame_, imageData.data) >
+ this.identicalFrameSsimThreshold) {
+ this.frameStats.numFrozenFrames++;
+ }
+ this.previousFrame_ = imageData.data;
+
+ this.frameStats.numFrames++;
+ setTimeout(this.checkVideoFrame_.bind(this), 20);
+ },
+
+ isBlackFrame_: function(data, length) {
+ // TODO: Use a statistical, histogram-based detection.
+ var thresh = this.nonBlackPixelLumaThreshold;
+ var accuLuma = 0;
+ for (var i = 4; i < length; i += 4) {
+ // Use Luma as in Rec. 709: Y′709 = 0.21R + 0.72G + 0.07B;
+ accuLuma += 0.21 * data[i] + 0.72 * data[i + 1] + 0.07 * data[i + 2];
+ // Early termination if the average Luma so far is bright enough.
+ if (accuLuma > (thresh * i / 4)) {
+ return false;
+ }
+ }
+ return true;
+ }
+};
+
+if (typeof exports === 'object') {
+ module.exports = VideoFrameChecker;
+}
diff --git a/src/ui/report-dialog.html b/src/ui/report-dialog.html
index 4847c257..1030b3d3 100644
--- a/src/ui/report-dialog.html
+++ b/src/ui/report-dialog.html
@@ -22,35 +22,16 @@ Create a report
Note
- The report will contain information about your device including network information that is useful to troubleshoot the issue.
- Uploading the report creates a URL that is available for a period of 90 days.
+ The report will contain information about your device including network information
+ that is useful to troubleshoot the issue.
+ You may want to share it with someone investigating your issue, or create a new
+ issue in the testrtc project.
-
-
- Success
- The link to the report is now available.
- You may want to share it with someone investigating your issue, or create a new
- issue in the testrtc project.
-
-
-
-
-
- Failure
- Upload failed with error: {{reportError}}
- Check your network connection
-
-
diff --git a/src/ui/testrtc-main.html b/src/ui/testrtc-main.html
index 0822c84c..45b5e58e 100644
--- a/src/ui/testrtc-main.html
+++ b/src/ui/testrtc-main.html
@@ -194,7 +194,7 @@ STUN
onFail.apply(this, arguments);
} else {
reportFatal('Failed to get access to local media due to ' +
- 'error: ' + error.name);
+ 'error: ' + error);
}
});
} catch (e) {
@@ -206,13 +206,8 @@ STUN
},
appendSourceId: function(id, type, constraints) {
- if (constraints[type] === true) {
- constraints[type] = {optional: [{sourceId: id}]};
- } else if (typeof constraints[type] === 'object') {
- if (typeof constraints[type].optional === 'undefined') {
- constraints[type].optional = [];
- }
- constraints[type].optional.push({sourceId: id});
+ if (constraints[type] !== false && typeof(constraints[type]) !== 'undefined') {
+ constraints[type]['deviceId'] = id;
}
},
diff --git a/test/run-tests.js b/test/run-tests.js
index d565628a..39afaf01 100644
--- a/test/run-tests.js
+++ b/test/run-tests.js
@@ -5,9 +5,6 @@
* that can be found in the LICENSE file in the root of the source
* tree.
*/
-/* jshint node: true */
-/* globals require */
-
'use strict';
var test = require('tape');
diff --git a/test/sanity-test.js b/test/sanity-test.js
index 8db8be1d..c16b393a 100644
--- a/test/sanity-test.js
+++ b/test/sanity-test.js
@@ -5,11 +5,10 @@
* that can be found in the LICENSE file in the root of the source
* tree.
*/
-
'use strict';
+
// This is a basic test file for use with testling.
// The test script language comes from tape.
-/* jshint node: true */
var test = require('tape');
var webdriver = require('selenium-webdriver');
@@ -24,6 +23,11 @@ test('Run TestRTC', function(t) {
t.pass('Page loaded');
})
.then(function() {
+ // Have to wait for the getUserMedia polymer element has been shown before clicking on the start button.
+ driver.wait(webdriver.until.elementIsVisible(driver.findElement(
+ webdriver.By.id('dialog'))))
+ driver.wait(webdriver.until.elementIsNotVisible(driver.findElement(
+ webdriver.By.id('dialog'))))
return driver.wait(webdriver.until.elementLocated(
webdriver.By.css('#startButton')), 10000,
'Failed to locate startButton');
diff --git a/testrtc.py b/testrtc.py
deleted file mode 100755
index a653d1ad..00000000
--- a/testrtc.py
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/usr/bin/python
-#
-# Copyright 2014 Google Inc. All Rights Reserved.
-
-"""
-This module handles log file upload and download, delete log files from the
- blobstore (only allowed via a cron job) at a set interval and also creates
- a 10Mb downloadable file useful for bandwidth benchmarking.
-"""
-import cgi
-import logging
-import random
-import os
-import webapp2
-import urllib
-import datetime
-import re
-
-from google.appengine.ext import blobstore
-from google.appengine.ext.webapp import blobstore_handlers
-
-# Generate 10 kilobytes of random data and create a 10MB buffer from it.
-random_file = bytearray([random.randint(0,127) for i in xrange(0,10000)] * 1000)
-
-class TestDownloadFile(webapp2.RequestHandler):
- def get(self, size_kbytes):
- self.response.headers.add_header("Access-Control-Allow-Origin", "*")
- self.response.headers['Content-Type'] = 'application/octet-stream'
- self.response.out.write(random_file[0: int(size_kbytes)*1000])
-
-class NewReportHandler(blobstore_handlers.BlobstoreUploadHandler):
- # Generate and return blobstore upload URL.
- def head(self):
- upload_url = blobstore.create_upload_url('/report/new')
- self.response.headers['Response-Text'] = upload_url
-
- # On uploaded file to the blobstore.
- def post(self):
- origin = self.request.headers['Origin']
- fileName = self.request.headers['X-File-Name']
- if not re.match(r'^testrtc-.*.log', fileName):
- return self.error(403)
- upload_files = self.get_uploads(field_name=fileName)
- blob_info = upload_files[0]
- self.response.headers['Content-Type'] = 'text/plain';
- self.response.headers['Response-Text'] = origin + '/report/%s' % blob_info.key()
-
-class ReportHandler(blobstore_handlers.BlobstoreDownloadHandler):
- def get(self, resource):
- resource = str(urllib.unquote(resource))
- blob_info = blobstore.BlobInfo.get(resource)
- self.send_blob(blob_info)
-
-# Remove log files equal or older than retentionPeriod.
-class CleanBlobstore(blobstore_handlers.BlobstoreUploadHandler):
- def get(self):
- retentionPeriod = datetime.datetime.now() - datetime.timedelta(days=90)
- gqlQuery = blobstore.BlobInfo.gql("WHERE creation <= :date",
- date = retentionPeriod)
- logFiles = gqlQuery.run()
- for log in logFiles:
- # Make sure to only delete log reports from the blobstore.
- if re.match(r'^testrtc-.*.log', log.filename):
- blobstore.BlobInfo.get(log.key()).delete()
-
-app = webapp2.WSGIApplication([
- ('/report/new', NewReportHandler),
- (r'/report/([^/]+)', ReportHandler),
- (r'/test-download-file/(\d?\d00)KB.data', TestDownloadFile),
- ('/tasks/blobstore/clean', CleanBlobstore)
- ], debug=True)