@stremio/stremio-video 0.0.63 → 0.0.65

package/package.json

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

package/src/ShellVideo/ShellVideo.js

@@ -356,19 +356,18 @@ function ShellVideo(options) {
                         stream = commandArgs.stream;
                         onPropChanged('stream');
 
-                        ipc.send('mpv-set-prop', ['sub-ass-override', 'strip']);
+                        var subAssOverride = commandArgs.assSubtitlesStyling ? 'strip' : 'no';
+                        ipc.send('mpv-set-prop', ['sub-ass-override', subAssOverride]);
 
                         // Hardware decoding
                         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

@@ -38,7 +38,7 @@ function TizenVideo(options) {
     objElement.style.backgroundColor = 'black';
 
     var lastSub;
-    var disabledSubs = false;
+    var disabledSubs = true;
 
     function refreshSubtitle() {
         if (lastSub) {
@@ -235,9 +235,6 @@ function TizenVideo(options) {
                     if (totalTrackInfo[i].type === 'TEXT') {
                         var textTrack = totalTrackInfo[i];
                         var textTrackId = 'EMBEDDED_' + String(textTrack.index);
-                        if (!currentSubTrack && !textTracks.length) {
-                            currentSubTrack = textTrackId;
-                        }
                         var extra = {};
                         try {
                             extra = JSON.parse(textTrack.extra_info);

package/src/VidaaVideo/VidaaVideo.js

@@ -329,9 +329,17 @@ function VidaaVideo(options) {
             }
             case 'selectedSubtitlesTrackId': {
                 if (stream !== null) {
+                    // important: disable all first
+                    Array.from(videoElement.textTracks)
+                        .forEach(function(track) {
+                            track.mode = 'disabled';
+                        });
+                    // then enable selected
                     Array.from(videoElement.textTracks)
                         .forEach(function(track, index) {
-                            track.mode = 'EMBEDDED_' + String(index) === propValue ? 'showing' : 'disabled';
+                            if ('EMBEDDED_' + String(index) === propValue) {
+                                track.mode = 'showing';
+                            }
                         });
                     var selecterdSubtitlesTrack = getProp('subtitlesTracks')
                         .find(function(track) {
@@ -405,8 +413,12 @@ function VidaaVideo(options) {
                     onPropChanged('buffering');
                     if (videoElement.textTracks) {
                         videoElement.textTracks.onaddtrack = function() {
-                            videoElement.textTracks.onaddtrack = null;
                             setTimeout(function() {
+                                // disable all embedded tracks on start
+                                Array.from(videoElement.textTracks)
+                                    .forEach(function(track) {
+                                        track.mode = 'disabled';
+                                    });
                                 onPropChanged('subtitlesTracks');
                                 onPropChanged('selectedSubtitlesTrackId');
                             });
@@ -414,7 +426,6 @@ function VidaaVideo(options) {
                     }
                     if (videoElement.audioTracks) {
                         videoElement.audioTracks.onaddtrack = function() {
-                            videoElement.audioTracks.onaddtrack = null;
                             setTimeout(function() {
                                 onPropChanged('audioTracks');
                                 onPropChanged('selectedAudioTrackId');
@@ -431,6 +442,8 @@ function VidaaVideo(options) {
                 break;
             }
             case 'unload': {
+                videoElement.textTracks.onaddtrack = null;
+                videoElement.audioTracks.onaddtrack = null;
                 stream = null;
                 Array.from(videoElement.textTracks).forEach(function(track) {
                     track.oncuechange = null;

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: {