Refactoring code

src/core/events/CoreEvents.js

@@ -51,7 +51,8 @@ class CoreEvents extends EventsBase {
         this.DATA_UPDATE_STARTED = 'dataUpdateStarted';
         this.INITIALIZATION_LOADED = 'initializationLoaded';
         this.INIT_FRAGMENT_LOADED = 'initFragmentLoaded';
-        this.INIT_REQUESTED = 'initRequested';
+        this.INIT_DATA_NEEDED = 'initDataNeeded';
+        this.NEW_FRAGMENT_NEEDED = 'newFragmentNeeded';
         this.INTERNAL_MANIFEST_LOADED = 'internalManifestLoaded';
         this.LIVE_EDGE_SEARCH_COMPLETED = 'liveEdgeSearchCompleted';
         this.LOADING_COMPLETED = 'loadingCompleted';
@@ -80,6 +81,7 @@ class CoreEvents extends EventsBase {
         this.XLINK_READY = 'xlinkReady';
         this.SEGMENTBASE_INIT_REQUEST_NEEDED = 'segmentBaseInitRequestNeeded';
         this.SEGMENTBASE_SEGMENTSLIST_REQUEST_NEEDED = 'segmentBaseSegmentsListRequestNeeded';
+        this.ADD_INBAND_EVENTS_REQUESTED = 'addInbandEventsRequested';
     }
 }
 

src/dash/controllers/RepresentationController.js

@@ -51,8 +51,7 @@ function RepresentationController() {
         timelineConverter,
         dashMetrics,
         type,
-        streamId,
-        manifestModel;
+        streamId;
 
     function setup() {
         resetInitialSettings();
@@ -76,9 +75,6 @@ function RepresentationController() {
         if (config.timelineConverter) {
             timelineConverter = config.timelineConverter;
         }
-        if (config.manifestModel) {
-            manifestModel = config.manifestModel;
-        }
         if (config.type) {
             type = config.type;
         }
@@ -89,7 +85,7 @@ function RepresentationController() {
 
     function checkConfig() {
         if (!abrController || !dashMetrics || !playbackController ||
-            !timelineConverter || !manifestModel) {
+            !timelineConverter) {
             throw new Error(Constants.MISSING_CONFIG_ERROR);
         }
     }

src/mss/MssFragmentInfoController.js

@@ -176,7 +176,7 @@ function MssFragmentInfoController(config) {
     function requestFragment(request) {
 
         logger.debug('Load fragment for time: ' + request.startTime);
-        if (streamProcessor.getFragmentModel().isFragmentLoadedOrPending(request)) {
+        if (fragmentModel.isFragmentLoadedOrPending(request)) {
             // We may have reached end of timeline in case of start-over streams
             logger.debug('No more fragments');
             return;

src/mss/MssFragmentProcessor.js

@@ -161,7 +161,7 @@ function MssFragmentProcessor(config) {
 
         let request = e.request;
 
-        if (request.type === 'MediaSegment') {
+        if (request.isMediaSegmentRequest()) {
             // it's a MediaSegment, let's convert fragment
             mssFragmentMoofProcessor.convertFragment(e, sp);
 

src/mss/MssHandler.js

@@ -44,6 +44,7 @@ function MssHandler(config) {
     let eventBus = config.eventBus;
     const events = config.events;
     const constants = config.constants;
+    const initCache = config.initCache;
     const initSegmentType = config.initSegmentType;
     let dashMetrics = config.dashMetrics;
     let playbackController = config.playbackController;
@@ -64,34 +65,46 @@ function MssHandler(config) {
     function setup() {}
 
     function onInitializationRequested(e) {
-        let streamProcessor = e.sender.getStreamProcessor();
-        let request = new FragmentRequest();
-        let representationController = streamProcessor.getRepresentationController();
-        let representation = representationController.getCurrentRepresentation();
-
-        request.mediaType = representation.adaptation.type;
-        request.type = initSegmentType;
-        request.range = representation.range;
-        request.quality = representation.index;
-        request.mediaInfo = streamProcessor.getMediaInfo();
-        request.representationId = representation.id;
-
-        const chunk = createDataChunk(request, streamProcessor.getStreamInfo().id, e.type !== events.FRAGMENT_LOADING_PROGRESS);
-
-        try {
-            // Generate initialization segment (moov)
-            chunk.bytes = mssFragmentProcessor.generateMoov(representation);
-        } catch (e) {
-            config.errHandler.error(new DashJSError(e.code, e.message, e.data));
-        }
+        let streamController = playbackController.getStreamController();
 
-        eventBus.trigger(events.INIT_FRAGMENT_LOADED, {
-            chunk: chunk,
-            fragmentModel: streamProcessor.getFragmentModel()
-        });
+        if (streamController) {
+            let streamProcessor =  streamController.getActiveStreamProcessors().find((sp) => {
+                return sp.getType() === e.sender.getType();
+            });
+            const streamInfo = streamProcessor.getStreamInfo();
+            const streamId = streamInfo ? streamInfo.id : null;
+            let representationController = streamProcessor.getRepresentationController();
+            let representation = representationController.getCurrentRepresentation();
+
+            const chunk = initCache.extract(streamId, representation.id);
+            //if chunk has already created, bufferController will push it from the cache directly, not need to build init segment again
+            if (!chunk) {
+                let request = new FragmentRequest();
+
+                request.mediaType = representation.adaptation.type;
+                request.type = initSegmentType;
+                request.range = representation.range;
+                request.quality = representation.index;
+                request.mediaInfo = streamProcessor.getMediaInfo();
+                request.representationId = representation.id;
+
+                const chunk = createDataChunk(request, streamId, e.type !== events.FRAGMENT_LOADING_PROGRESS);
+
+                try {
+                    // Generate initialization segment (moov)
+                    chunk.bytes = mssFragmentProcessor.generateMoov(representation);
+                } catch (e) {
+                    config.errHandler.error(new DashJSError(e.code, e.message, e.data));
+                }
+
+                eventBus.trigger(events.INIT_FRAGMENT_LOADED, {
+                    chunk: chunk
+                });
 
-        // Change the sender value to stop event to be propagated
-        e.sender = null;
+                // Change the representationId value to stop event to be propagated
+                e.representationId = null;
+            }
+        }
     }
 
     function createDataChunk(request, streamId, endFragment) {
@@ -157,14 +170,21 @@ function MssHandler(config) {
         if (e.error) {
             return;
         }
-        // Process moof to transcode it from MSS to DASH
-        let streamProcessor = e.sender.getStreamProcessor();
-        mssFragmentProcessor.processFragment(e, streamProcessor);
 
-        // Start MssFragmentInfoControllers in case of start-over streams
-        let streamInfo = streamProcessor.getStreamInfo();
-        if (!streamInfo.manifestInfo.isDynamic && streamInfo.manifestInfo.DVRWindowSize !== Infinity) {
-            startFragmentInfoControllers();
+        let streamController = playbackController.getStreamController();
+
+        if (streamController) {
+            let streamProcessor =  streamController.getActiveStreamProcessors().find((sp) => {
+                return sp.getType() === e.request.mediaType;
+            });
+            // Process moof to transcode it from MSS to DASH
+            mssFragmentProcessor.processFragment(e, streamProcessor);
+
+            // Start MssFragmentInfoControllers in case of start-over streams
+            let streamInfo = streamProcessor.getStreamInfo();
+            if (!streamInfo.manifestInfo.isDynamic && streamInfo.manifestInfo.DVRWindowSize !== Infinity) {
+                startFragmentInfoControllers();
+            }
         }
     }
 
@@ -189,15 +209,15 @@ function MssHandler(config) {
     }
 
     function registerEvents() {
-        eventBus.on(events.INIT_REQUESTED, onInitializationRequested, instance, dashjs.FactoryMaker.getSingletonFactoryByName(eventBus.getClassName()).EVENT_PRIORITY_HIGH); /* jshint ignore:line */
+        eventBus.on(events.INIT_DATA_NEEDED, onInitializationRequested, instance, dashjs.FactoryMaker.getSingletonFactoryByName(eventBus.getClassName()).EVENT_PRIORITY_HIGH); /* jshint ignore:line */
         eventBus.on(events.PLAYBACK_PAUSED, onPlaybackPaused, instance, dashjs.FactoryMaker.getSingletonFactoryByName(eventBus.getClassName()).EVENT_PRIORITY_HIGH); /* jshint ignore:line */
         eventBus.on(events.PLAYBACK_SEEK_ASKED, onPlaybackSeekAsked, instance, dashjs.FactoryMaker.getSingletonFactoryByName(eventBus.getClassName()).EVENT_PRIORITY_HIGH); /* jshint ignore:line */
         eventBus.on(events.FRAGMENT_LOADING_COMPLETED, onSegmentMediaLoaded, instance, dashjs.FactoryMaker.getSingletonFactoryByName(eventBus.getClassName()).EVENT_PRIORITY_HIGH); /* jshint ignore:line */
         eventBus.on(events.TTML_TO_PARSE, onTTMLPreProcess, instance);
     }
 
     function reset() {
-        eventBus.off(events.INIT_REQUESTED, onInitializationRequested, this);
+        eventBus.off(events.INIT_DATA_NEEDED, onInitializationRequested, this);
         eventBus.off(events.PLAYBACK_PAUSED, onPlaybackPaused, this);
         eventBus.off(events.PLAYBACK_SEEK_ASKED, onPlaybackSeekAsked, this);
         eventBus.off(events.FRAGMENT_LOADING_COMPLETED, onSegmentMediaLoaded, this);

src/streaming/MediaPlayer.js

@@ -48,6 +48,7 @@ import AbrController from './controllers/AbrController';
 import VideoModel from './models/VideoModel';
 import CmcdModel from './models/CmcdModel';
 import DOMStorage from './utils/DOMStorage';
+import InitCache from './utils/InitCache';
 import Debug from './../core/Debug';
 import Errors from './../core/errors/Errors';
 import EventBus from './../core/EventBus';
@@ -2009,7 +2010,8 @@ function MediaPlayer() {
                 initSegmentType: HTTPRequest.INIT_SEGMENT_TYPE,
                 BASE64: BASE64,
                 ISOBoxer: ISOBoxer,
-                settings: settings
+                settings: settings,
+                initCache: InitCache(context).getInstance()
             });
         }
     }

src/streaming/Stream.js

@@ -104,11 +104,13 @@ function Stream(config) {
     function registerEvents() {
         eventBus.on(Events.BUFFERING_COMPLETED, onBufferingCompleted, instance);
         eventBus.on(Events.DATA_UPDATE_COMPLETED, onDataUpdateCompleted, instance);
+        eventBus.on(Events.ADD_INBAND_EVENTS_REQUESTED, onAddInbandEventsRequested, instance);
     }
 
     function unRegisterEvents() {
         eventBus.off(Events.DATA_UPDATE_COMPLETED, onDataUpdateCompleted, instance);
         eventBus.off(Events.BUFFERING_COMPLETED, onBufferingCompleted, instance);
+        eventBus.off(Events.ADD_INBAND_EVENTS_REQUESTED, onAddInbandEventsRequested, instance);
     }
 
     function registerProtectionEvents() {
@@ -170,8 +172,7 @@ function Stream(config) {
         let ln = streamProcessors ? streamProcessors.length : 0;
         const errored = false;
         for (let i = 0; i < ln; i++) {
-            let fragmentModel = streamProcessors[i].getFragmentModel();
-            fragmentModel.removeExecutedRequestsBeforeTime(getStartTime() + getDuration());
+            streamProcessors[i].removeExecutedRequestsBeforeTime(getStartTime() + getDuration());
             streamProcessors[i].reset(errored, keepBuffers);
         }
         streamProcessors = [];
@@ -254,10 +255,6 @@ function Stream(config) {
         return streamInfo;
     }
 
-    function getFragmentController() {
-        return fragmentController;
-    }
-
     function getThumbnailController() {
         return thumbnailController;
     }
@@ -357,7 +354,7 @@ function Stream(config) {
             if (mediaInfo.type !== Constants.FRAGMENTED_TEXT) {
                 abrController.updateTopQualityIndex(mediaInfo);
                 processor.switchTrackAsked();
-                processor.getFragmentModel().abortRequests();
+                processor.abortRequests();
             } else {
                 processor.getScheduleController().setSeekTarget(currentTime);
                 processor.setIndexHandlerTime(currentTime);
@@ -386,7 +383,8 @@ function Stream(config) {
             settings: settings
         });
 
-        streamProcessor.initialize(mediaSource);
+        streamProcessor.initialize(mediaSource, fragmentController.getModel(getId(), mediaInfo ? mediaInfo.type : null));
+
         abrController.updateTopQualityIndex(mediaInfo);
 
         if (optionalSettings) {
@@ -489,9 +487,11 @@ function Stream(config) {
         eventController.addInlineEvents(events);
     }
 
-    function addInbandEvents (events) {
+    function onAddInbandEventsRequested (eventObj) {
+        if (eventObj.sender.getStreamInfo() !== getStreamInfo()) return;
+
         if (eventController) {
-            eventController.addInbandEvents(events);
+            eventController.addInbandEvents(eventObj.events);
         }
     }
 
@@ -858,7 +858,6 @@ function Stream(config) {
         getId: getId,
         getStreamInfo: getStreamInfo,
         preload: preload,
-        getFragmentController: getFragmentController,
         getThumbnailController: getThumbnailController,
         getBitrateListFor: getBitrateListFor,
         startEventController: startEventController,
@@ -869,8 +868,7 @@ function Stream(config) {
         setMediaSource: setMediaSource,
         isMediaCodecCompatible: isMediaCodecCompatible,
         isProtectionCompatible: isProtectionCompatible,
-        getPreloaded: getPreloaded,
-        addInbandEvents: addInbandEvents
+        getPreloaded: getPreloaded
     };
 
     setup();