@stremio/stremio-video 0.0.62 → 0.0.64

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stremio/stremio-video",
-    "version": "0.0.62",
+    "version": "0.0.64",
     "description": "Abstraction layer on top of different media players",
     "author": "Smart Code OOD",
     "main": "src/index.js",

package/src/ShellVideo/ShellVideo.js

@@ -362,13 +362,11 @@ function ShellVideo(options) {
                         var hwdecValue = commandArgs.hardwareDecoding ? 'auto-copy' : 'no';
                         ipc.send('mpv-set-prop', ['hwdec', hwdecValue]);
 
-                        // opengl-cb is an alias for the new name "libmpv", as shown in mpv's video/out/vo.c aliases
-                        // opengl is an alias for the new name "gpu"
-                        // When on Windows we use d3d for the rendering in separate window
-                        var windowRenderer = navigator.platform === 'Win32' ? 'direct3d' : 'opengl';
-                        var videoOutput = options.mpvSeparateWindow ? windowRenderer : 'opengl-cb';
-                        var separateWindow = options.mpvSeparateWindow ? 'yes' : 'no';
+                        // Video mode
+                        var videoOutput = commandArgs.platform === 'windows' ? (commandArgs.videoMode === null ? 'gpu-next' : 'gpu') : 'libmpv';
                         ipc.send('mpv-set-prop', ['vo', videoOutput]);
+
+                        var separateWindow = options.mpvSeparateWindow ? 'yes' : 'no';
                         ipc.send('mpv-set-prop', ['osc', separateWindow]);
                         ipc.send('mpv-set-prop', ['input-default-bindings', separateWindow]);
                         ipc.send('mpv-set-prop', ['input-vo-keyboard', separateWindow]);

package/src/TizenVideo/TizenVideo.js

@@ -4,7 +4,6 @@ var deepFreeze = require('deep-freeze');
 var Color = require('color');
 var ERROR = require('../error');
 var getTracksData = require('../tracksData');
-var createAVPlay = require('./AVPlay');
 
 var SSA_DESCRIPTORS_REGEX = /^\{(\\an[1-8])+\}/i;
 
@@ -21,7 +20,7 @@ function TizenVideo(options) {
         throw new Error('Container element required to be instance of HTMLElement');
     }
 
-    var AVPlay = createAVPlay(options.transport);
+    var AVPlay = window.webapis.avplay;
 
     var promiseAudioTrackChange = false;
 
@@ -41,17 +40,17 @@ function TizenVideo(options) {
     var lastSub;
     var disabledSubs = false;
 
-    async function refreshSubtitle() {
+    function refreshSubtitle() {
         if (lastSub) {
-            var currentTime = await getProp('time');
+            var currentTime = getProp('time');
             var lastSubDurationDiff = lastSub.duration - (currentTime - lastSub.now);
             if (lastSubDurationDiff > 0) renderSubtitle(lastSubDurationDiff, lastSub.text);
         }
     }
 
-    async function renderSubtitle(duration, text) {
+    function renderSubtitle(duration, text) {
         if (disabledSubs) return;
-        var now = await getProp('time');
+        var now = getProp('time');
         var cleanedText = text.replace(SSA_DESCRIPTORS_REGEX, '');
 
         // we ignore custom delay here, it's not needed for embedded subs
@@ -178,7 +177,7 @@ function TizenVideo(options) {
         }
     }
 
-    async function getProp(propName) {
+    function getProp(propName) {
         switch (propName) {
             case 'stream': {
                 return stream;
@@ -191,7 +190,7 @@ function TizenVideo(options) {
                     return null;
                 }
 
-                var state = await AVPlay.getState();
+                var state = AVPlay.getState();
                 var isPaused = !!(state === 'PAUSED');
 
                 if (!isPaused && promiseAudioTrackChange) {
@@ -202,7 +201,7 @@ function TizenVideo(options) {
                 return isPaused;
             }
             case 'time': {
-                var currentTime = await AVPlay.getCurrentTime();
+                var currentTime = AVPlay.getCurrentTime();
                 if (stream === null || currentTime === null || !isFinite(currentTime)) {
                     return null;
                 }
@@ -210,7 +209,7 @@ function TizenVideo(options) {
                 return Math.floor(currentTime);
             }
             case 'duration': {
-                var duration = await AVPlay.getDuration();
+                var duration = AVPlay.getDuration();
                 if (stream === null || duration === null || !isFinite(duration)) {
                     return null;
                 }
@@ -229,7 +228,7 @@ function TizenVideo(options) {
                     return [];
                 }
 
-                var totalTrackInfo = await AVPlay.getTotalTrackInfo();
+                var totalTrackInfo = AVPlay.getTotalTrackInfo();
                 var textTracks = [];
 
                 for (var i = 0; i < totalTrackInfo.length; i++) {
@@ -272,7 +271,7 @@ function TizenVideo(options) {
                     return null;
                 }
 
-                var currentTracks = await AVPlay.getCurrentStreamInfo();
+                var currentTracks = AVPlay.getCurrentStreamInfo();
                 var currentIndex;
 
                 for (var i = 0; i < currentTracks.length; i++) {
@@ -333,7 +332,7 @@ function TizenVideo(options) {
                     return [];
                 }
 
-                var totalTrackInfo = await AVPlay.getTotalTrackInfo();
+                var totalTrackInfo = AVPlay.getTotalTrackInfo();
                 var audioTracks = [];
 
                 for (var i = 0; i < totalTrackInfo.length; i++) {
@@ -380,7 +379,7 @@ function TizenVideo(options) {
                     return promiseAudioTrackChange;
                 }
 
-                var currentTracks = await AVPlay.getCurrentStreamInfo();
+                var currentTracks = AVPlay.getCurrentStreamInfo();
                 var currentIndex = false;
 
                 for (var i = 0; i < currentTracks.length; i++) {
@@ -414,20 +413,20 @@ function TizenVideo(options) {
     function onEnded() {
         events.emit('ended');
     }
-    async function onPropChanged(propName) {
+    function onPropChanged(propName) {
         if (observedProps[propName]) {
-            var propValue = await getProp(propName);
+            var propValue = getProp(propName);
             events.emit('propChanged', propName, propValue);
         }
     }
-    async function observeProp(propName) {
+    function observeProp(propName) {
         if (observedProps.hasOwnProperty(propName)) {
-            var propValue = await getProp(propName);
+            var propValue = getProp(propName);
             events.emit('propValue', propName, propValue);
             observedProps[propName] = true;
         }
     }
-    async function setProp(propName, propValue) {
+    function setProp(propName, propValue) {
         switch (propName) {
             case 'paused': {
                 if (stream !== null) {
@@ -446,10 +445,10 @@ function TizenVideo(options) {
 
                 // the paused state is usually correct, but i have seen it not change on tizen 3
                 // which causes all kinds of issues in the UI: (only happens with some videos)
-                var lastKnownProp = await getProp('paused');
+                var lastKnownProp = getProp('paused');
 
-                setTimeout(async function() {
-                    if (await getProp('paused') !== lastKnownProp) {
+                setTimeout(function() {
+                    if (getProp('paused') !== lastKnownProp) {
                         onPropChanged('paused');
                     }
                 }, 1000);
@@ -478,7 +477,7 @@ function TizenVideo(options) {
 
                         currentSubTrack = propValue;
 
-                        var subtitlesTracks = await getProp('subtitlesTracks');
+                        var subtitlesTracks = getProp('subtitlesTracks');
                         var selectedSubtitlesTrack = subtitlesTracks
                             .find(function(track) {
                                 return track.id === propValue;
@@ -584,13 +583,13 @@ function TizenVideo(options) {
                 if (stream !== null) {
                     currentAudioTrack = propValue;
 
-                    var audioTracks = await getProp('audioTracks');
+                    var audioTracks = getProp('audioTracks');
                     var selectedAudioTrack = audioTracks
                         .find(function(track) {
                             return track.id === propValue;
                         });
 
-                    if (await getProp('paused')) {
+                    if (getProp('paused')) {
                         // issues before this logic:
                         // tizen 3 does not allow changing audio track when paused
                         // tizen 5 does, but it will only change getProp('selectedAudioTrackId') after playback starts

package/src/WebOsVideo/WebOsVideo.js

@@ -20,52 +20,6 @@ function luna(params, call, fail, method) {
     window.webOS.service.request(method || 'luna://com.webos.media', params);
 }
 
-function launchVideoApp(params, success, failure) {
-    window.webOS.service.request('luna://com.webos.applicationManager', {
-        method: 'launch',
-        parameters: {
-            'id': params.id,
-            'params': {
-                'payload':[
-                    {
-                        'fullPath': params.url,
-                        'artist':'',
-                        'subtitle':'',
-                        'dlnaInfo':{
-                            'flagVal':4096,
-                            'cleartextSize':'-1',
-                            'contentLength':'-1',
-                            'opVal':1,
-                            'protocolInfo':'http-get:*:video/x-matroska:DLNA.ORG_OP=01;DLNA.ORG_CI=0;DLNA.ORG_FLAGS=01700000000000000000000000000000',
-                            'duration':0
-                        },
-                        'mediaType':'VIDEO',
-                        'thumbnail':'',
-                        'deviceType':'DMR',
-                        'album':'',
-                        'fileName': params.name,
-                        'lastPlayPosition': params.position
-                    }
-                ]
-            }
-        },
-        onSuccess: function () {
-            success && success();
-        },
-        onFailure: function () {
-            failure && failure(new Error('Failed to launch' + params.id));
-
-            if (params.id === 'com.webos.app.photovideo') {
-                params.id = 'com.webos.app.smartshare';
-                launchVideoApp(params, success, failure);
-            } else if(params.id === 'com.webos.app.smartshare') {
-                params.id = 'com.webos.app.mediadiscovery';
-                launchVideoApp(params, success, failure);
-            }
-        }
-    });
-}
-
 var webOsColors = ['none', 'black', 'white', 'yellow', 'red', 'green', 'blue'];
 var stremioColors = {
     // rgba
@@ -562,28 +516,10 @@ function WebOsVideo(options) {
             }
             case 3: {
                 error = ERROR.HTML_VIDEO.MEDIA_ERR_DECODE;
-                launchVideoApp({
-                    id: 'com.webos.app.photovideo',
-                    url: stream.url,
-                    name: 'Stremio',
-                    position: -1,
-                }, null, function(e) {
-                    // eslint-disable-next-line no-console
-                    console.error(e);
-                });
                 break;
             }
             case 4: {
                 error = ERROR.HTML_VIDEO.MEDIA_ERR_SRC_NOT_SUPPORTED;
-                launchVideoApp({
-                    id: 'com.webos.app.photovideo',
-                    url: stream.url,
-                    name: 'Stremio',
-                    position: -1,
-                }, null, function(e) {
-                    // eslint-disable-next-line no-console
-                    console.error(e);
-                });
                 break;
             }
             default: {

package/src/TizenVideo/AVPlay.js

@@ -1,98 +0,0 @@
-const SCOPE = 'AVPlay';
-
-const createAVPlay = (transport) => {
-    const getState = () => {
-        return transport.request(SCOPE, 'getState');
-    };
-
-    const getCurrentTime = () => {
-        return transport.request(SCOPE, 'getCurrentTime');
-    };
-
-    const getDuration = () => {
-        return transport.request(SCOPE, 'getDuration');
-    };
-
-    const getTotalTrackInfo = () => {
-        return transport.request(SCOPE, 'getTotalTrackInfo');
-    };
-
-    const getCurrentStreamInfo = () => {
-        return transport.request(SCOPE, 'getCurrentStreamInfo');
-    };
-
-    const open = (path) => {
-        return transport.request(SCOPE, 'open', path);
-    };
-
-    const prepareAsync = async (successHandler, errorHandler) => {
-        const [handler, handlerResult] = await transport.request(SCOPE, 'prepareAsync', 'handler:success', 'handler:error');
-        if (handler === 'handler:success') successHandler();
-        if (handler === 'handler:error') errorHandler(...handlerResult);
-    };
-
-    const pause = () => {
-        return transport.request(SCOPE, 'pause');
-    };
-
-    const play = () => {
-        return transport.request(SCOPE, 'play');
-    };
-
-    const stop = () => {
-        return transport.request(SCOPE, 'stop');
-    };
-
-    const seekTo = (time) => {
-        return transport.request(SCOPE, 'seekTo', time);
-    };
-
-    const setSpeed = (rate) => {
-        return transport.request(SCOPE, 'setSpeed', rate);
-    };
-
-    const setSelectTrack = (type, id) => {
-        return transport.request(SCOPE, 'setSelectTrack', type, id);
-    };
-
-    const setDisplayRect = (x, y, width, height) => {
-        return transport.request(SCOPE, 'setDisplayRect', x, y, width, height);
-    };
-
-    const setDisplayMethod = (method) => {
-        return transport.request(SCOPE, 'setDisplayMethod', method);
-    };
-
-    const setListener = (listener) => {
-        const handlers = Object.keys(listener).map((name) => `handler:${name}`);
-        const onHandlerResponse = (handler, handlerResult) => {
-            const name = handler.replace('handler:', '');
-            if (listener[name]) {
-                handlerResult ? listener[name](...handlerResult) : listener[name]();
-            }
-        };
-
-        transport.listen(SCOPE, 'setListener', onHandlerResponse, ...handlers);
-    };
-
-    return {
-        getState,
-        getCurrentTime,
-        getDuration,
-        getTotalTrackInfo,
-        getCurrentStreamInfo,
-        open,
-        prepareAsync,
-        pause,
-        play,
-        stop,
-        seekTo,
-        setSpeed,
-        setSelectTrack,
-        setDisplayRect,
-        setDisplayMethod,
-        setListener,
-    };
-};
-
-module.exports = createAVPlay;