ovenplayer 0.10.2 → 0.10.3-3.alpha-2

package/src/js/api/provider/html5/providers/Dash.js

@@ -10,7 +10,7 @@ import {
     STATE_AD_PLAYING,
     STATE_AD_PAUSED,
     INIT_DASH_UNSUPPORT,
-    INIT_DASH_NOTFOUND,
+    INIT_DASH_FAIL,
     ERRORS,
     PLAYER_UNKNWON_NETWORK_ERROR,
     CONTENT_LEVEL_CHANGED,
@@ -43,40 +43,26 @@ const Dash = function (element, playerConfig, adTagUrl) {
 
     try {
 
-        if (dashjs.Version < "2.6.5") {
+        if (dashjs.Version < "3.0.0") {
             throw ERRORS.codes[INIT_DASH_UNSUPPORT];
         }
 
         const coveredSetAutoSwitchQualityFor = function (isAuto) {
 
-            if (dashjs.Version >= '3.0.0') {
-                dash.updateSettings({
-                    streaming: {
-                        abr: {
-                            autoSwitchBitrate: {
-                                video: isAuto
-                            }
+            dash.updateSettings({
+                streaming: {
+                    abr: {
+                        autoSwitchBitrate: {
+                            video: isAuto
                         }
                     }
-                });
-            } else if (dashjs.Version > "2.9.0") {
-                dash.setAutoSwitchQualityFor("video", isAuto);
-            } else {
-                dash.setAutoSwitchQualityFor(isAuto);
-            }
+                }
+            });
         };
 
         const coveredGetAutoSwitchQualityFor = function () {
-            let result = "";
 
-            if (dashjs.Version >= '3.0.0') {
-                result = dash.getSettings().streaming.abr.autoSwitchBitrate.video;
-            } else if (dashjs.Version > "2.9.0") {
-                result = dash.getAutoSwitchQualityFor("video");
-            } else {
-                result = dash.getAutoSwitchQualityFor();
-            }
-            return result;
+            return dash.getSettings().streaming.abr.autoSwitchBitrate.video;
         };
 
         const liveDelayReducingCallback = function () {
@@ -124,122 +110,71 @@ const Dash = function (element, playerConfig, adTagUrl) {
 
             OvenPlayerConsole.log("DASH : Attach File : ", source, "lastPlayPosition : " + lastPlayPosition);
 
-            that.trigger(DASH_PREPARED, dash);
-
             coveredSetAutoSwitchQualityFor(true);
             sourceOfFile = source.file;
 
-            dash.off(dashjs.MediaPlayer.events.PLAYBACK_PLAYING, liveDelayReducingCallback);
+            // dash.off(dashjs.MediaPlayer.events.PLAYBACK_PLAYING, liveDelayReducingCallback);
 
             if (source.lowLatency === true) {
 
                 prevLLLiveDuration = null;
 
-                if (dashjs.Version >= '3.0.0') {
-
-                    dash.updateSettings({
-                        streaming: {
-                            lowLatencyEnabled: source.lowLatency
-                        }
-                    });
-
-                } else {
-
-                    dash.setLowLatencyEnabled(source.lowLatency);
-                }
-
-                if (playerConfig.getConfig().lowLatencyMpdLiveDelay && typeof(playerConfig.getConfig().lowLatencyMpdLiveDelay) === 'number') {
-
-                    if (dashjs.Version >= '3.0.0') {
-
-                        dash.updateSettings({
-                            streaming: {
-                                liveDelay: playerConfig.getConfig().lowLatencyMpdLiveDelay
-                            }
-                        });
-                    } else {
-                        dash.setLiveDelay(playerConfig.getConfig().lowLatencyMpdLiveDelay);
+                dash.updateSettings({
+                    streaming: {
+                        lowLatencyEnabled: source.lowLatency
                     }
-                }
-
-                dash.on(dashjs.MediaPlayer.events.PLAYBACK_PLAYING, liveDelayReducingCallback);
-
-            } else {
+                });
 
-                if (dashjs.Version >= '3.0.0') {
+                if (playerConfig.getConfig().lowLatencyMpdLiveDelay && typeof(playerConfig.getConfig().lowLatencyMpdLiveDelay) === 'number') {
 
                     dash.updateSettings({
                         streaming: {
-                            lowLatencyEnabled: false,
-                            liveDelay: undefined
+                            liveDelay: playerConfig.getConfig().lowLatencyMpdLiveDelay
                         }
                     });
-
-                } else {
-
-                    dash.setLowLatencyEnabled(false);
-                    dash.setLiveDelay();
                 }
 
-            }
+                // dash.on(dashjs.MediaPlayer.events.PLAYBACK_PLAYING, liveDelayReducingCallback);
 
-            if (dashjs.Version >= '3.0.0') {
+            } else {
 
                 dash.updateSettings({
-                    debug: {
-                        logLevel: dashjs.Debug.LOG_LEVEL_NONE
+                    streaming: {
+                        lowLatencyEnabled: false,
+                        liveDelay: undefined
                     }
                 });
 
-            } else {
+            }
+
+            dash.updateSettings({
+                debug: {
+                    logLevel: dashjs.Debug.LOG_LEVEL_NONE
+                }
+            });
+
+            let dashConfigFromPlayerConfig = playerConfig.getConfig().dashConfig;
 
-                dash.getDebug().setLogToBrowserConsole(false);
+            if (dashConfigFromPlayerConfig) {
+                dash.updateSettings(dashConfigFromPlayerConfig);
             }
 
+            that.trigger(DASH_PREPARED, dash);
+
             dash.attachSource(sourceOfFile);
 
             seekPosition_sec = lastPlayPosition;
-
         });
 
         superPlay_func = that.super('play');
         superDestroy_func = that.super('destroy');
         OvenPlayerConsole.log("DASH PROVIDER LOADED.");
 
-        let loadingRetryCount = playerConfig.getConfig().loadingRetryCount;
-
         dash.on(dashjs.MediaPlayer.events.ERROR, function (error) {
 
-            // Handle mpd load error.
-            if (error &&
-                (
-                    error.error.code === dashjs.MediaPlayer.errors.DOWNLOAD_ERROR_ID_MANIFEST_CODE ||
-                    error.error.code === dashjs.MediaPlayer.errors.MANIFEST_LOADER_LOADING_FAILURE_ERROR_CODE
-                )) {
-
-                if (loadingRetryCount > 0) {
-
-                    that.setState(STATE_LOADING);
-
-                    if (loadRetryer) {
-                        clearTimeout(loadRetryer);
-                        loadRetryer = null;
-                    }
-
-                    loadingRetryCount = loadingRetryCount - 1;
-
-                    loadRetryer = setTimeout(function () {
-
-
-                        dash.attachSource(sourceOfFile);
-                    }, 1000);
-                } else {
-
-                    let tempError = ERRORS.codes[PLAYER_UNKNWON_NETWORK_ERROR];
-                    tempError.error = error;
-                    errorTrigger(tempError, that);
-                }
-            }
+            let tempError = ERRORS.codes[PLAYER_UNKNWON_NETWORK_ERROR];
+            tempError.error = error;
+            errorTrigger(tempError, that);
         });
 
         dash.on(dashjs.MediaPlayer.events.QUALITY_CHANGE_REQUESTED, function (event) {
@@ -288,12 +223,6 @@ const Dash = function (element, playerConfig, adTagUrl) {
                 dash.seek(seekPosition_sec);
             }
 
-            // if (playerConfig.isAutoStart() && !runedAutoStart) {
-            //     OvenPlayerConsole.log("DASH : AUTOPLAY()!");
-            //     that.play();
-            //     runedAutoStart = true;
-            // }
-
         });
 
         that.play = (mutedPlay) => {
@@ -344,7 +273,7 @@ const Dash = function (element, playerConfig, adTagUrl) {
         if (error && error.code && error.code === INIT_DASH_UNSUPPORT) {
             throw error;
         } else {
-            let tempError = ERRORS.codes[INIT_DASH_NOTFOUND];
+            let tempError = ERRORS.codes[INIT_DASH_FAIL];
             tempError.error = error;
             throw tempError;
         }

package/src/js/api/provider/html5/providers/Hls.js

@@ -6,18 +6,17 @@ import {errorTrigger} from "api/provider/utils";
 import {
     PROVIDER_HLS,
     PLAYER_STATE, STATE_IDLE, STATE_LOADING,
-    INIT_DASH_UNSUPPORT, ERRORS,
-    INIT_HLSJS_NOTFOUND
-} from "api/constants";
-import _ from "utils/underscore";
-import {
-    PLAYER_UNKNWON_ERROR,
+    ERRORS,
+    INIT_HLSJS_FAIL,
+    HLS_PREPARED,
+    HLS_DESTROYED,
     PLAYER_UNKNWON_NETWORK_ERROR,
-    PLAYER_UNKNWON_DECODE_ERROR,
     PLAYER_BAD_REQUEST_ERROR,
     PLAYER_AUTH_FAILED_ERROR,
-    PLAYER_NOT_ACCEPTABLE_ERROR
-} from "../../../constants";
+    PLAYER_NOT_ACCEPTABLE_ERROR, STATE_PLAYING, CONTENT_LEVEL_CHANGED, AUDIO_TRACK_CHANGED
+} from "api/constants";
+
+import sizeHumanizer from "utils/sizeHumanizer";
 
 /**
  * @brief   hlsjs provider extended core.
@@ -35,13 +34,10 @@ const HlsProvider = function (element, playerConfig, adTagUrl) {
     let isManifestLoaded = false;
     let firstLoaded = false;
 
-
     try {
 
         let hlsConfig = {
-            debug: false,
-            maxBufferLength: 20,
-            maxMaxBufferLength: 30
+            debug: false
         };
 
         let hlsConfigFromPlayerConfig = playerConfig.getConfig().hlsConfig;
@@ -53,6 +49,23 @@ const HlsProvider = function (element, playerConfig, adTagUrl) {
             }
         }
 
+        if (playerConfig.getConfig().licenseCustomHeader) {
+
+
+            const licenseXhrSetup = function (xhr, url, keyContext, licenseChallenge) {
+
+                xhr.withCredentials = true;
+
+                xhr.open('POST', url, true);
+
+                xhr.setRequestHeader(playerConfig.getConfig().licenseCustomHeader.key, playerConfig.getConfig().licenseCustomHeader.value);
+
+                return Promise.resolve({xhr, licenseChallenge});
+            };
+
+            hlsConfig.licenseXhrSetup = licenseXhrSetup
+        }
+
         hls = new Hls(hlsConfig);
 
         window.op_hls = hls;
@@ -70,10 +83,13 @@ const HlsProvider = function (element, playerConfig, adTagUrl) {
             seeking: false,
             state: STATE_IDLE,
             buffer: 0,
+            dvrWindow: 0,
             framerate: 0,
             currentQuality: -1,
-            currentSource: -1,
             qualityLevels: [],
+            currentAudioTrack: -1,
+            audioTracks: [],
+            currentSource: -1,
             sources: [],
             adTagUrl: adTagUrl
         };
@@ -82,13 +98,42 @@ const HlsProvider = function (element, playerConfig, adTagUrl) {
 
             OvenPlayerConsole.log("HLS : onExtendedLoad : ", source, "lastPlayPosition : " + lastPlayPosition);
 
-            let loadingRetryCount = playerConfig.getConfig().loadingRetryCount;
+            that.trigger(HLS_PREPARED, hls);
 
             hls.loadSource(source.file);
 
             hls.once(Hls.Events.MANIFEST_LOADED, function (event, data) {
 
                 isManifestLoaded = true;
+
+                for (let i = 0; i < hls.levels.length; i++) {
+
+                    let qualityLevel = hls.levels[i];
+
+                    spec.qualityLevels.push({
+                        bitrate: qualityLevel.bitrate,
+                        height: qualityLevel.height,
+                        width: qualityLevel.width,
+                        index: i,
+                        label: qualityLevel.width + "x" + qualityLevel.height + ", " + sizeHumanizer(qualityLevel.bitrate, true, "bps")
+                    });
+                }
+
+                spec.currentQuality = hls.firstLevel;
+
+                for (let i = 0; i < hls.audioTracks.length; i++) {
+
+                    let audioTrack = hls.audioTracks[i];
+
+                    spec.audioTracks.push({
+                        index: audioTrack.id,
+                        label: audioTrack.name
+                    });
+
+                    if (audioTrack.default === true) {
+                        spec.currentAudioTrack = audioTrack.id;
+                    }
+                }
             });
 
             hls.once(Hls.Events.LEVEL_LOADED, function (event, data) {
@@ -110,6 +155,32 @@ const HlsProvider = function (element, playerConfig, adTagUrl) {
                 }
             });
 
+            hls.on(Hls.Events.LEVEL_SWITCHED, function (event, data) {
+
+                spec.currentQuality = data.level;
+
+                that.trigger(CONTENT_LEVEL_CHANGED, {
+                    isAuto: hls.autoLevelEnabled,
+                    currentQuality: spec.currentQuality,
+                    type: "render"
+                });
+            });
+
+            hls.on(Hls.Events.AUDIO_TRACK_SWITCHED, function (event, data) {
+
+                spec.currentAudioTrack = data.id;
+                that.trigger(AUDIO_TRACK_CHANGED, {
+                    currentAudioTrack: spec.currentAudioTrack
+                });
+            });
+
+            hls.on(Hls.Events.LEVEL_UPDATED, function (event, data) {
+                if (data && data.details) {
+                    spec.dvrWindow = data.details.totalduration;
+                }
+
+            });
+
             hls.on(Hls.Events.ERROR, function (event, data) {
 
                 if (data && data.networkDetails && data.networkDetails.status === 202) {
@@ -132,89 +203,27 @@ const HlsProvider = function (element, playerConfig, adTagUrl) {
 
                     }, 1000);
 
-                } else {
-
-                    hls.once(Hls.Events.FRAG_LOADING, function () {
-                        that.setState(STATE_LOADING);
-                    });
-
-                    if (data.type === Hls.ErrorTypes.MEDIA_ERROR) {
-
-                        if (!data.fatal) {
-                            // do nothing when non fatal media error. hlsjs will recover it automatically.
-                            return;
-                        }
-                    }
-
-                    if (loadingRetryCount > 0) {
-
-                        that.setState(STATE_LOADING);
-
-                        if (loadRetryer) {
-                            clearTimeout(loadRetryer);
-                            loadRetryer = null;
-                        }
-
-                        loadingRetryCount = loadingRetryCount - 1;
-
-                        if (data.type === Hls.ErrorTypes.NETWORK_ERROR) {
-
-                            loadRetryer = setTimeout(function () {
-
-                                that.stop();
-
-                                if (hls) {
-
-                                    hls.stopLoad();
-                                    hls.startLoad();
-                                }
-
-                                that.play();
-                            }, 1000);
-                        } else if (data.type === Hls.ErrorTypes.MEDIA_ERROR) {
-
-                            loadRetryer = setTimeout(function () {
-
-                                if (hls) {
-
-                                    hls.recoverMediaError();
-                                }
-
-                                that.play();
-                            }, 1000);
-                        } else {
-
-                            loadRetryer = setTimeout(function () {
-
-                                that.stop();
-
-                                if (hls) {
-
-                                    hls.stopLoad();
-                                    hls.startLoad();
-                                }
-
-                                that.play();
-                            }, 1000);
-                        }
-
-                    } else {
+                    return;
+                }
 
-                        let errorType = PLAYER_UNKNWON_NETWORK_ERROR;
+                if (!data.fatal) {
+                    // do nothing when non fatal error. hlsjs will recover it automatically.
+                    return;
+                }
 
-                        if (data && data.networkDetails && data.networkDetails.status === 400) {
-                            errorType = PLAYER_BAD_REQUEST_ERROR;
-                        } else if (data && data.networkDetails && data.networkDetails.status === 403) {
-                            errorType = PLAYER_AUTH_FAILED_ERROR;
-                        } else if (data && data.networkDetails && data.networkDetails.status === 406) {
-                            errorType = PLAYER_NOT_ACCEPTABLE_ERROR;
-                        }
+                let errorType = PLAYER_UNKNWON_NETWORK_ERROR;
 
-                        let tempError = ERRORS.codes[errorType];
-                        tempError.error = data.details;
-                        errorTrigger(tempError, that);
-                    }
+                if (data && data.networkDetails && data.networkDetails.status === 400) {
+                    errorType = PLAYER_BAD_REQUEST_ERROR;
+                } else if (data && data.networkDetails && data.networkDetails.status === 403) {
+                    errorType = PLAYER_AUTH_FAILED_ERROR;
+                } else if (data && data.networkDetails && data.networkDetails.status === 406) {
+                    errorType = PLAYER_NOT_ACCEPTABLE_ERROR;
                 }
+
+                let tempError = ERRORS.codes[errorType];
+                tempError.error = data.details;
+                errorTrigger(tempError, that);
             });
 
             that.on(PLAYER_STATE, function (data) {
@@ -234,11 +243,38 @@ const HlsProvider = function (element, playerConfig, adTagUrl) {
             });
         });
 
-        superDestroy_func = that.super('destroy');
-        OvenPlayerConsole.log("HLS PROVIDER LOADED.");
+        that.setCurrentQuality = (qualityIndex) => {
 
-        superStop_func = that.super('stop');
+            hls.currentLevel = qualityIndex;
+            spec.currentQuality = qualityIndex;
+
+            return spec.currentQuality;
+        };
 
+        that.isAutoQuality = () => {
+            return hls.autoLevelEnabled;
+        };
+
+        that.setAutoQuality = (isAuto) => {
+            if (isAuto) {
+                hls.currentLevel = -1;
+            } else {
+                hls.currentLevel = hls.currentLevel;
+            }
+        };
+
+        that.setCurrentAudioTrack = (audioTrackIndex) => {
+            hls.audioTrack = audioTrackIndex;
+            spec.currentAudioTrack = audioTrackIndex;
+
+            return spec.currentAudioTrack;
+        };
+
+        that.getDuration = () => {
+            return element.duration;
+        }
+
+        superStop_func = that.super('stop');
         that.stop = () => {
 
             if (loadRetryer) {
@@ -254,6 +290,7 @@ const HlsProvider = function (element, playerConfig, adTagUrl) {
             superStop_func();
         };
 
+        superDestroy_func = that.super('destroy');
         that.destroy = () => {
 
             if (loadRetryer) {
@@ -265,14 +302,17 @@ const HlsProvider = function (element, playerConfig, adTagUrl) {
             if (hls) {
 
                 hls.destroy();
+                that.trigger(HLS_DESTROYED);
             }
 
             hls = null;
-            OvenPlayerConsole.log("HLS : PROVIDER DESTROUYED.");
+            OvenPlayerConsole.log("HLS : PROVIDER DESTROYED.");
             superDestroy_func();
         };
+
+        OvenPlayerConsole.log("HLS PROVIDER LOADED.");
     } catch (error) {
-        let tempError = ERRORS.codes[INIT_HLSJS_NOTFOUND];
+        let tempError = ERRORS.codes[INIT_HLSJS_FAIL];
         tempError.error = error;
         throw tempError;
     }

package/src/js/api/provider/html5/providers/Html5.js

@@ -26,8 +26,10 @@ const Html5 = function(element, playerConfig, adTagUrl){
         buffer : 0,
         framerate : 0,
         currentQuality : -1,
-        currentSource : -1,
         qualityLevels : [],
+        currentAudioTrack: -1,
+        audioTracks: [],
+        currentSource : -1,
         sources : [],
         adTagUrl : adTagUrl
     };