Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
9 changed files
with
517 additions
and
513 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| erizo_controller/erizoController | ||
| erizo_controller/erizoJS | ||
| erizo_controller/erizoAgent |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,7 @@ | ||
| nuve/nuveClient/build | ||
| nuve/nuveClient/dist | ||
| erizo_controller/erizoClient/dist/ | ||
| erizo_controller/erizoClient/build/ | ||
| erizo_controller/erizoClient/lib/ | ||
| erizo_controller/erizoClient | ||
| spine/erizofc.js | ||
| extras/basic_example/public/erizo.js | ||
| extras/basic_example/nuve.js | ||
| extras/basic_example/public/lib/ | ||
| extras/basic_example/public/lib/ |
356 changes: 176 additions & 180 deletions
356
erizo_controller/erizoJS/adapt_schemes/notify-break-recover.js
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,111 +1,108 @@ | ||
| 'use strict'; | ||
| const schemeHelpers = require('./schemeHelpers.js').schemeHelpers; | ||
| exports.MonitorSubscriber = function (log) { | ||
|
|
||
| var that = {}, | ||
| INTERVAL_STATS = 1000, | ||
| TICS_PER_TRANSITION = 10; | ||
| var that = {}, | ||
| INTERVAL_STATS = 1000, | ||
| TICS_PER_TRANSITION = 10; | ||
|
|
||
|
|
||
| /* BW Status | ||
| * 0 - Stable | ||
| * 1 - Won't recover | ||
| */ | ||
| var BW_STABLE = 0, BW_WONTRECOVER = 1; | ||
| /* BW Status | ||
| * 0 - Stable | ||
| * 1 - Won't recover | ||
| */ | ||
| var BW_STABLE = 0, BW_WONTRECOVER = 1; | ||
|
|
||
| var calculateAverage = function (values) { | ||
| var calculateAverage = function (values) { | ||
|
|
||
| if (values === undefined) | ||
| return 0; | ||
| var cnt = values.length; | ||
| var tot = parseInt(0); | ||
| for (var i = 0; i < values.length; i++){ | ||
| tot+=parseInt(values[i]); | ||
| } | ||
| return Math.ceil(tot/cnt); | ||
| }; | ||
| if (values === undefined) | ||
| return 0; | ||
| var cnt = values.length; | ||
| var tot = parseInt(0); | ||
| for (var i = 0; i < values.length; i++){ | ||
| tot+=parseInt(values[i]); | ||
| } | ||
| return Math.ceil(tot/cnt); | ||
| }; | ||
|
|
||
|
|
||
| that.monitorMinVideoBw = function(wrtc, callback){ | ||
| wrtc.bwValues = []; | ||
| var tics = 0; | ||
| var retries = 0; | ||
| var lastAverage, average, lastBWValue; | ||
| var nextRetry = 0; | ||
| wrtc.bwStatus = BW_STABLE; | ||
| log.info('message: Start wrtc adapt scheme, ' + | ||
| 'id: ' + wrtc.wrtcId + ', ' + | ||
| 'scheme: notify-break, ' + | ||
| 'minVideoBW: ' + wrtc.minVideoBW); | ||
| that.monitorMinVideoBw = function(wrtc, callback){ | ||
| wrtc.bwValues = []; | ||
| var tics = 0; | ||
| var retries = 0; | ||
| var lastAverage, average, lastBWValue; | ||
| var nextRetry = 0; | ||
| wrtc.bwStatus = BW_STABLE; | ||
| log.info('message: Start wrtc adapt scheme, ' + | ||
| 'id: ' + wrtc.wrtcId + ', ' + | ||
| 'scheme: notify-break, ' + | ||
| 'minVideoBW: ' + wrtc.minVideoBW); | ||
|
|
||
| wrtc.minVideoBW = wrtc.minVideoBW*1000; // We need it in bps | ||
| wrtc.lowerThres = Math.floor(wrtc.minVideoBW*(0.8)); | ||
| wrtc.upperThres = Math.ceil(wrtc.minVideoBW); | ||
| var intervalId = setInterval(function () { | ||
| var newStats = wrtc.getStats(); | ||
| if (!newStats){ | ||
| clearInterval(intervalId); | ||
| return; | ||
| } | ||
| wrtc.minVideoBW = wrtc.minVideoBW*1000; // We need it in bps | ||
| wrtc.lowerThres = Math.floor(wrtc.minVideoBW*(0.8)); | ||
| wrtc.upperThres = Math.ceil(wrtc.minVideoBW); | ||
| wrtc.monitorInterval = setInterval(() => { | ||
|
|
||
| if (wrtc.slideShowMode) { | ||
| return; | ||
| } | ||
| schemeHelpers.getBandwidthStat(wrtc).then((bandwidth) => { | ||
| if (wrtc.slideShowMode) { | ||
| return; | ||
| } | ||
| if(bandwidth) { | ||
| lastBWValue = bandwidth; | ||
| wrtc.bwValues.push(lastBWValue); | ||
| if (wrtc.bwValues.length > 5) { | ||
| wrtc.bwValues.shift(); | ||
| } | ||
| average = calculateAverage(wrtc.bwValues); | ||
| } | ||
|
|
||
| var theStats = JSON.parse(newStats); | ||
| for (var i = 0; i < theStats.length; i++){ | ||
| // Only one stream should have bandwidth | ||
| if(theStats[i].hasOwnProperty('bandwidth')) { | ||
| lastBWValue = theStats[i].bandwidth; | ||
| wrtc.bwValues.push(lastBWValue); | ||
| if (wrtc.bwValues.length > 5){ | ||
| wrtc.bwValues.shift(); | ||
| } | ||
| average = calculateAverage(wrtc.bwValues); | ||
| } | ||
| } | ||
| switch (wrtc.bwStatus){ | ||
| case BW_STABLE: | ||
| if(average <= lastAverage && (average < wrtc.lowerThres)) { | ||
| if (++tics > TICS_PER_TRANSITION) { | ||
| log.info('message: scheme state change, ' + | ||
| 'id: ' + wrtc.wrtcId + ', ' + | ||
| 'previousState: BW_STABLE, ' + | ||
| 'newState: BW_WONT_RECOVER, ' + | ||
| 'averageBandwidth: ' + average + ', ' + | ||
| 'lowerThreshold: ' + wrtc.lowerThres); | ||
| wrtc.bwStatus = BW_WONTRECOVER; | ||
| wrtc.setFeedbackReports(false, 1); | ||
| tics = 0; | ||
| callback('callback', {type: 'bandwidthAlert', | ||
| message: 'insufficient', | ||
| bandwidth: average}); | ||
| } | ||
| } | ||
| break; | ||
| case BW_WONTRECOVER: | ||
| log.info('message: Switched to audio-only, ' + | ||
| 'id: ' + wrtc.wrtcId + ', ' + | ||
| 'state: BW_WONT_RECOVER, ' + | ||
| 'averageBandwidth: ' + average + ', ' + | ||
| 'lowerThreshold: ' + wrtc.lowerThres); | ||
| tics = 0; | ||
| nextRetry = 0; | ||
| retries = 0; | ||
| average = 0; | ||
| lastAverage = 0; | ||
| wrtc.minVideoBW = false; | ||
| wrtc.setFeedbackReports (false, 1); | ||
| callback('callback', {type: 'bandwidthAlert', | ||
| message: 'audio-only', | ||
| bandwidth: average}); | ||
| clearInterval(intervalId); | ||
| break; | ||
| default: | ||
| log.error('Unknown BW status, id: ' + wrtc.wrtcId); | ||
| switch (wrtc.bwStatus){ | ||
| case BW_STABLE: | ||
| if(average <= lastAverage && (average < wrtc.lowerThres)) { | ||
| if (++tics > TICS_PER_TRANSITION) { | ||
| log.info('message: scheme state change, ' + | ||
| 'id: ' + wrtc.wrtcId + ', ' + | ||
| 'previousState: BW_STABLE, ' + | ||
| 'newState: BW_WONT_RECOVER, ' + | ||
| 'averageBandwidth: ' + average + ', ' + | ||
| 'lowerThreshold: ' + wrtc.lowerThres); | ||
| wrtc.bwStatus = BW_WONTRECOVER; | ||
| wrtc.setFeedbackReports(false, 1); | ||
| tics = 0; | ||
| callback('callback', {type: 'bandwidthAlert', | ||
| message: 'insufficient', | ||
| bandwidth: average}); | ||
| } | ||
| } | ||
| lastAverage = average; | ||
| }, INTERVAL_STATS); | ||
| }; | ||
| break; | ||
| case BW_WONTRECOVER: | ||
| log.info('message: Switched to audio-only, ' + | ||
| 'id: ' + wrtc.wrtcId + ', ' + | ||
| 'state: BW_WONT_RECOVER, ' + | ||
| 'averageBandwidth: ' + average + ', ' + | ||
| 'lowerThreshold: ' + wrtc.lowerThres); | ||
| tics = 0; | ||
| nextRetry = 0; | ||
| retries = 0; | ||
| average = 0; | ||
| lastAverage = 0; | ||
| wrtc.minVideoBW = false; | ||
| wrtc.setFeedbackReports (false, 1); | ||
| callback('callback', {type: 'bandwidthAlert', | ||
| message: 'audio-only', | ||
| bandwidth: average}); | ||
| clearInterval(wrtc.monitorInterval); | ||
| break; | ||
| default: | ||
| log.error('Unknown BW status, id: ' + wrtc.wrtcId); | ||
| } | ||
| lastAverage = average; | ||
| }).catch((reason) => { | ||
| clearInterval(wrtc.monitorInterval); | ||
| log.error('error getting stats: ' + reason); | ||
| }); | ||
| }, INTERVAL_STATS); | ||
| }; | ||
|
|
||
| return that.monitorMinVideoBw; | ||
| return that.monitorMinVideoBw; | ||
| }; |
Oops, something went wrong.