@stremio/stremio-video 0.0.51 → 0.0.53

package/package.json

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

package/src/ShellVideo/ShellVideo.js

@@ -20,6 +20,8 @@ var stremioToMPVProps = {
     'subtitlesTracks': 'subtitlesTracks',
     'selectedSubtitlesTrackId': 'sid',
     'subtitlesSize': 'sub-scale',
+    'subtitlesOffset': 'sub-pos',
+    'subtitlesDelay': 'sub-delay',
     'subtitlesTextColor': 'sub-color',
     'subtitlesBackgroundColor': 'sub-back-color',
     'subtitlesOutlineColor': 'sub-border-color',
@@ -77,6 +79,7 @@ function ShellVideo(options) {
     ipc.send('mpv-observe-prop', 'sid');
     ipc.send('mpv-observe-prop', 'sub-scale');
     ipc.send('mpv-observe-prop', 'sub-pos');
+    ipc.send('mpv-observe-prop', 'sub-delay');
     ipc.send('mpv-observe-prop', 'speed');
 
     ipc.send('mpv-observe-prop', 'mpv-version');
@@ -122,7 +125,6 @@ function ShellVideo(options) {
                 break;
             }
             case 'duration': {
-                setBackground(false);
                 var intDuration = args.data | 0;
                 // Accumulate average duration over time. if it is greater than minClipDuration
                 // and equal to the currently reported duration, it is returned as video length.
@@ -137,7 +139,10 @@ function ShellVideo(options) {
                 // which is around 34 years of playback time.
                 avgDuration = avgDuration ? (avgDuration + intDuration) >> 1 : intDuration;
                 props.loaded = intDuration > 0;
-                if(props.loaded) onPropChanged('loaded');
+                if(props.loaded) {
+                    setBackground(false);
+                    onPropChanged('loaded');
+                }
                 break;
             }
             case 'time-pos': {
@@ -148,6 +153,14 @@ function ShellVideo(options) {
                 props[args.name] = Math.round(args.data / SUBS_SCALE_FACTOR);
                 break;
             }
+            case 'sub-pos': {
+                props[args.name] = 100 - args.data;
+                break;
+            }
+            case 'sub-delay': {
+                props[args.name] = Math.round(args.data*1000);
+                break;
+            }
             case 'paused-for-cache':
             case 'seeking':
             {
@@ -304,10 +317,14 @@ function ShellVideo(options) {
                 ipc.send('mpv-set-prop', [stremioToMPVProps[propName], propValue * SUBS_SCALE_FACTOR]);
                 break;
             }
-            case 'subtitlesOffset': {
+            case 'subtitlesDelay': {
                 ipc.send('mpv-set-prop', [stremioToMPVProps[propName], propValue]);
                 break;
             }
+            case 'subtitlesOffset': {
+                ipc.send('mpv-set-prop', [stremioToMPVProps[propName], 100 - propValue]);
+                break;
+            }
             case 'subtitlesTextColor':
             case 'subtitlesBackgroundColor':
             case 'subtitlesOutlineColor':
@@ -334,6 +351,10 @@ function ShellVideo(options) {
 
                         ipc.send('mpv-set-prop', ['no-sub-ass']);
 
+                        // 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
@@ -342,7 +363,7 @@ function ShellVideo(options) {
                         var separateWindow = options.mpvSeparateWindow ? 'yes' : 'no';
                         ipc.send('mpv-set-prop', ['vo', videoOutput]);
                         ipc.send('mpv-set-prop', ['osc', separateWindow]);
-                        ipc.send('mpv-set-prop', ['input-defalt-bindings', separateWindow]);
+                        ipc.send('mpv-set-prop', ['input-default-bindings', separateWindow]);
                         ipc.send('mpv-set-prop', ['input-vo-keyboard', separateWindow]);
 
                         var startAt = Math.floor(parseInt(commandArgs.time, 10) / 1000) || 0;

package/src/StremioVideo/StremioVideo.js

@@ -66,6 +66,9 @@ function StremioVideo() {
                     video.on('extraSubtitlesTrackLoaded', function(track) {
                         events.emit('extraSubtitlesTrackLoaded', track);
                     });
+                    video.on('extraSubtitlesTrackAdded', function(track) {
+                        events.emit('extraSubtitlesTrackAdded', track);
+                    });
                     if (Video.manifest.external) {
                         video.on('implementationChanged', function(manifest) {
                             events.emit('implementationChanged', manifest);

package/src/withHTMLSubtitles/withHTMLSubtitles.js

@@ -225,15 +225,34 @@ function withHTMLSubtitles(Video) {
                     if (selectedTrack) {
                         selectedTrackId = selectedTrack.id;
                         delay = 0;
-                        function loadSubtitleFromUrl(url, isFallback) {
-                            fetch(url)
-                                .then(function(resp) {
-                                    if (resp.ok) {
-                                        return resp.text();
-                                    }
 
-                                    throw new Error(resp.status + ' (' + resp.statusText + ')');
-                                })
+                        function getSubtitlesData(track) {
+                            if (typeof track.url === 'string') {
+                                return fetch(track.url)
+                                    .then(function(resp) {
+                                        if (resp.ok) {
+                                            return resp.text();
+                                        }
+
+                                        throw new Error(resp.status + ' (' + resp.statusText + ')');
+                                    });
+                            }
+
+                            if (track.buffer instanceof ArrayBuffer) {
+                                try {
+                                    const uInt8Array = new Uint8Array(track.buffer);
+                                    const text = new TextDecoder().decode(uInt8Array);
+                                    return Promise.resolve(text);
+                                } catch(e) {
+                                    return Promise.reject(e);
+                                }
+                            }
+
+                            return Promise.reject('No `url` or `buffer` field available for this track');
+                        }
+
+                        function loadSubtitles(track, isFallback) {
+                            getSubtitlesData(track)
                                 .then(function(text) {
                                     return subtitlesConverter.convert(text);
                                 })
@@ -255,7 +274,7 @@ function withHTMLSubtitles(Video) {
                                     }
 
                                     if (!isFallback && typeof selectedTrack.fallbackUrl === 'string') {
-                                        loadSubtitleFromUrl(selectedTrack.fallbackUrl, true);
+                                        loadSubtitles(selectedTrack, true);
                                         return;
                                     }
 
@@ -266,7 +285,7 @@ function withHTMLSubtitles(Video) {
                                     }));
                                 });
                         }
-                        loadSubtitleFromUrl(selectedTrack.url);
+                        loadSubtitles(selectedTrack);
                     }
                     renderSubtitles();
                     onPropChanged('selectedExtraSubtitlesTrackId');
@@ -374,7 +393,6 @@ function withHTMLSubtitles(Video) {
                             .filter(function(track, index, tracks) {
                                 return track &&
                                     typeof track.id === 'string' &&
-                                    typeof track.url === 'string' &&
                                     typeof track.lang === 'string' &&
                                     typeof track.label === 'string' &&
                                     typeof track.origin === 'string' &&
@@ -386,6 +404,31 @@ function withHTMLSubtitles(Video) {
 
                     return true;
                 }
+                case 'addLocalSubtitles': {
+                    if (commandArgs && typeof commandArgs.filename === 'string' && commandArgs.buffer instanceof ArrayBuffer) {
+                        var id = 'LOCAL_' + tracks
+                            .filter(function(track) { return track.local; })
+                            .length;
+
+                        var track = {
+                            id: id,
+                            url: null,
+                            buffer: commandArgs.buffer,
+                            lang: 'local',
+                            label: commandArgs.filename,
+                            origin: 'LOCAL',
+                            local: true,
+                            embedded: false,
+                        };
+
+                        tracks.push(track);
+
+                        onPropChanged('extraSubtitlesTracks');
+                        events.emit('extraSubtitlesTrackAdded', track);
+                    }
+
+                    return true;
+                }
                 case 'load': {
                     command('unload');
                     if (commandArgs.stream && Array.isArray(commandArgs.stream.subtitles)) {
@@ -485,9 +528,9 @@ function withHTMLSubtitles(Video) {
         external: Video.manifest.external,
         props: Video.manifest.props.concat(['extraSubtitlesTracks', 'selectedExtraSubtitlesTrackId', 'extraSubtitlesDelay', 'extraSubtitlesSize', 'extraSubtitlesOffset', 'extraSubtitlesTextColor', 'extraSubtitlesBackgroundColor', 'extraSubtitlesOutlineColor', 'extraSubtitlesOpacity'])
             .filter(function(value, index, array) { return array.indexOf(value) === index; }),
-        commands: Video.manifest.commands.concat(['load', 'unload', 'destroy', 'addExtraSubtitlesTracks'])
+        commands: Video.manifest.commands.concat(['load', 'unload', 'destroy', 'addExtraSubtitlesTracks', 'addLocalSubtitles'])
             .filter(function(value, index, array) { return array.indexOf(value) === index; }),
-        events: Video.manifest.events.concat(['propValue', 'propChanged', 'error', 'extraSubtitlesTrackLoaded'])
+        events: Video.manifest.events.concat(['propValue', 'propChanged', 'error', 'extraSubtitlesTrackLoaded', 'extraSubtitlesTrackAdded'])
             .filter(function(value, index, array) { return array.indexOf(value) === index; })
     };