Merge pull request #1950 from Orange-OpenSource/removeUnusedParameter

Remove unused functions or parameters
Dash-Industry-Forum · Jun 16, 2017 · 84582f5 · 84582f5
2 parents 3071c09 + 6cac942
commit 84582f5
Show file tree

Hide file tree

Showing 15 changed files with 4 additions and 152 deletions.
diff --git a/src/dash/DashAdapter.js b/src/dash/DashAdapter.js
@@ -167,7 +167,6 @@ function DashAdapter() {
         streamInfo.duration = period.duration;
         streamInfo.manifestInfo = convertMpdToManifestInfo(period.mpd);
         streamInfo.isLast = period.mpd.manifest.Period_asArray.length === 1 || Math.abs((streamInfo.start + streamInfo.duration) - streamInfo.manifestInfo.duration) < THRESHOLD;
-        streamInfo.isFirst = period.mpd.manifest.Period_asArray.length === 1 || dashManifestModel.getRegularPeriods(dashManifestModel.getMpd(period.mpd.manifest))[0].id === period.id;
 
         return streamInfo;
     }

diff --git a/src/dash/models/DashManifestModel.js b/src/dash/models/DashManifestModel.js
@@ -281,19 +281,8 @@ function DashManifestModel() {
         return isDynamic;
     }
 
-    function getIsDVR(manifest) {
-        let isDynamic = getIsDynamic(manifest);
-        let containsDVR,
-            isDVR;
-
-        containsDVR = !isNaN(manifest.timeShiftBufferDepth);
-        isDVR = (isDynamic && containsDVR);
-
-        return isDVR;
-    }
-
     function hasProfile(manifest, profile) {
-        let has = false;
+        var has = false;
 
         if (manifest.profiles && manifest.profiles.length > 0) {
             has = (manifest.profiles.indexOf(profile) !== -1);
@@ -302,10 +291,6 @@ function DashManifestModel() {
         return has;
     }
 
-    function getIsOnDemand(manifest) {
-        return hasProfile(manifest, 'urn:mpeg:dash:profile:isoff-on-demand:2011');
-    }
-
     function getIsDVB(manifest) {
         return hasProfile(manifest, 'urn:dvb:dash:profile:dvb-dash:2014');
     }
@@ -913,8 +898,6 @@ function DashManifestModel() {
         getKID: getKID,
         getContentProtectionData: getContentProtectionData,
         getIsDynamic: getIsDynamic,
-        getIsDVR: getIsDVR,
-        getIsOnDemand: getIsOnDemand,
         getIsDVB: getIsDVB,
         getDuration: getDuration,
         getBandwidth: getBandwidth,

diff --git a/src/streaming/Stream.js b/src/streaming/Stream.js
@@ -65,7 +65,6 @@ function Stream(config) {
         streamInfo,
         updateError,
         isUpdating,
-        initialized,
         protectionController,
         liveEdgeFinder,
         playbackController,
@@ -84,7 +83,6 @@ function Stream(config) {
         streamInfo = null;
         updateError = {};
         isUpdating = false;
-        initialized = false;
 
         liveEdgeFinder = LiveEdgeFinder(context).getInstance();
         playbackController = PlaybackController(context).getInstance();
@@ -163,7 +161,6 @@ function Stream(config) {
         log = null;
         errHandler = null;
         isUpdating = false;
-        initialized = false;
         updateError = {};
 
         eventBus.off(Events.DATA_UPDATE_COMPLETED, onDataUpdateCompleted, instance);
@@ -183,10 +180,6 @@ function Stream(config) {
         return streamInfo.start;
     }
 
-    function getStreamIndex() {
-        return streamInfo.index;
-    }
-
     function getId() {
         return streamInfo.id;
     }
@@ -195,10 +188,6 @@ function Stream(config) {
         return streamInfo;
     }
 
-    function hasMedia(type) {
-        return (getMediaInfo(type) !== null);
-    }
-
     /**
      * @param {string} type
      * @returns {Array}
@@ -221,14 +210,6 @@ function Stream(config) {
         }
     }
 
-    function isActivated() {
-        return isStreamActivated;
-    }
-
-    function isInitialized() {
-        return initialized;
-    }
-
     function onProtectionError(event) {
         if (event.error) {
             errHandler.mediaKeySessionError(event.error);
@@ -430,7 +411,6 @@ function Stream(config) {
             if (streamProcessors[i].isUpdating() || isUpdating) return;
         }
 
-        initialized = true;
         if (!isMediaInitialized) return;
         if (protectionController) {
             protectionController.initialize(manifestModel.getValue(), getMediaInfo('audio'), getMediaInfo('video'));
@@ -520,7 +500,6 @@ function Stream(config) {
 
         isStreamActivated = false;
         isUpdating = true;
-        initialized = false;
         streamInfo = updatedStreamInfo;
 
         if (eventController) {
@@ -554,14 +533,10 @@ function Stream(config) {
         deactivate: deactivate,
         getDuration: getDuration,
         getStartTime: getStartTime,
-        getStreamIndex: getStreamIndex,
         getId: getId,
         getStreamInfo: getStreamInfo,
-        hasMedia: hasMedia,
         getBitrateListFor: getBitrateListFor,
         startEventController: startEventController,
-        isActivated: isActivated,
-        isInitialized: isInitialized,
         updateData: updateData,
         reset: reset,
         getProcessors: getProcessors

diff --git a/src/streaming/controllers/AbrController.js b/src/streaming/controllers/AbrController.js
@@ -305,7 +305,6 @@ function AbrController() {
                 abrController: instance,
                 streamProcessor: streamProcessorDict[type],
                 currentValue: oldQuality,
-                playbackIndex: playbackIndex,
                 switchHistory: switchHistoryDict[type],
                 droppedFramesHistory: droppedFramesHistory,
                 hasRichBuffer: hasRichBuffer(type)
@@ -590,7 +589,6 @@ function AbrController() {
                 abrController: instance,
                 streamProcessor: streamProcessorDict[type],
                 currentRequest: e.request,
-                currentValue: getQualityFor(type, streamController.getActiveStreamInfo()),
                 hasRichBuffer: hasRichBuffer(type)
             });
             let switchRequest = abrRulesCollection.shouldAbandonFragment(rulesContext);
@@ -645,7 +643,6 @@ function AbrController() {
         setUsePixelRatioInLimitBitrateByPortal: setUsePixelRatioInLimitBitrateByPortal,
         getQualityFor: getQualityFor,
         getAbandonmentStateFor: getAbandonmentStateFor,
-        setAbandonmentStateFor: setAbandonmentStateFor,
         setPlaybackQuality: setPlaybackQuality,
         checkPlaybackQuality: checkPlaybackQuality,
         setAverageThroughput: setAverageThroughput,

diff --git a/src/streaming/controllers/BufferController.js b/src/streaming/controllers/BufferController.js
@@ -446,10 +446,6 @@ function BufferController(config) {
         return streamProcessor;
     }
 
-    function setStreamProcessor(value) {
-        streamProcessor = value;
-    }
-
     function setSeekStartTime(value) {
         seekStartTime = value;
     }
@@ -466,10 +462,6 @@ function BufferController(config) {
         return bufferLevel;
     }
 
-    function getCriticalBufferLevel() {
-        return criticalBufferLevel;
-    }
-
     function setMediaSource(value) {
         mediaSource = value;
     }
@@ -526,12 +518,10 @@ function BufferController(config) {
         createBuffer: createBuffer,
         getType: getType,
         getStreamProcessor: getStreamProcessor,
-        setStreamProcessor: setStreamProcessor,
         setSeekStartTime: setSeekStartTime,
         getBuffer: getBuffer,
         setBuffer: setBuffer,
         getBufferLevel: getBufferLevel,
-        getCriticalBufferLevel: getCriticalBufferLevel,
         setMediaSource: setMediaSource,
         getMediaSource: getMediaSource,
         getIsBufferingCompleted: getIsBufferingCompleted,

diff --git a/src/streaming/controllers/PlaybackController.js b/src/streaming/controllers/PlaybackController.js
@@ -93,14 +93,6 @@ function PlaybackController() {
         return startTime + (streamInfo.duration - offset) - getTime();
     }
 
-    function isPlaybackStarted() {
-        return getTime() > 0;
-    }
-
-    function getStreamId() {
-        return streamInfo.id;
-    }
-
     function play() {
         if (videoModel && videoModel.getElement()) {
             videoModel.play();
@@ -479,8 +471,6 @@ function PlaybackController() {
         setConfig: setConfig,
         getStreamStartTime: getStreamStartTime,
         getTimeToStreamEnd: getTimeToStreamEnd,
-        isPlaybackStarted: isPlaybackStarted,
-        getStreamId: getStreamId,
         getTime: getTime,
         getPlaybackRate: getPlaybackRate,
         getPlayedRanges: getPlayedRanges,

diff --git a/src/streaming/controllers/ScheduleController.js b/src/streaming/controllers/ScheduleController.js
@@ -517,10 +517,6 @@ function ScheduleController(config) {
         return timeToLoadDelay;
     }
 
-    function getStreamProcessor() {
-        return streamProcessor;
-    }
-
     function getBufferTarget() {
         return bufferLevelRule.getBufferTarget(streamProcessor, type, streamController.isVideoTrackPresent());
     }
@@ -595,7 +591,6 @@ function ScheduleController(config) {
     instance = {
         initialize: initialize,
         getType: getType,
-        getStreamProcessor: getStreamProcessor,
         getSeekTarget: getSeekTarget,
         setSeekTarget: setSeekTarget,
         getFragmentModel: getFragmentModel,

diff --git a/src/streaming/controllers/StreamController.js b/src/streaming/controllers/StreamController.js
@@ -72,7 +72,6 @@ function StreamController() {
         protectionData,
         autoPlay,
         isStreamSwitchingInProgress,
-        isUpdating,
         hasMediaError,
         hasInitialisationError,
         mediaSource,
@@ -90,7 +89,6 @@ function StreamController() {
         mediaPlayerModel = MediaPlayerModel(context).getInstance();
         autoPlay = true;
         isStreamSwitchingInProgress = false;
-        isUpdating = false;
         isPaused = false;
         initialPlayback = true;
         playListMetrics = null;
@@ -594,18 +592,10 @@ function StreamController() {
         reset();
     }
 
-    function getAutoPlay() {
-        return autoPlay;
-    }
-
     function getActiveStreamInfo() {
         return activeStream ? activeStream.getStreamInfo() : null;
     }
 
-    function isStreamActive(streamInfo) {
-        return (activeStream.getId() === streamInfo.id);
-    }
-
     function getStreamById(id) {
         return streams.filter(function (item) {
             return item.getId() === id;
@@ -702,7 +692,6 @@ function StreamController() {
         liveEdgeFinder.reset();
         initCache.reset();
         isStreamSwitchingInProgress = false;
-        isUpdating = false;
         activeStream = null;
         hasMediaError = false;
         hasInitialisationError = false;
@@ -739,9 +728,7 @@ function StreamController() {
 
     instance = {
         initialize: initialize,
-        getAutoPlay: getAutoPlay,
         getActiveStreamInfo: getActiveStreamInfo,
-        isStreamActive: isStreamActive,
         isVideoTrackPresent: isVideoTrackPresent,
         getStreamById: getStreamById,
         getTimeRelativeToStreamId: getTimeRelativeToStreamId,

diff --git a/src/streaming/rules/RulesContext.js b/src/streaming/rules/RulesContext.js
@@ -37,8 +37,6 @@ function RulesContext(config) {
     let abrController = config.abrController;
     let sp = config.streamProcessor;
     let representationInfo = config.streamProcessor.getCurrentRepresentationInfo();
-    let currentValue = config.currentValue;
-    let playbackIndex = config.playbackIndex;
     let switchHistory = config.switchHistory;
     let droppedFramesHistory = config.droppedFramesHistory;
     let currentRequest = config.currentRequest;
@@ -60,10 +58,6 @@ function RulesContext(config) {
         return representationInfo;
     }
 
-    function getCurrentValue() {
-        return currentValue;
-    }
-
     function getStreamProcessor() {
         return sp;
     }
@@ -72,10 +66,6 @@ function RulesContext(config) {
         return abrController;
     }
 
-    function getPlaybackIndex() {
-        return playbackIndex;
-    }
-
     function getSwitchHistory() {
         return switchHistory;
     }
@@ -94,9 +84,7 @@ function RulesContext(config) {
 
     instance = {
         getMediaType: getMediaType,
-        getCurrentValue: getCurrentValue,
         getMediaInfo: getMediaInfo,
-        getPlaybackIndex: getPlaybackIndex,
         getDroppedFramesHistory: getDroppedFramesHistory,
         getCurrentRequest: getCurrentRequest,
         getSwitchHistory: getSwitchHistory,

diff --git a/src/streaming/rules/abr/ABRRulesCollection.js b/src/streaming/rules/abr/ABRRulesCollection.js
@@ -116,17 +116,6 @@ function ABRRulesCollection(config) {
         });
     }
 
-    function getRules(type) {
-        switch (type) {
-            case QUALITY_SWITCH_RULES:
-                return qualitySwitchRules;
-            case ABANDON_FRAGMENT_RULES:
-                return abandonFragmentRules;
-            default:
-                return null;
-        }
-    }
-
     function getActiveRules(srArray) {
         return srArray.filter(sr => sr.quality > SwitchRequest.NO_CHANGE);
     }
@@ -203,7 +192,6 @@ function ABRRulesCollection(config) {
     instance = {
         initialize: initialize,
         reset: reset,
-        getRules: getRules,
         getMaxQuality: getMaxQuality,
         shouldAbandonFragment: shouldAbandonFragment
     };

diff --git a/src/streaming/text/NotFragmentedTextBufferController.js b/src/streaming/text/NotFragmentedTextBufferController.js
@@ -116,10 +116,6 @@ function NotFragmentedTextBufferController(config) {
         return mediaSource;
     }
 
-    function setStreamProcessor(value) {
-        streamProcessor = value;
-    }
-
     function getStreamProcessor() {
         return streamProcessor;
     }
@@ -132,10 +128,6 @@ function NotFragmentedTextBufferController(config) {
         return 0;
     }
 
-    function getCriticalBufferLevel() {
-        return 0;
-    }
-
     function reset(errored) {
 
         eventBus.off(Events.DATA_UPDATE_COMPLETED, onDataUpdateCompleted, this);
@@ -186,12 +178,10 @@ function NotFragmentedTextBufferController(config) {
         createBuffer: createBuffer,
         getType: getType,
         getStreamProcessor: getStreamProcessor,
-        setStreamProcessor: setStreamProcessor,
         setSeekStartTime: setSeekStartTime,
         getBuffer: getBuffer,
         setBuffer: setBuffer,
         getBufferLevel: getBufferLevel,
-        getCriticalBufferLevel: getCriticalBufferLevel,
         setMediaSource: setMediaSource,
         getMediaSource: getMediaSource,
         getIsBufferingCompleted: getIsBufferingCompleted,