ovenplayer 0.10.46 → 0.10.48

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ovenplayer",
-  "version": "0.10.46",
+  "version": "0.10.48",
   "description": "OvenPlayer is Open-Source HTML5 Player. OvenPlayer supports WebRTC Signaling from OvenMediaEngine for Sub-Second Latency Streaming.",
   "main": "dist/ovenplayer.js",
   "scripts": {
@@ -9,7 +9,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/AirenSoft/OvenPlayer.git"
+    "url": "git+https://github.com/OvenMediaLabs/OvenPlayer.git"
   },
   "keywords": [
     "Sub-Second Latency Streaming",
@@ -22,10 +22,10 @@
     "Video",
     "Player"
   ],
-  "author": "AirenSoft Co., Ltd.",
+  "author": "OvenMedia Labs Inc.",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/AirenSoft/OvenPlayer/issues"
+    "url": "https://github.com/OvenMediaLabs/OvenPlayer/issues"
   },
   "homepage": "https://www.ovenmediaengine.com/ovenplayer",
   "devDependencies": {

package/src/js/api/Configurator.js

@@ -1,270 +1,272 @@
-import _ from "utils/underscore";
-import deepMerge from "utils/deepMerge";
-
-import {
-    CONTENT_TIME_MODE_CHANGED, SYSTEM_TEXT
-} from "api/constants";
-
-/**
- * @brief   This initializes the input options.
- * @param   options
- *
- * */
-const Configurator = function (options, provider) {
-
-    const composeSourceOptions = function (options) {
-        const Defaults = {
-            mediaContainer: "",
-            playbackRates: [2, 1.5, 1, 0.5, 0.25],
-            playbackRate: 1,
-            mute: false,
-            volume: 100,
-            loop: false,
-            controls: true,
-            autoStart: false,
-            autoFallback: true,
-            timecode: true,
-            sourceIndex: -1,
-            browser: "",
-            hidePlaylistIcon: false,
-            rtmpBufferTime: 1,
-            rtmpBufferTimeMax: 3,
-            adClient: "googleima",
-            currentProtocolOnly: false,
-            systemText: null,
-            lang: "en",
-            loadingRetryCount: 0,
-            expandFullScreenUI: true,
-            fullscreenOption: null,
-            showBigPlayButton: true,
-            doubleTapToSeek: false,
-            showZoomSettings: false,
-            legacyUI: false,
-            parseStream: {
-                enabled: false
-            }
-        };
-        const serialize = function (val) {
-            if (val === undefined) {
-                return null;
-            }
-            if (typeof val === 'string' && val.length < 6) {
-                const lowercaseVal = val.toLowerCase();
-                if (lowercaseVal === 'true') {
-                    return true;
-                }
-                if (lowercaseVal === 'false') {
-                    return false;
-                }
-                if (!isNaN(Number(val)) && !isNaN(parseFloat(val))) {
-                    return Number(val);
-                }
-            }
-            return val;
-        }
-        const deserialize = function (options) {
-            Object.keys(options).forEach((key) => {
-                if (key === 'id') {
-                    return;
-                }
-                options[key] = serialize(options[key]);
-            });
-        }
-
-        deserialize(options);
-        let config = Object.assign({}, Defaults, options);
-        let userCustumSystemText = [];
-        if (config.systemText) {
-            userCustumSystemText = _.isArray(config.systemText) ? config.systemText : [config.systemText];
-        }
-
-        for (let i = 0; i < userCustumSystemText.length; i++) {
-            if (userCustumSystemText[i].lang) {
-                let currentSystemText = _.findWhere(SYSTEM_TEXT, { "lang": userCustumSystemText[i].lang });
-                if (currentSystemText) {
-                    //validate & update
-                    deepMerge(currentSystemText, userCustumSystemText[i]);
-                } else {
-                    //create
-                    currentSystemText = _.findWhere(SYSTEM_TEXT, { "lang": "en" });
-                    currentSystemText.lang = userCustumSystemText[i].lang;
-                    const newMerged = deepMerge({}, currentSystemText, userCustumSystemText[i]);
-                    SYSTEM_TEXT.push(newMerged);
-                }
-            }
-        }
-        config.systemText = _.findWhere(SYSTEM_TEXT, { "lang": config.lang });
-
-        let playbackRates = config.playbackRates;
-
-        playbackRates = playbackRates.filter(rate => _.isNumber(rate) && rate >= 0.25 && rate <= 4).map(rate => Math.round(rate * 4) / 4);
-
-        if (playbackRates.indexOf(1) < 0) {
-            playbackRates.push(1);
-        }
-        playbackRates.sort();
-
-        config.playbackRates = playbackRates;
-
-        config.rtmpBufferTime = config.rtmpBufferTime > 10 ? 10 : config.rtmpBufferTime;
-        config.rtmpBufferTimeMax = config.rtmpBufferTimeMax > 50 ? 50 : config.rtmpBufferTimeMax;
-
-
-        if (config.playbackRates.indexOf(config.playbackRate) < 0) {
-            config.playbackRate = 1;
-        }
-
-        const configPlaylist = config.playlist;
-        if (!configPlaylist) {
-            const obj = _.pick(config, [
-                'title',
-                'description',
-                'type',
-                'image',
-                'file',
-                'sources',
-                'tracks',
-                'host',
-                'application',
-                'stream',
-                'adTagUrl'
-            ]);
-
-            config.playlist = [obj];
-        } else if (_.isArray(configPlaylist.playlist)) {
-            config.feedData = configPlaylist;
-            config.playlist = configPlaylist.playlist;
-        }
-
-        delete config.duration;
-        return config;
-    };
-    OvenPlayerConsole.log("Configurator loaded.", options);
-    let spec = composeSourceOptions(options);
-
-    //spec.isFullscreen = false; //IE 11 can't check current fullscreen state.
-
-    const that = {};
-    that.getConfig = () => {
-        return spec;
-    };
-    that.getAdClient = () => {
-        return spec.adClient;
-    };
-    that.setConfig = (config, value) => {
-        spec[config] = value;
-    };
-
-    that.getContainer = () => {
-        return spec.mediaContainer;
-    };
-    /*that.isFullscreen = () => {
-        return spec.isFullscreen;
-    }
-    that.setFullscreen = (isFullscreen) => {
-        return spec.isFullscreen = isFullscreen;
-    }*/
-
-    that.getPlaybackRate = () => {
-        return spec.playbackRate;
-    };
-    that.setPlaybackRate = (playbackRate) => {
-        spec.playbackRate = playbackRate;
-        return playbackRate;
-    };
-    that.getZoomFactor = () => {
-        return spec.zoomFactor;
-    };
-    that.setZoomFactor = (zoomFactor) => {
-        spec.zoomFactor = zoomFactor;
-        return zoomFactor;
-    };
-    that.getQualityLabel = () => {
-        return spec.qualityLabel;
-    };
-    that.setQualityLabel = (newLabel) => {
-        spec.qualityLabel = newLabel;
-    };
-
-    that.isCurrentProtocolOnly = () => {
-        return spec.currentProtocolOnly;
-    };
-    /*that.getSourceLabel = () => {
-        return spec.sourceLabel;
-    };
-    that.setSourceLabel = (newLabel) => {
-        spec.sourceLabel = newLabel;
-    };*/
-
-    that.getSourceIndex = () => {
-        return spec.sourceIndex;
-    };
-    that.setSourceIndex = (index) => {
-        spec.sourceIndex = index;
-    };
-    that.setTimecodeMode = (timecode) => {
-        if (spec.timecode !== timecode) {
-            spec.timecode = timecode;
-            provider.trigger(CONTENT_TIME_MODE_CHANGED, timecode);
-        }
-    };
-    that.isTimecodeMode = () => {
-        return spec.timecode;
-    };
-    that.getRtmpBufferTime = () => {
-        return spec.rtmpBufferTime;
-    };
-    that.getRtmpBufferTimeMax = () => {
-        return spec.rtmpBufferTimeMax;
-    };
-    that.setMute = (mute) => {
-        spec.mute = mute;
-    };
-    that.isMute = () => {
-        return spec.mute;
-    };
-    that.getVolume = () => {
-        return spec.volume;
-    };
-    that.setVolume = (volume) => {
-        spec.volume = volume;
-    };
-    that.isLoop = () => {
-        return spec.loop;
-    };
-    that.isAutoStart = () => {
-        return spec.autoStart;
-    };
-    that.isControls = () => {
-        return spec.controls;
-    };
-
-    that.getPlaybackRates = () => {
-        return spec.playbackRates;
-    };
-    that.getBrowser = () => {
-        return spec.browser;
-    };
-    that.getSystemText = () => {
-        return spec.systemText;
-    };
-    that.getLanguage = () => {
-        return spec.lang;
-    };
-
-    that.getPlaylist = () => {
-        return spec.playlist;
-    };
-    that.setPlaylist = (playlist) => {
-        if (_.isArray(playlist)) {
-            spec.playlist = playlist;
-        } else {
-            spec.playlist = [playlist];
-        }
-        return spec.playlist;
-    };
-
-    return that;
-};
-
-export default Configurator;
+import _ from "utils/underscore";
+import deepMerge from "utils/deepMerge";
+
+import {
+    CONTENT_TIME_MODE_CHANGED, SYSTEM_TEXT
+} from "api/constants";
+
+/**
+ * @brief   This initializes the input options.
+ * @param   options
+ *
+ * */
+const Configurator = function (options, provider) {
+
+    const composeSourceOptions = function (options) {
+        const Defaults = {
+            mediaContainer: "",
+            playbackRates: [2, 1.5, 1, 0.5, 0.25],
+            playbackRate: 1,
+            mute: false,
+            volume: 100,
+            loop: false,
+            controls: true,
+            autoStart: false,
+            autoFallback: true,
+            timecode: true,
+            sourceIndex: -1,
+            browser: "",
+            hidePlaylistIcon: false,
+            rtmpBufferTime: 1,
+            rtmpBufferTimeMax: 3,
+            adClient: "googleima",
+            currentProtocolOnly: false,
+            systemText: null,
+            lang: "en",
+            loadingRetryCount: 0,
+            expandFullScreenUI: true,
+            fullscreenOption: null,
+            showBigPlayButton: true,
+            doubleTapToSeek: false,
+            showZoomSettings: false,
+            legacyUI: false,
+            contextItems: [],
+            parseStream: {
+                enabled: false
+            },
+            autoMuteRetryOnNotAllowed: false,
+        };
+        const serialize = function (val) {
+            if (val === undefined) {
+                return null;
+            }
+            if (typeof val === 'string' && val.length < 6) {
+                const lowercaseVal = val.toLowerCase();
+                if (lowercaseVal === 'true') {
+                    return true;
+                }
+                if (lowercaseVal === 'false') {
+                    return false;
+                }
+                if (!isNaN(Number(val)) && !isNaN(parseFloat(val))) {
+                    return Number(val);
+                }
+            }
+            return val;
+        }
+        const deserialize = function (options) {
+            Object.keys(options).forEach((key) => {
+                if (key === 'id') {
+                    return;
+                }
+                options[key] = serialize(options[key]);
+            });
+        }
+
+        deserialize(options);
+        let config = Object.assign({}, Defaults, options);
+        let userCustumSystemText = [];
+        if (config.systemText) {
+            userCustumSystemText = _.isArray(config.systemText) ? config.systemText : [config.systemText];
+        }
+
+        for (let i = 0; i < userCustumSystemText.length; i++) {
+            if (userCustumSystemText[i].lang) {
+                let currentSystemText = _.findWhere(SYSTEM_TEXT, { "lang": userCustumSystemText[i].lang });
+                if (currentSystemText) {
+                    //validate & update
+                    deepMerge(currentSystemText, userCustumSystemText[i]);
+                } else {
+                    //create
+                    currentSystemText = _.findWhere(SYSTEM_TEXT, { "lang": "en" });
+                    currentSystemText.lang = userCustumSystemText[i].lang;
+                    const newMerged = deepMerge({}, currentSystemText, userCustumSystemText[i]);
+                    SYSTEM_TEXT.push(newMerged);
+                }
+            }
+        }
+        config.systemText = _.findWhere(SYSTEM_TEXT, { "lang": config.lang });
+
+        let playbackRates = config.playbackRates;
+
+        playbackRates = playbackRates.filter(rate => _.isNumber(rate) && rate >= 0.25 && rate <= 4).map(rate => Math.round(rate * 4) / 4);
+
+        if (playbackRates.indexOf(1) < 0) {
+            playbackRates.push(1);
+        }
+        playbackRates.sort();
+
+        config.playbackRates = playbackRates;
+
+        config.rtmpBufferTime = config.rtmpBufferTime > 10 ? 10 : config.rtmpBufferTime;
+        config.rtmpBufferTimeMax = config.rtmpBufferTimeMax > 50 ? 50 : config.rtmpBufferTimeMax;
+
+
+        if (config.playbackRates.indexOf(config.playbackRate) < 0) {
+            config.playbackRate = 1;
+        }
+
+        const configPlaylist = config.playlist;
+        if (!configPlaylist) {
+            const obj = _.pick(config, [
+                'title',
+                'description',
+                'type',
+                'image',
+                'file',
+                'sources',
+                'tracks',
+                'host',
+                'application',
+                'stream',
+                'adTagUrl'
+            ]);
+
+            config.playlist = [obj];
+        } else if (_.isArray(configPlaylist.playlist)) {
+            config.feedData = configPlaylist;
+            config.playlist = configPlaylist.playlist;
+        }
+
+        delete config.duration;
+        return config;
+    };
+    OvenPlayerConsole.log("Configurator loaded.", options);
+    let spec = composeSourceOptions(options);
+
+    //spec.isFullscreen = false; //IE 11 can't check current fullscreen state.
+
+    const that = {};
+    that.getConfig = () => {
+        return spec;
+    };
+    that.getAdClient = () => {
+        return spec.adClient;
+    };
+    that.setConfig = (config, value) => {
+        spec[config] = value;
+    };
+
+    that.getContainer = () => {
+        return spec.mediaContainer;
+    };
+    /*that.isFullscreen = () => {
+        return spec.isFullscreen;
+    }
+    that.setFullscreen = (isFullscreen) => {
+        return spec.isFullscreen = isFullscreen;
+    }*/
+
+    that.getPlaybackRate = () => {
+        return spec.playbackRate;
+    };
+    that.setPlaybackRate = (playbackRate) => {
+        spec.playbackRate = playbackRate;
+        return playbackRate;
+    };
+    that.getZoomFactor = () => {
+        return spec.zoomFactor;
+    };
+    that.setZoomFactor = (zoomFactor) => {
+        spec.zoomFactor = zoomFactor;
+        return zoomFactor;
+    };
+    that.getQualityLabel = () => {
+        return spec.qualityLabel;
+    };
+    that.setQualityLabel = (newLabel) => {
+        spec.qualityLabel = newLabel;
+    };
+
+    that.isCurrentProtocolOnly = () => {
+        return spec.currentProtocolOnly;
+    };
+    /*that.getSourceLabel = () => {
+        return spec.sourceLabel;
+    };
+    that.setSourceLabel = (newLabel) => {
+        spec.sourceLabel = newLabel;
+    };*/
+
+    that.getSourceIndex = () => {
+        return spec.sourceIndex;
+    };
+    that.setSourceIndex = (index) => {
+        spec.sourceIndex = index;
+    };
+    that.setTimecodeMode = (timecode) => {
+        if (spec.timecode !== timecode) {
+            spec.timecode = timecode;
+            provider.trigger(CONTENT_TIME_MODE_CHANGED, timecode);
+        }
+    };
+    that.isTimecodeMode = () => {
+        return spec.timecode;
+    };
+    that.getRtmpBufferTime = () => {
+        return spec.rtmpBufferTime;
+    };
+    that.getRtmpBufferTimeMax = () => {
+        return spec.rtmpBufferTimeMax;
+    };
+    that.setMute = (mute) => {
+        spec.mute = mute;
+    };
+    that.isMute = () => {
+        return spec.mute;
+    };
+    that.getVolume = () => {
+        return spec.volume;
+    };
+    that.setVolume = (volume) => {
+        spec.volume = volume;
+    };
+    that.isLoop = () => {
+        return spec.loop;
+    };
+    that.isAutoStart = () => {
+        return spec.autoStart;
+    };
+    that.isControls = () => {
+        return spec.controls;
+    };
+
+    that.getPlaybackRates = () => {
+        return spec.playbackRates;
+    };
+    that.getBrowser = () => {
+        return spec.browser;
+    };
+    that.getSystemText = () => {
+        return spec.systemText;
+    };
+    that.getLanguage = () => {
+        return spec.lang;
+    };
+
+    that.getPlaylist = () => {
+        return spec.playlist;
+    };
+    that.setPlaylist = (playlist) => {
+        if (_.isArray(playlist)) {
+            spec.playlist = playlist;
+        } else {
+            spec.playlist = [playlist];
+        }
+        return spec.playlist;
+    };
+
+    return that;
+};
+
+export default Configurator;