Fix/dash callback events (Dash-Industry-Forum#4722)

* Fix DASH callback event mechanism. CommonMediaRequest and CommonMediaResponse objects were missing

* Adjust XHR call in ThumbnailTracks.js to use commonMediaRequest and commonMediaResponse

* Fix code style

Author: dsilhavy

src/streaming/controllers/EventController.js

@@ -34,6 +34,8 @@ import Debug from '../../core/Debug.js';
 import EventBus from '../../core/EventBus.js';
 import MediaPlayerEvents from '../../streaming/MediaPlayerEvents.js';
 import XHRLoader from '../net/XHRLoader.js';
+import CommonMediaRequest from '../vo/CommonMediaRequest.js';
+import CommonMediaResponse from '../vo/CommonMediaResponse.js';
 
 function EventController() {
 
@@ -549,13 +551,16 @@ function EventController() {
     function _sendCallbackRequest(url) {
         try {
             let loader = XHRLoader(context).create({});
-            loader.load({
-                method: 'get',
-                url: url,
-                request: {
-                    responseType: 'arraybuffer'
+            const commonMediaRequest = new CommonMediaRequest(
+                {
+                    method: 'get',
+                    url: url,
+                    responseType: 'arraybuffer',
+                    customData: {}
                 }
-            });
+            );
+            const commonMediaResponse = new CommonMediaResponse({ request: commonMediaRequest });
+            loader.load(commonMediaRequest, commonMediaResponse);
         } catch (e) {
             logger.error(e);
         }

src/streaming/net/XHRLoader.js

@@ -74,10 +74,12 @@ function XHRLoader() {
             commonMediaResponse.headers = Utils.parseHttpHeaders(this.getAllResponseHeaders());
             commonMediaResponse.data = this.response;
         }
-        xhr.onloadend = commonMediaRequest.customData.onloadend;
-        xhr.onprogress = commonMediaRequest.customData.onprogress;
-        xhr.onabort = commonMediaRequest.customData.onabort;
-        xhr.ontimeout = commonMediaRequest.customData.ontimeout;
+        if (commonMediaRequest.customData) {
+            xhr.onloadend = commonMediaRequest.customData.onloadend;
+            xhr.onprogress = commonMediaRequest.customData.onprogress;
+            xhr.onabort = commonMediaRequest.customData.onabort;
+            xhr.ontimeout = commonMediaRequest.customData.ontimeout;
+        }
 
         xhr.send();
 

src/streaming/thumbnail/ThumbnailTracks.js

@@ -38,6 +38,8 @@ import BoxParser from '../../streaming/utils/BoxParser.js';
 import XHRLoader from '../../streaming/net/XHRLoader.js';
 import DashHandler from '../../dash/DashHandler.js';
 import SegmentsController from '../../dash/controllers/SegmentsController.js';
+import CommonMediaRequest from '../vo/CommonMediaRequest.js';
+import CommonMediaResponse from '../vo/CommonMediaResponse.js';
 
 function ThumbnailTracks(config) {
     const context = this.context;
@@ -192,27 +194,31 @@ function ThumbnailTracks(config) {
                 representation.segments.some((ss) => {
                     if (ss.mediaStartTime <= time && ss.mediaStartTime + ss.duration > time) {
                         const baseURL = baseURLController.resolve(representation.path);
-                        loader.load({
+                        const commonMediaRequest = new CommonMediaRequest({
                             method: 'get',
                             url: baseURL.url,
-                            request: {
-                                range: ss.mediaRange,
-                                responseType: 'arraybuffer'
-                            },
-                            onload: function (e) {
-                                let info = boxParser.getSamplesInfo(e.target.response);
-                                let blob = new Blob([e.target.response.slice(info.sampleList[0].offset, info.sampleList[0].offset + info.sampleList[0].size)], { type: 'image/jpeg' });
-                                let imageUrl = window.URL.createObjectURL(blob);
-                                cache.push({
-                                    start: ss.mediaStartTime,
-                                    end: ss.mediaStartTime + ss.duration,
-                                    url: imageUrl
-                                });
-                                if (callback) {
-                                    callback(imageUrl);
+                            responseType: 'arraybuffer',
+                            customData: {
+                                request: {
+                                    range: ss.mediaRange,
+                                },
+                                onloadend: function (e) {
+                                    let info = boxParser.getSamplesInfo(e.target.response);
+                                    let blob = new Blob([e.target.response.slice(info.sampleList[0].offset, info.sampleList[0].offset + info.sampleList[0].size)], { type: 'image/jpeg' });
+                                    let imageUrl = window.URL.createObjectURL(blob);
+                                    cache.push({
+                                        start: ss.mediaStartTime,
+                                        end: ss.mediaStartTime + ss.duration,
+                                        url: imageUrl
+                                    });
+                                    if (callback) {
+                                        callback(imageUrl);
+                                    }
                                 }
-                            }
-                        });
+                            },
+                        })
+                        const commonMediaResponse = new CommonMediaResponse({ request: commonMediaRequest });
+                        loader.load(commonMediaRequest, commonMediaResponse);
                         return true;
                     }
                 });