Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix throughput on abort #4201

Merged
merged 2 commits into from
Jun 6, 2023
Merged

Fix throughput on abort #4201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
740e842
Take account aborted request metrics (for throughput history)
bbert Jun 5, 2023
b74e1b6
Remove console.log
bbert Jun 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions src/streaming/net/HTTPLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,17 @@ function HTTPLoader(cfg) {
throw new Error('config object is not correct or missing');
}

const addHttpRequestMetric = function(success) {
const responseUrl = httpRequest.response ? httpRequest.response.responseURL : null;
const responseStatus = httpRequest.response ? httpRequest.response.status : null;
const responseHeaders = httpRequest.response && httpRequest.response.getAllResponseHeaders ? httpRequest.response.getAllResponseHeaders() :
httpRequest.response ? httpRequest.response.responseHeaders : null;

const cmsd = responseHeaders && settings.get().streaming.cmsd && settings.get().streaming.cmsd.enabled ? cmsdModel.parseResponseHeaders(responseHeaders, request.mediaType) : null;

dashMetrics.addHttpRequest(request, responseUrl, responseStatus, responseHeaders, success ? traces : null, cmsd);
}

const handleLoaded = function (success) {
needFailureReport = false;

Expand All @@ -122,14 +133,7 @@ function HTTPLoader(cfg) {
request.fileLoaderType = fileLoaderType;

if (!request.checkExistenceOnly) {
const responseUrl = httpRequest.response ? httpRequest.response.responseURL : null;
const responseStatus = httpRequest.response ? httpRequest.response.status : null;
const responseHeaders = httpRequest.response && httpRequest.response.getAllResponseHeaders ? httpRequest.response.getAllResponseHeaders() :
httpRequest.response ? httpRequest.response.responseHeaders : null;

const cmsd = settings.get().streaming.cmsd && settings.get().streaming.cmsd.enabled ? cmsdModel.parseResponseHeaders(responseHeaders, request.mediaType) : null;

dashMetrics.addHttpRequest(request, responseUrl, responseStatus, responseHeaders, success ? traces : null, cmsd);
addHttpRequestMetric(success);

if (request.type === HTTPRequest.MPD_TYPE) {
dashMetrics.addManifestUpdate(request);
Expand Down Expand Up @@ -261,6 +265,8 @@ function HTTPLoader(cfg) {
};

const onabort = function () {
addHttpRequestMetric(true);

if (progressTimeout) {
clearTimeout(progressTimeout);
progressTimeout = null;
Expand Down
2 changes: 1 addition & 1 deletion src/streaming/rules/abr/lolp/LoLpRule.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ function LoLPRule(config) {
scheduleController.setTimeToLoadDelay(0);

if (switchRequest.quality !== currentQuality) {
console.log('[TgcLearningRule][' + mediaType + '] requesting switch to index: ', switchRequest.quality, 'Average throughput', Math.round(throughput), 'kbps');
logger.debug('[TgcLearningRule][' + mediaType + '] requesting switch to index: ', switchRequest.quality, 'Average throughput', Math.round(throughput), 'kbps');
}

return switchRequest;
Expand Down