ovenplayer 0.10.21 → 0.10.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ovenplayer",
-  "version": "0.10.21",
+  "version": "0.10.22",
   "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/provider/html5/providers/Hls.js

@@ -213,7 +213,11 @@ const HlsProvider = function (element, playerConfig, adTagUrl) {
         };
         
         that.setAutoQuality = (isAuto) => {
-            hls.currentLevel = -1;
+            if (isAuto) {
+                hls.currentLevel = -1;
+            } else {
+                hls.currentLevel = hls.currentLevel;
+            }
         };
 
         superStop_func = that.super('stop');
@@ -248,7 +252,7 @@ const HlsProvider = function (element, playerConfig, adTagUrl) {
             }
 
             hls = null;
-            OvenPlayerConsole.log("HLS : PROVIDER DESTROUYED.");
+            OvenPlayerConsole.log("HLS : PROVIDER DESTROYED.");
             superDestroy_func();
         };
 

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

@@ -140,7 +140,8 @@ const WebRTC = function (element, playerConfig, adTagUrl) {
                 connectedCallback,
                 internalErrorCallback,
                 errorTrigger,
-                playerConfig
+                playerConfig,
+                spec
             );
 
             connectionStartTime = performance.now();

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

@@ -10,8 +10,10 @@ import {
     PLAYER_WEBRTC_NETWORK_SLOW,
     PLAYER_WEBRTC_UNEXPECTED_DISCONNECT,
     PLAYER_WEBRTC_INTERNAL_ERROR,
-    OME_P2P_MODE
+    OME_P2P_MODE,
+    CONTENT_LEVEL_CHANGED
 } from "api/constants";
+import sizeHumanizer from "../../../../utils/sizeHumanizer";
 
 
 const WebRTCLoader = function (provider,
@@ -20,7 +22,8 @@ const WebRTCLoader = function (provider,
                                connectedCallback,
                                internalErrorCallback,
                                errorTrigger,
-                               playerConfig) {
+                               playerConfig,
+                               spec) {
 
     let defaultConnectionConfig = {};
 
@@ -42,6 +45,9 @@ const WebRTCLoader = function (provider,
 
     let recoverPacketLoss = false;
 
+    let playlistFromOme = null;
+    let autoQuality = false;
+
     if (playerConfig.getConfig().webrtcConfig &&
         playerConfig.getConfig().webrtcConfig.recoverPacketLoss === true) {
 
@@ -665,12 +671,6 @@ const WebRTCLoader = function (provider,
                     return;
                 }
 
-                if (!message.id) {
-
-                    OvenPlayerConsole.log('ID must be not null');
-                    return;
-                }
-
                 if (message.command === 'offer') {
 
                     let iceServers = message.iceServers || message.ice_servers;
@@ -719,6 +719,57 @@ const WebRTCLoader = function (provider,
                     addIceCandidate(peerConnection3, message.candidates);
                 }
 
+                if (message.command === 'notification') {
+
+                    if (message.type === 'playlist') {
+
+                        const renditions = message.message.renditions;
+                        playlistFromOme = message.message;
+
+                        for (let i = 0; i < renditions.length; i++) {
+
+                            let rendition = renditions[i];
+
+                            spec.qualityLevels.push({
+                                bitrate: rendition.video_track.video.bitrate,
+                                height: rendition.video_track.video.height,
+                                width: rendition.video_track.video.width,
+                                index: i,
+                                label: rendition.name
+                            });
+                        }
+
+                        spec.currentQuality = 0;
+                        autoQuality = message.message.auto;
+                    }
+
+                    if (message.type === 'rendition_changed') {
+
+                        const rendition = message.message;
+
+                        if (message.auto) {
+                            autoQuality = message.auto;
+                        }
+
+                        let qualityIndex = -1;
+
+                        for (let i = 0; i < playlistFromOme.renditions.length; i ++) {
+
+                            if (rendition.rendition_name ===  playlistFromOme.renditions[i].name) {
+                                qualityIndex = i;
+                                spec.currentQuality = i;
+                                break;
+                            }
+                        }
+
+                        provider.trigger(CONTENT_LEVEL_CHANGED, {
+                            isAuto: autoQuality,
+                            currentQuality: qualityIndex,
+                            type: "render"
+                        });
+                    }
+                }
+
                 if (message.command === 'stop') {
 
                     if (mainPeerConnectionInfo.peerId === message.peer_id) {
@@ -885,6 +936,38 @@ const WebRTCLoader = function (provider,
 
     }
 
+    provider.setCurrentQuality = (qualityIndex) => {
+
+        let rendition = playlistFromOme.renditions[qualityIndex];
+
+        sendMessage(ws, {
+            command: 'change_rendition',
+            id: mainPeerConnectionInfo.id,
+            rendition_name: rendition.name,
+            auto: false
+        });
+
+        autoQuality = false;
+
+        spec.currentQuality = qualityIndex;
+        return spec.currentQuality;
+    };
+
+    provider.isAutoQuality = () => {
+
+        return autoQuality;
+    };
+
+    provider.setAutoQuality = (auto) => {
+
+        sendMessage(ws, {
+            command: 'change_rendition',
+            id: mainPeerConnectionInfo.id,
+            auto: auto
+        });
+        autoQuality = auto;
+    };
+
     that.connect = () => {
 
         initialize();

package/src/js/view/components/controls/settingPanel/qualityPanel.js

@@ -49,7 +49,7 @@ const QualityPanel = function($container, api, data){
             event.preventDefault();
             let value = LA$(event.currentTarget).attr("op-data-value");
             if(value === "AUTO"){
-                api.setAutoQuality(true);
+                api.setAutoQuality(!api.isAutoQuality());
             }else{
                 api.setCurrentQuality(parseInt(value));
             }