ovenplayer 0.10.2 → 0.10.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ovenplayer",
-  "version": "0.10.2",
+  "version": "0.10.6",
   "description": "OvenPlayer is Open-Source HTML5 Player. OvenPlayer supports WebRTC Signaling from OvenMediaEngine for Sub-Second Latency Streaming.",
   "main": "dist/ovenplayer.js",
   "scripts": {

package/src/js/api/Api.js

@@ -2,16 +2,16 @@ import OvenPlayerSDK from "ovenplayer.sdk"
 import CaptionManager from "api/caption/Manager";
 import Configurator from "api/Configurator";
 import EventEmitter from "api/EventEmitter";
-import LazyCommandExecutor from "api/LazyCommandExecutor";
 import MediaManager from "api/media/Manager";
 import PlaylistManager from "api/playlist/Manager";
 import ProviderController from "api/provider/Controller";
 import {READY, ERRORS, ERROR, CONTENT_COMPLETE, CONTENT_META, INIT_UNKNWON_ERROR, INIT_UNSUPPORT_ERROR, DESTROY, PLAYER_PLAY, NETWORK_UNSTABLED, PLAYER_WEBRTC_NETWORK_SLOW, PLAYER_WEBRTC_UNEXPECTED_DISCONNECT, PLAYER_WEBRTC_SET_LOCAL_DESC_ERROR,
     PLAYER_FILE_ERROR, PROVIDER_DASH, PROVIDER_HLS, PROVIDER_WEBRTC, PROVIDER_HTML5, PROVIDER_RTMP, ALL_PLAYLIST_ENDED} from "api/constants";
-import {version} from 'version';
+
 import {ApiRtmpExpansion} from 'api/ApiExpansions';
 import {analUserAgent} from "utils/browser";
 import {pickCurrentSource} from "api/provider/utils";
+import {version} from "../version";
 
 /**
  * @brief   This object connects UI to the provider.
@@ -23,7 +23,6 @@ const Api = function(container){
     const that = {};
     EventEmitter(that);
 
-    console.log("[OvenPlayer] v."+ version);
     OvenPlayerConsole.log("API loaded.");
 
     let playlistManager = PlaylistManager(that);
@@ -32,11 +31,8 @@ const Api = function(container){
     let mediaManager = MediaManager(container, userAgentObject);
     let currentProvider = "";
     let playerConfig = "";
-    let lazyQueue = "";
     let captionManager = "";
 
-    let webrtcRetryInterval = 1000;
-
     const runNextPlaylist = function(index){
         OvenPlayerConsole.log("runNextPlaylist");
         let nextPlaylistIndex = index; // || playlistManager.getCurrentPlaylistIndex() + 1;
@@ -49,8 +45,7 @@ const Api = function(container){
         playerConfig.setVolume(currentProvider.getVolume());
 
         if(hasNextPlaylist){
-            //that.pause();
-            lazyQueue = LazyCommandExecutor(that, ['play','seek','stop']);
+
             playlistManager.setCurrentPlaylist(nextPlaylistIndex);
             initProvider();
 
@@ -103,18 +98,18 @@ const Api = function(container){
 
                     // Chrome >=80 on Android misses h246 in SDP when first time after web page loaded.
                     // So wait until browser get h264 capabilities and create answer SDP.
-                    if (userAgentObject.os === 'Android' && userAgentObject.browser === 'Chrome') {
-
-                        if (data && data.code && data.code === PLAYER_WEBRTC_SET_LOCAL_DESC_ERROR) {
-
-                            setTimeout(function () {
-
-                                that.setCurrentSource(that.getCurrentSource());
-                            }, webrtcRetryInterval);
-
-                            return;
-                        }
-                    }
+                    // if (userAgentObject.os === 'Android' && userAgentObject.browser === 'Chrome') {
+                    //
+                    //     if (data && data.code && data.code === PLAYER_WEBRTC_SET_LOCAL_DESC_ERROR) {
+                    //
+                    //         setTimeout(function () {
+                    //
+                    //             that.setCurrentSource(that.getCurrentSource());
+                    //         }, webrtcRetryInterval);
+                    //
+                    //         return;
+                    //     }
+                    // }
 
                     if (playerConfig.getConfig().autoFallback && that.getCurrentSource() + 1 < that.getSources().length) {
 
@@ -143,12 +138,9 @@ const Api = function(container){
             //provider's preload() have to made Promise. Cuz it overcomes 'flash loading timing problem'.
             currentProvider.preload(playlistManager.getCurrentSources(), lastPlayPosition).then(function(){
 
-                lazyQueue.flush();
-                //This is no reason to exist anymore.
-                lazyQueue.destroy();
 
             }).catch((error) => {
-                lazyQueue.off();
+
                 if(error && error.code && ERRORS.codes[error.code]){
                     that.trigger(ERROR, ERRORS.codes[error.code]);
                 }else {
@@ -166,13 +158,6 @@ const Api = function(container){
                 tempError.error = error;
                 that.trigger(ERROR, tempError);
             }
-
-            //xxx : If you init empty sources. (I think this is strange case.)
-            //This works for this case.
-            //player = OvenPlayer.create("elId", {});
-            //player.load(soruces);
-            lazyQueue.off();
-            //lazyQueue.removeAndExcuteOnce("load");
         });
     };
 
@@ -188,11 +173,6 @@ const Api = function(container){
             options = {};
         }
 
-        //It collects the commands and executes them at the time when they are executable.
-        lazyQueue = LazyCommandExecutor(that, [
-            'load','play','pause','seek','stop', 'getDuration', 'getPosition', 'getVolume'
-            , 'getMute', 'getBuffer', 'getState' , 'getQualityLevels'
-        ]);
         options.mediaContainer = container;
         options.browser = userAgentObject;
         playerConfig = Configurator(options, that);
@@ -296,7 +276,6 @@ const Api = function(container){
     };
     that.load = (playlist) => {
         OvenPlayerConsole.log("API : load() ", playlist);
-        lazyQueue = LazyCommandExecutor(that, ['play','seek','stop']);
 
         if(playlist){
 
@@ -387,23 +366,8 @@ const Api = function(container){
 
         OvenPlayerConsole.log("API : setCurrentSource() ", index);
 
-        // let sources = currentProvider.getSources();
-        // let currentSource = sources[currentProvider.getCurrentSource()];
-        // let newSource = sources[index];
-
-        // let isSameProvider = providerController.isSameProvider(currentSource, newSource);
-        // // provider.serCurrentQuality -> playerConfig setting -> load
-        // let resultSourceIndex = currentProvider.setCurrentSource(index, isSameProvider);
-        //
-        // if(!newSource){
-        //     return null;
-        // }
-        //
-        // OvenPlayerConsole.log("API : setCurrentQuality() isSameProvider", isSameProvider);
-
         let lastPlayPosition = currentProvider.getPosition();
         playerConfig.setSourceIndex(index);
-        lazyQueue = LazyCommandExecutor(that, ['play','seek']);
 
         initProvider(lastPlayPosition);
 
@@ -490,10 +454,6 @@ const Api = function(container){
 
         OvenPlayerConsole.log("API : remove() ");
 
-        if (lazyQueue) {
-            lazyQueue.destroy();
-        }
-
         if(captionManager){
             captionManager.destroy();
             captionManager = null;
@@ -515,9 +475,8 @@ const Api = function(container){
         providerController = null;
         playlistManager = null;
         playerConfig = null;
-        lazyQueue = null;
 
-        OvenPlayerConsole.log("API : remove() - lazyQueue, currentProvider, providerController, playlistManager, playerConfig, api event destroed. ");
+        OvenPlayerConsole.log("API : remove() - currentProvider, providerController, playlistManager, playerConfig, api event destroed. ");
         OvenPlayerSDK.removePlayer(that.getContainerId());
         if(OvenPlayerSDK.getPlayerList().length  === 0){
             OvenPlayerConsole.log("OvenPlayerSDK.playerList",  OvenPlayerSDK.getPlayerList());
@@ -525,7 +484,7 @@ const Api = function(container){
     };
 
     that.getVersion = () => {
-        return "v."+version;
+        return version;
     };
 
     return that;

package/src/js/api/Configurator.js

@@ -203,7 +203,9 @@ const Configurator = function(options, provider){
     that.getRtmpBufferTimeMax = () => {
         return spec.rtmpBufferTimeMax;
     };
-
+    that.setMute = (mute) =>{
+        spec.mute = mute;
+    };
     that.isMute = () =>{
         return spec.mute;
     };

package/src/js/api/provider/html5/Provider.js

@@ -218,12 +218,11 @@ const Provider = function (spec, playerConfig, onExtendedLoad){
             return false;
         }
         elVideo.volume = volume/100;
+        playerConfig.setVolume(volume);
     };
     that.getVolume = () =>{
-        if(!elVideo){
-            return 0;
-        }
-        return elVideo.volume*100;
+
+        return playerConfig.getVolume();
     };
     that.setMute = (state) =>{
         if(!elVideo){
@@ -231,27 +230,29 @@ const Provider = function (spec, playerConfig, onExtendedLoad){
         }
         if (typeof state === 'undefined') {
 
-            elVideo.muted = !elVideo.muted;
+            const muted = playerConfig.isMute();
+
+            elVideo.muted = !muted;
+            playerConfig.setMute(!muted);
 
             that.trigger(CONTENT_MUTE, {
-                mute: elVideo.muted
+                mute: playerConfig.isMute()
             });
 
         } else {
 
             elVideo.muted = state;
+            playerConfig.setMute(state);
 
             that.trigger(CONTENT_MUTE, {
-                mute: elVideo.muted
+                mute: playerConfig.isMute()
             });
         }
         return elVideo.muted;
     };
     that.getMute = () =>{
-        if(!elVideo){
-            return false;
-        }
-        return elVideo.muted;
+
+        return playerConfig.isMute();
     };
 
     that.preload = (sources, lastPlayPosition) =>{

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

@@ -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) => {

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

@@ -82,8 +82,6 @@ const HlsProvider = function (element, playerConfig, adTagUrl) {
 
             OvenPlayerConsole.log("HLS : onExtendedLoad : ", source, "lastPlayPosition : " + lastPlayPosition);
 
-            let loadingRetryCount = playerConfig.getConfig().loadingRetryCount;
-
             hls.loadSource(source.file);
 
             hls.once(Hls.Events.MANIFEST_LOADED, function (event, data) {
@@ -132,89 +130,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) {

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

@@ -52,6 +52,9 @@ const WebRTC = function(element, playerConfig, adTagUrl){
                 }
 
                 element.srcObject = stream;
+
+                const AudioContext = window.AudioContext || window.webkitAudioContext;
+                audioCtx = new AudioContext();
             };
 
             webrtcLoader = WebRTCLoader(that, source.file, loadCallback, errorTrigger, playerConfig);

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

@@ -276,7 +276,7 @@ const WebRTCLoader = function (provider, webSocketUrl, loadCallback, errorTrigge
                     }
                 }
 
-                regIceServer.username = iceServer.user_name;
+                regIceServer.username = iceServer.username || iceServer.user_name;
                 regIceServer.credential = iceServer.credential;
 
                 peerConnectionConfig.iceServers.push(regIceServer);
@@ -649,7 +649,9 @@ const WebRTCLoader = function (provider, webSocketUrl, loadCallback, errorTrigge
 
                 if (message.command === 'offer') {
 
-                    createMainPeerConnection(message.id, message.peer_id, message.sdp, message.candidates, message.ice_servers, resolve);
+                    let iceServers =  message.iceServers || message.ice_servers;
+
+                    createMainPeerConnection(message.id, message.peer_id, message.sdp, message.candidates, iceServers, resolve);
                     if (message.peer_id === 0) {
                         provider.trigger(OME_P2P_MODE, false);
                     } else {

package/src/js/ovenplayer.js

@@ -1,5 +1,6 @@
+import {version} from 'version'
 import OvenPlayerSDK from './ovenplayer.sdk'
-import {checkAndGetContainerElement} from 'utils/validator';
+import {checkAndGetContainerElement} from 'utils/validator'
 import View from './view/view';
 
 function ovenPlayerFactory() {
@@ -10,6 +11,8 @@ function ovenPlayerFactory() {
 
     OvenPlayer.create = function (container, options) {
 
+        console.log("[OvenPlayer] v."+ version);
+
         let containerElement = checkAndGetContainerElement(container);
 
         let player = View(containerElement);

package/src/js/view/components/controls/volumeButton.js

@@ -96,9 +96,6 @@ const VolumeButton = function($container, api){
         api.on(READY, function() {
             setVolumeUI(api.getVolume());
         }, template);
-        api.on(PLAYER_PLAY, function (data) {
-            setVolumeUI(data.volume);
-        }, template);
         api.on(CONTENT_VOLUME, function(data) {
 
             setVolumeUI(data.volume);

package/src/js/view/view.js

@@ -313,9 +313,14 @@ const View = function($container){
 
         api.on(READY, function(data) {
 
-            if(!controls && showControlBar){
+            if(!controls){
                 controls = Controls($playerRoot.find(".op-ui"), playerInstance);
             }
+
+            if (!showControlBar) {
+                $playerRoot.addClass("op-no-controls");
+            }
+
         });
 
         api.on(ERROR, function(error) {
@@ -378,6 +383,15 @@ const View = function($container){
                 $playerRoot.find('.op-ratio').css('padding-bottom', ratio + '%');
             }
         }
+
+        api.showControls = function (show) {
+            if (show) {
+                $playerRoot.removeClass("op-no-controls");
+                setHide(false, true);
+            } else {
+                $playerRoot.addClass("op-no-controls");
+            }
+        };
     };