ovenplayer 0.10.2 → 0.10.3-3.alpha-2

package/src/js/api/Configurator.js

@@ -33,9 +33,10 @@ const Configurator = function(options, provider){
             systemText : null,
             lang : "en",
             loadingRetryCount: 0,
-            expandFullScreenUI: false,
+            expandFullScreenUI: true,
             fullscreenOption: null,
-            showBigPlayButton: true
+            showBigPlayButton: true,
+            doubleTapToSeek: false,
         };
         const serialize = function (val) {
             if (val === undefined) {
@@ -203,7 +204,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/SupportChecker.js

@@ -43,12 +43,18 @@ const SupportChecker = function(){
 
                 const file = source.file;
                 const type = source.type;
+                const overrideNative = source.overrideNative;
 
                 if(!type){return false;}
                 const mimeType = source.mimeType || MimeTypes[type];
 
-                if(isHls(file, type) && userAgentObject.browser === "Microsoft Edge" ){
-                    //Edge supports hls native but that's sucks.
+                // Latest Edge browser returns "Chrome" from userAgentObject.browser
+                // Make sure to use hls.js Android devices
+                if (isHls(file, type) && (userAgentObject.browser === "Microsoft Edge" || userAgentObject.os === "Android")) {
+                    return false;
+                }
+
+                if (isHls(file, type) && overrideNative) {
                     return false;
                 }
 
@@ -56,7 +62,7 @@ const SupportChecker = function(){
                     return false;
                 }
 
-                if(isWebRTC(file, type)){
+                if (isWebRTC(file, type)) {
                     return false;
                 }
 

package/src/js/api/constants.js

@@ -35,8 +35,12 @@ export const PLAYLIST_CHANGED = "playlistChanged";
 export const CONTENT_SEEKED = "seeked";
 export const ALL_PLAYLIST_ENDED = "allPlaylistEnded";
 export const NETWORK_UNSTABLED = "unstableNetwork";
+export const HLS_PREPARED = "hlsPrepared";
+export const HLS_DESTROYED = "hlsDestroyed";
 export const DASH_PREPARED = "dashPrepared";
 export const DASH_DESTROYED = "dashDestroyed";
+export const PEER_CONNECTION_PREPARED = "peerConnectionPrepared";
+export const PEER_CONNECTION_DESTROYED = "peerConnectionDestroyed";
 
 
 
@@ -71,6 +75,7 @@ export const CONTENT_CAPTION_CUE_CHANGED = "cueChanged";
 export const CONTENT_CAPTION_CHANGED = "captionChanged";
 export const CONTENT_TIME_MODE_CHANGED = "timeDisplayModeChanged";
 export const OME_P2P_MODE = "p2pMode";
+export const AUDIO_TRACK_CHANGED = "audioTrackChanged";
 
 
 export const AD_CLIENT_GOOGLEIMA = "googleima";
@@ -82,8 +87,8 @@ export const INIT_UNSUPPORT_ERROR = 101;
 export const INIT_RTMP_SETUP_ERROR = 102;
 export const INIT_DASH_UNSUPPORT = 103;
 export const INIT_ADS_ERROR = 104;
-export const INIT_DASH_NOTFOUND = 105;
-export const INIT_HLSJS_NOTFOUND = 106;
+export const INIT_DASH_FAIL = 105;
+export const INIT_HLSJS_FAIL = 106;
 export const PLAYER_UNKNWON_ERROR = 300;
 export const PLAYER_UNKNWON_OPERATION_ERROR = 301;
 export const PLAYER_UNKNWON_NETWORK_ERROR = 302;
@@ -98,8 +103,10 @@ export const PLAYER_WEBRTC_ADD_ICECANDIDATE_ERROR = 502;
 export const PLAYER_WEBRTC_SET_REMOTE_DESC_ERROR = 503;
 export const PLAYER_WEBRTC_CREATE_ANSWER_ERROR = 504;
 export const PLAYER_WEBRTC_SET_LOCAL_DESC_ERROR = 505;
+export const PLAYER_WEBRTC_INTERNAL_ERROR = 506;
 export const PLAYER_WEBRTC_NETWORK_SLOW = 510;
 export const PLAYER_WEBRTC_UNEXPECTED_DISCONNECT = 511;
+export const PLAYER_WEBRTC_TIMEOUT = 512;
 
 export const WARN_MSG_MUTEDPLAY = "Please touch here to turn on the sound.";
 
@@ -130,6 +137,7 @@ export const SYSTEM_TEXT = [
                 "speedUnit" : "x",
                 "source" : "Source",
                 "quality" : "Quality",
+                "audioTrack" : "Audio",
                 "caption" : "Caption",
                 "display" : "Display"
             }
@@ -156,8 +164,8 @@ export const SYSTEM_TEXT = [
                 },
                 103: {
                     "code": 103,
-                    "message": "Can not load due to dashjs. Please check the lastest version.",
-                    "reason": "dash.js version is old. Please check the lastest."
+                    "message": "Can not load due to dash.js. Please use the latest dash.js.",
+                    "reason": "dash.js version is old."
                 },
                 104: {
                     "code": 104,
@@ -166,13 +174,13 @@ export const SYSTEM_TEXT = [
                 },
                 105: {
                     "code": 105,
-                    "message": "Can not find the dashjs. Please check the dashjs.",
-                    "reason": "Not found dashjs."
+                    "message": "Error initializing DASH.",
+                    "reason": "Error initializing DASH."
                 },
                 106: {
                     "code": 106,
-                    "message": "Can not find the hlsjs. Please check the hlsjs.",
-                    "reason": "Not found hlsjs."
+                    "message": "Error initializing HLS.",
+                    "reason": "Error initializing HLS."
                 },
                 300: {
                     "code": 300,
@@ -244,6 +252,11 @@ export const SYSTEM_TEXT = [
                     "message": "Connection with low-latency(OME) server failed.",
                     "reason": "WebRTC setLocalDescription failed."
                 },
+                506: {
+                    "code": 506,
+                    "message": "Connection with low-latency(OME) server failed.",
+                    "reason": "WebRTC internal error."
+                },
                 510: {
                     "code": 510,
                     "message": "Network connection is unstable. Check the network connection.",
@@ -253,6 +266,11 @@ export const SYSTEM_TEXT = [
                     "code": 511,
                     "message": "Connection with low-latency(OME) terminated unexpectedly.",
                     "reason": "Unexpected end of connection."
+                },
+                512: {
+                    "code": 512,
+                    "message": "Connection with low-latency(OME) server failed.",
+                    "reason": "Connection timeout."
                 }
             }
         }
@@ -273,6 +291,7 @@ export const SYSTEM_TEXT = [
                 "speedUnit" : "x",
                 "source" : "소스",
                 "quality" : "품질",
+                "audioTrack" : "오디오",
                 "caption" : "자막",
                 "display" : "표시"
             }
@@ -299,8 +318,8 @@ export const SYSTEM_TEXT = [
                 },
                 103: {
                     "code": 103,
-                    "message": "DashJS로 인해 로드 할 수 없습니다. dashjs 버전을 확인해주세요.",
-                    "reason": "dash.js version is old. Please check the lastest."
+                    "message": "DashJS로 인해 로드 할 수 없습니다. 최신 dash.js를 사용해 주세요.",
+                    "reason": "dash.js version is old."
                 },
                 104: {
                     "code": 104,
@@ -309,13 +328,13 @@ export const SYSTEM_TEXT = [
                 },
                 105: {
                     "code": 105,
-                    "message": "DashJS 라이브러리가 없어 로드 할 수 없습니다.",
-                    "reason": "Not found dashjs."
+                    "message": "DASH 초기화 중 오류가 발생했습니다.",
+                    "reason": "Error initializing DASH."
                 },
                 106: {
                     "code": 106,
-                    "message": "HLSJS 라이브러리가 없어 로드 할 수 없습니다.",
-                    "reason": "Not found hlsjs."
+                    "message": "HLS 초기화 중 오류가 발생했습니다.",
+                    "reason": "Error initializing HLS."
                 },
                 300: {
                     "code": 300,
@@ -387,12 +406,181 @@ export const SYSTEM_TEXT = [
                     "message": "저지연(OME) 서버와 연결에 실패했습니다.",
                     "reason": "WebRTC setLocalDescription failed."
                 },
+                506: {
+                    "code": 506,
+                    "message": "저지연(OME) 서버와 연결에 실패했습니다.",
+                    "reason": "WebRTC internal error."
+                },
                 510: {
                     "code": 510,
                     "message": "네트워크 연결이 불안정합니다. 네트워크 연결을 확인하십시오.",
                     "reason": "Network is slow."
+                },
+                511: {
+                    "code": 511,
+                    "message": "저지연(OME) 서버와 연결에 실패했습니다.",
+                    "reason": "Unexpected end of connection."
+                },
+                512: {
+                    "code": 512,
+                    "message": "저지연(OME) 서버와 연결에 실패했습니다.",
+                    "reason": "Connection timeout."
+                }
+            }
+        }
+    },
+    {
+        "lang" : "pl",
+        "ui" : {
+            "context" : "O OvenPlayer",
+            "controls" : {
+                "live" : "Transmisja na żywo",
+                "low_latency_live" : "Transmisja z niskim opóźnieniem",
+                "low_latency_p2p" : "Transmisja z niskim opóźnieniem P2P",
+            },
+            "playlist" : "Playlista",
+            "setting" : {
+                "title" : "Ustawienia",
+                "speed" : "Prędkość",
+                "speedUnit" : "x",
+                "source" : "Źrodło",
+                "quality" : "Jakość",
+                "audioTrack" : "Audio",
+                "caption" : "Podtytuł",
+                "display" : "Wyświetlacz"
+            }
+        },
+        "api" : {
+            "message" : {
+                "muted_play" : "Naciśnij tutaj, aby aktywować dźwięk"
+            },
+            "error": {
+                100: {
+                    "code": 100,
+                    "message": "Nie można załadować z nieznanego powodu.",
+                    "reason": "Can not load due to unknown reasons."
+                },
+                101: {
+                    "code": 101,
+                    "message": "Nie można załadować, ponieważ nie znaleziono multimediów, który można odtworzyć.",
+                    "reason": "Can not load due to playable media not found."
+                },
+                102: {
+                    "code": 102,
+                    "message": "Flash fetching process aborted. </br><a href='http://www.adobe.com/go/getflashplayer' target='_self'><img src='http://www.adobe.com/images/shared/download_buttons/get_flash_player.gif' alt='Get Adobe Flash player'></a>",
+                    "reason": "It looks like not found swf or your environment is localhost."
+                },
+                103: {
+                    "code": 103,
+                    "message": "Nie można załadować, ponieważ wersja dash.js jest za stara.",
+                    "reason": "dash.js version is old."
+                },
+                104: {
+                    "code": 104,
+                    "message": "Can not load due to google ima for Ads. ",
+                    "reason": "Please check the google ima library."
+                },
+                105: {
+                    "code": 105,
+                    "message": "Nie można załadować, nie znaleziono DASH.",
+                    "reason": "Error initializing DASH."
+                },
+                106: {
+                    "code": 106,
+                    "message": "Nie można załadować, nie znaleziono hlsjs.",
+                    "reason": "Error initializing HLS"
+                },
+                300: {
+                    "code": 300,
+                    "message": "Nie można odtworzyć z nieznanego powodu.",
+                    "reason": "Can not play due to unknown reasons."
+                },
+                301: {
+                    "code": 301,
+                    "message": "Proces pobierania przerwany przez użytkownika.",
+                    "reason": "Fetching process aborted by user."
+                },
+                302: {
+                    "code": 302,
+                    "message": "Nie udało się pobrać niektórych multimediów z powodu błędu sieci.",
+                    "reason": "Error occurred when downloading."
+                },
+                303: {
+                    "code": 303,
+                    "message": "Nie udało się załadować niektórych multimediów. Może być to spowodowane problemem z serwerem, siecią lub niewspieranym formatem.",
+                    "reason": "Error occurred when decoding."
+                },
+                304: {
+                    "code": 304,
+                    "message": "Odtwarzanie zostało anulowane. Wygląda na to, że plik jest uszkodzony lub Twoja przeglądarka nie obsługuje tego pliku.",
+                    "reason": "Media playback not supported."
+                },
+                305: {
+                    "code": 305,
+                    "message": "Nie można wczytać napisów z nieznanego powodu.",
+                    "reason": "Can not load captions due to unknown reasons."
+                },
+                306: {
+                    "code": 306,
+                    "message": "Nie udało się załadować niektórych multimediów. Może być to spowodowane problemem z serwerem, siecią lub niewspieranym formatem.",
+                    "reason": "The server cannot or will not process the request."
+                },
+                307: {
+                    "code": 307,
+                    "message": "Nie udało się załadować niektórych multimediów. Może być to spowodowane problemem z serwerem, siecią lub niewspieranym formatem.",
+                    "reason": "The server refused the request."
+                },
+                308: {
+                    "code": 308,
+                    "message": "Nie udało się załadować niektórych multimediów. Może być to spowodowane problemem z serwerem, siecią lub niewspieranym formatem.",
+                    "reason": "The server do not accept the request."
+                },
+                501: {
+                    "code": 501,
+                    "message": "Połączenie z serwerem niskiego opóźnienia (OME) nie powiodło się.",
+                    "reason": "WebSocket connection failed."
+                },
+                502: {
+                    "code": 502,
+                    "message": "Połączenie z serwerem niskiego opóźnienia (OME) nie powiodło się.",
+                    "reason": "WebRTC addIceCandidate failed."
+                },
+                503: {
+                    "code": 503,
+                    "message": "Połączenie z serwerem niskiego opóźnienia (OME) nie powiodło się.",
+                    "reason": "WebRTC setRemoteDescription failed."
+                },
+                504: {
+                    "code": 504,
+                    "message": "Połączenie z serwerem niskiego opóźnienia (OME) nie powiodło się.",
+                    "reason": "WebRTC peer createOffer failed."
+                },
+                505: {
+                    "code": 505,
+                    "message": "Połączenie z serwerem niskiego opóźnienia (OME) nie powiodło się.",
+                    "reason": "WebRTC setLocalDescription failed."
+                },
+                506: {
+                    "code": 506,
+                    "message": "Połączenie z serwerem niskiego opóźnienia (OME) nie powiodło się.",
+                    "reason": "WebRTC internal error."
+                },
+                510: {
+                    "code": 510,
+                    "message": "Połączenie sieciowe jest niestabilne. Sprawdź swoją sieć.",
+                    "reason": "Network is slow."
+                },
+                511: {
+                    "code": 511,
+                    "message": "Połączenie z serwerem niskiego opóźnienia (OME) nieoczekiwanie zakończone.",
+                    "reason": "Unexpected end of connection."
+                },
+                512: {
+                    "code": 512,
+                    "message": "Połączenie z serwerem niskiego opóźnienia (OME) nie powiodło się.",
+                    "reason": "Connection timeout."
                 }
             }
         }
     }
-];
+];

package/src/js/api/media/Manager.js

@@ -10,8 +10,6 @@ import {version} from 'version';
 
 const Manager = function(container, browserInfo){
     const that = {};
-    const SWFPath = '';
-    let rootId = container.getAttribute("data-parent-id");
     let $container = LA$(container);
     let videoElement = "";
 
@@ -20,6 +18,7 @@ const Manager = function(container, browserInfo){
     const createHtmlVideo = function(isLoop, isAutoStart){
 
         videoElement = document.createElement('video');
+        videoElement.setAttribute('preload', 'auto');
         videoElement.setAttribute('disableremoteplayback', '');
         videoElement.setAttribute('webkit-playsinline', 'true');
         videoElement.setAttribute('playsinline', 'true');
@@ -33,111 +32,19 @@ const Manager = function(container, browserInfo){
 
         return videoElement;
     };
-    const createFlashVideo = function(isLoop, bufferTime, bufferTimeMax){
-        let movie, flashvars, allowscriptaccess, allowfullscreen, quality, name, menu, qual, bgcolor, loop, wmode ;
-        OvenPlayerConsole.log("MediaManager Flash buffer setting : ", bufferTime, bufferTimeMax);
-        movie = document.createElement('param');
-        movie.setAttribute('name', 'movie');
-        movie.setAttribute('value', SWFPath);
-
-        flashvars = document.createElement('param');
-        flashvars.setAttribute('name', 'flashvars');
-        //playerId is to use SWF for ExternalInterface.call().
-        flashvars.setAttribute('value', `playerId=${rootId}&bufferTime=${bufferTime}&bufferMaxTime=${bufferTimeMax}`);
-
-        allowscriptaccess = document.createElement('param');
-        allowscriptaccess.setAttribute('name', 'allowscriptaccess');
-        allowscriptaccess.setAttribute('value', 'always');
-
-        allowfullscreen = document.createElement('param');
-        allowfullscreen.setAttribute('name', 'allowfullscreen');
-        allowfullscreen.setAttribute('value', 'true');
-
-        quality = document.createElement('param');
-        quality.setAttribute('name', 'quality');
-        quality.setAttribute('value', 'height');
-
-        name = document.createElement('param');
-        name.setAttribute('name', 'name');
-        name.setAttribute('value', rootId+"-flash");
-
-        menu = document.createElement('param');
-        menu.setAttribute('name', 'menu');
-        menu.setAttribute('value', 'false');
-
-        qual = document.createElement('param');
-        qual.setAttribute('name', 'quality');
-        qual.setAttribute('value', 'high');
-
-        bgcolor = document.createElement('param');
-        bgcolor.setAttribute('name', 'bgcolor');
-        bgcolor.setAttribute('value', '#000000');
-
-        wmode = document.createElement('param');
-        wmode.setAttribute('name', 'wmode');
-        wmode.setAttribute('value', 'opaque');
-
-        /*let allowButton = `<a href="http://www.adobe.com/go/getflashplayer"><img src="http://www.adobe.com/images/shared/download_buttons/get_flash_player.gif" alt="Get Adobe Flash player"></a>`;
-        message = document.createElement("div");
-        message.innerHTML = allowButton;*/
-
-        if(isLoop){
-            loop = document.createElement('param');
-            loop.setAttribute('name', 'loop');
-            loop.setAttribute('value', 'true');
-        }
-
-        videoElement = document.createElement('object');
-        videoElement.setAttribute('id', rootId+"-flash");
-        videoElement.setAttribute('name', rootId+"-flash");
-        videoElement.setAttribute('width', '100%');
-        videoElement.setAttribute('height', '100%');
-        videoElement.setAttribute('scale', 'default');
-        videoElement.setAttribute('wmode', 'opaque');
-
-        if(browserInfo.browser === "Microsoft Internet Explorer" && browserInfo.browserMajorVersion <= 9 ){
-            videoElement.setAttribute('classid', 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000');
-            videoElement.appendChild(movie);
-        }else{
-            videoElement.setAttribute('data', SWFPath);
-            videoElement.setAttribute('type', 'application/x-shockwave-flash');
-        }
-        if(isLoop){
-            videoElement.appendChild(loop);
-        }
-
-        videoElement.appendChild(wmode);
-        videoElement.appendChild(bgcolor);
-        videoElement.appendChild(qual);
-        videoElement.appendChild(allowfullscreen);
-        videoElement.appendChild(allowscriptaccess);
-        videoElement.appendChild(flashvars);
-        //videoElement.appendChild(message);
-
-        $container.append(videoElement);
-
-        return videoElement;
-    };
 
     that.createMedia = (providerName , playerConfig)  => {
-        if( providerName === PROVIDER_RTMP ){
-            if(videoElement){
-                that.empty();
-            }
-            return createFlashVideo(playerConfig.isLoop(), playerConfig.getRtmpBufferTime(), playerConfig.getRtmpBufferTimeMax());
-        }else{
-            // if(videoElement){
-            //     // that.empty();
-            //     //reuse video element.
-            //     //because playlist is auto next playing.
-            //     //Only same video element does not require User Interaction Error.
-            //     return videoElement;
-            // }else{
-            //     return createHtmlVideo(playerConfig.isLoop(), playerConfig.isAutoStart());
-            // }
-            that.empty();
-            return createHtmlVideo(playerConfig.isLoop(), playerConfig.isAutoStart());
-        }
+        // if(videoElement){
+        //     // that.empty();
+        //     //reuse video element.
+        //     //because playlist is auto next playing.
+        //     //Only same video element does not require User Interaction Error.
+        //     return videoElement;
+        // }else{
+        //     return createHtmlVideo(playerConfig.isLoop(), playerConfig.isAutoStart());
+        // }
+        that.empty();
+        return createHtmlVideo(playerConfig.isLoop(), playerConfig.isAutoStart());
     }
 
     that.createAdContainer = () => {
@@ -158,8 +65,10 @@ const Manager = function(container, browserInfo){
     that.destroy = () =>{
         $container.removeChild();
         $container = null;
+        if(videoElement!=null && videoElement!=='') {
+            videoElement.srcObject = null;
+        }
         videoElement = null;
-        rootId = null;
     };
 
     return that;

package/src/js/api/provider/Controller.js

@@ -10,10 +10,9 @@ import {
 
 /**
  * @brief   This manages provider.
- * @param
  * */
 const Controller = function () {
-    let supportChacker = SupportChecker();
+    let supportChecker = SupportChecker();
     const Providers = {};
 
     const that = {};
@@ -56,7 +55,7 @@ const Controller = function () {
 
 
     that.loadProviders = (playlistItem) => {
-        const supportedProviderNames = supportChacker.findProviderNamesByPlaylist(playlistItem);
+        const supportedProviderNames = supportChecker.findProviderNamesByPlaylist(playlistItem);
         OvenPlayerConsole.log("ProviderController loadProviders() ", supportedProviderNames);
         if (!supportedProviderNames) {
             return Promise.reject(ERRORS.codes[INIT_UNSUPPORT_ERROR]);
@@ -78,14 +77,14 @@ const Controller = function () {
     };
 
     that.getProviderBySource = (source) => {
-        const supportedProviderName = supportChacker.findProviderNameBySource(source);
+        const supportedProviderName = supportChecker.findProviderNameBySource(source);
         OvenPlayerConsole.log("ProviderController getProviderBySource() ", supportedProviderName);
         return that.findByName(supportedProviderName);
     };
 
     that.isSameProvider = (currentSource, newSource) => {
-        OvenPlayerConsole.log("ProviderController isSameProvider() ", supportChacker.findProviderNameBySource(currentSource), supportChacker.findProviderNameBySource(newSource));
-        return supportChacker.findProviderNameBySource(currentSource) === supportChacker.findProviderNameBySource(newSource);
+        OvenPlayerConsole.log("ProviderController isSameProvider() ", supportChecker.findProviderNameBySource(currentSource), supportChecker.findProviderNameBySource(newSource));
+        return supportChecker.findProviderNameBySource(currentSource) === supportChecker.findProviderNameBySource(newSource);
     };
 
     return that;