@stremio/stremio-video 0.0.76 → 0.0.78

package/package.json

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

package/src/HTMLVideo/HTMLVideo.js

@@ -22,6 +22,7 @@ function HTMLVideo(options) {
     videoElement.style.width = '100%';
     videoElement.style.height = '100%';
     videoElement.style.backgroundColor = 'black';
+    videoElement.style.objectFit = 'contain';
     videoElement.controls = false;
     videoElement.playsInline = true;
     videoElement.onerror = function() {
@@ -123,7 +124,8 @@ function HTMLVideo(options) {
         selectedAudioTrackId: false,
         volume: false,
         muted: false,
-        playbackSpeed: false
+        playbackSpeed: false,
+        videoScale: false
     };
 
     function getProp(propName) {
@@ -253,39 +255,49 @@ function HTMLVideo(options) {
                 return Math.round(subtitlesOpacity * 100);
             }
             case 'audioTracks': {
-                if (hls === null || !Array.isArray(hls.audioTracks)) {
+                if (hls === null || !Array.isArray(hls.allAudioTracks)) {
                     return [];
                 }
 
-                return hls.audioTracks
-                    .map(function(track) {
+                return hls.allAudioTracks
+                    .map(function(track, index) {
                         return Object.freeze({
-                            id: 'EMBEDDED_' + String(track.id),
+                            id: 'EMBEDDED_' + String(index),
                             lang: typeof track.lang === 'string' && track.lang.length > 0 ?
                                 track.lang
                                 :
                                 typeof track.name === 'string' && track.name.length > 0 ?
                                     track.name
                                     :
-                                    String(track.id),
+                                    String(index),
                             label: typeof track.name === 'string' && track.name.length > 0 ?
                                 track.name
                                 :
                                 typeof track.lang === 'string' && track.lang.length > 0 ?
                                     track.lang
                                     :
-                                    String(track.id),
+                                    String(index),
                             origin: 'EMBEDDED',
                             embedded: true
                         });
                     });
             }
             case 'selectedAudioTrackId': {
-                if (hls === null || hls.audioTrack === null || !isFinite(hls.audioTrack) || hls.audioTrack === -1) {
+                if (hls === null || hls.audioTrack === -1) {
+                    return null;
+                }
+
+                var currentGroupTrack = hls.audioTracks[hls.audioTrack];
+                if (!currentGroupTrack) {
+                    return null;
+                }
+
+                var allTracksIndex = hls.allAudioTracks.indexOf(currentGroupTrack);
+                if (allTracksIndex === -1) {
                     return null;
                 }
 
-                return 'EMBEDDED_' + String(hls.audioTrack);
+                return 'EMBEDDED_' + String(allTracksIndex);
             }
             case 'volume': {
                 if (destroyed || videoElement.volume === null || !isFinite(videoElement.volume)) {
@@ -308,6 +320,9 @@ function HTMLVideo(options) {
 
                 return videoElement.playbackRate;
             }
+            case 'videoScale': {
+                return videoElement.style.objectFit || 'contain';
+            }
             default: {
                 return null;
             }
@@ -486,14 +501,18 @@ function HTMLVideo(options) {
             }
             case 'selectedAudioTrackId': {
                 if (hls !== null) {
-                    var selecterdAudioTrack = getProp('audioTracks')
+                    var selectedAudioTrack = getProp('audioTracks')
                         .find(function(track) {
                             return track.id === propValue;
                         });
-                    hls.audioTrack = selecterdAudioTrack ? parseInt(selecterdAudioTrack.id.split('_').pop(), 10) : -1;
-                    if (selecterdAudioTrack) {
+                    if (selectedAudioTrack) {
+                        var trackIndex = parseInt(selectedAudioTrack.id.split('_').pop(), 10);
+                        var allTracks = hls.allAudioTracks;
+                        if (trackIndex >= 0 && trackIndex < allTracks.length) {
+                            hls.setAudioOption(allTracks[trackIndex]);
+                        }
                         onPropChanged('selectedAudioTrackId');
-                        events.emit('audioTrackLoaded', selecterdAudioTrack);
+                        events.emit('audioTrackLoaded', selectedAudioTrack);
                     }
                 }
 
@@ -520,6 +539,15 @@ function HTMLVideo(options) {
                     onPropChanged('playbackSpeed');
                 }
 
+                break;
+            }
+            case 'videoScale': {
+                var validValues = ['contain', 'cover', 'fill'];
+                if (validValues.indexOf(propValue) !== -1) {
+                    videoElement.style.objectFit = propValue;
+                    onPropChanged('videoScale');
+                }
+
                 break;
             }
         }
@@ -559,6 +587,9 @@ function HTMLVideo(options) {
                                     onPropChanged('audioTracks');
                                     onPropChanged('selectedAudioTrackId');
                                 });
+                                hls.on(Hls.Events.MANIFEST_LOADING, function() {
+                                    hls.subtitleTrack = -1;
+                                });
                                 hls.loadSource(stream.url);
                                 hls.attachMedia(videoElement);
                             } else {
@@ -696,7 +727,7 @@ HTMLVideo.canPlayStream = function(stream) {
 HTMLVideo.manifest = {
     name: 'HTMLVideo',
     external: false,
-    props: ['stream', 'loaded', 'paused', 'time', 'duration', 'buffering', 'buffered', 'audioTracks', 'selectedAudioTrackId', 'subtitlesTracks', 'selectedSubtitlesTrackId', 'subtitlesOffset', 'subtitlesSize', 'subtitlesTextColor', 'subtitlesBackgroundColor', 'subtitlesOutlineColor', 'subtitlesOpacity', 'volume', 'muted', 'playbackSpeed'],
+    props: ['stream', 'loaded', 'paused', 'time', 'duration', 'buffering', 'buffered', 'audioTracks', 'selectedAudioTrackId', 'subtitlesTracks', 'selectedSubtitlesTrackId', 'subtitlesOffset', 'subtitlesSize', 'subtitlesTextColor', 'subtitlesBackgroundColor', 'subtitlesOutlineColor', 'subtitlesOpacity', 'volume', 'muted', 'playbackSpeed', 'videoScale'],
     commands: ['load', 'unload', 'destroy'],
     events: ['propValue', 'propChanged', 'ended', 'error', 'subtitlesTrackLoaded', 'audioTrackLoaded']
 };

package/src/ShellVideo/ShellVideo.js

@@ -27,6 +27,7 @@ var stremioToMPVProps = {
     'subtitlesBackgroundColor': 'sub-back-color',
     'subtitlesOutlineColor': 'sub-border-color',
     'hdrInfo': null,
+    'videoScale': null,
 };
 
 function parseVersion(version) {
@@ -262,6 +263,7 @@ function ShellVideo(options) {
 
     function getProp(propName) {
         if (propName === 'hdrInfo') return props.hdrInfo || null;
+        if (propName === 'videoScale') return props.videoScale || 'contain';
         if(stremioToMPVProps[propName]) return props[stremioToMPVProps[propName]];
         // eslint-disable-next-line no-console
         console.log('Unsupported prop requested', propName);
@@ -307,6 +309,27 @@ function ShellVideo(options) {
                 }
                 break;
             }
+            case 'videoScale': {
+                if (stream !== null) {
+                    switch (propValue) {
+                        case 'cover':
+                            ipc.send('mpv-set-prop', ['keepaspect', true]);
+                            ipc.send('mpv-set-prop', ['panscan', 1.0]);
+                            break;
+                        case 'fill':
+                            ipc.send('mpv-set-prop', ['keepaspect', false]);
+                            ipc.send('mpv-set-prop', ['panscan', 0.0]);
+                            break;
+                        default:
+                            ipc.send('mpv-set-prop', ['keepaspect', true]);
+                            ipc.send('mpv-set-prop', ['panscan', 0.0]);
+                            break;
+                    }
+                    props.videoScale = propValue;
+                    onPropChanged('videoScale');
+                }
+                break;
+            }
             case 'volume': {
                 if (stream !== null && propValue !== null && isFinite(propValue)) {
                     props.mute = false;
@@ -390,14 +413,9 @@ function ShellVideo(options) {
                         var hwdecValue = commandArgs.hardwareDecoding ? 'auto-copy' : 'no';
                         ipc.send('mpv-set-prop', ['hwdec', hwdecValue]);
 
-                        // On macOS the shell manages vo and HDR/EDR configuration
-                        // directly — do not override vo here.
-                        var platformLower = String(commandArgs.platform || '').toLowerCase();
-                        var isMac = platformLower.indexOf('mac') !== -1;
-                        if (!isMac) {
-                            var videoOutput = platformLower === 'windows' ? (commandArgs.videoMode === null ? 'gpu-next' : 'gpu') : 'libmpv';
-                            ipc.send('mpv-set-prop', ['vo', videoOutput]);
-                        }
+                        // Video output
+                        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]);

package/src/WebOsVideo/WebOsVideo.js

@@ -352,7 +352,9 @@ function WebOsVideo(options) {
                             mode: audioTrackId === currentAudioTrack ? 'showing' : 'disabled',
                         });
                     });
-                    currentAudioTrack = 'EMBEDDED_0';
+                    if (!currentAudioTrack) {
+                        currentAudioTrack = 'EMBEDDED_0';
+                    }
                     onPropChanged('audioTracks');
                     onPropChanged('selectedAudioTrackId');
                 }

package/src/withHTMLSubtitles/withHTMLSubtitles.js

@@ -189,6 +189,10 @@ function withHTMLSubtitles(Video) {
             }
 
             events.emit(eventName, propName, getProp(propName, propValue));
+
+            if (propName === 'selectedSubtitlesTrackId' && propValue !== null && selectedTrackId !== null) {
+                setProp('selectedExtraSubtitlesTrackId', null);
+            }
         }
         function onOtherVideoEvent(eventName) {
             return function() {
@@ -300,6 +304,13 @@ function withHTMLSubtitles(Video) {
         function setProp(propName, propValue) {
             switch (propName) {
                 case 'selectedExtraSubtitlesTrackId': {
+                    if (propValue !== null) {
+                        video.dispatch({
+                            type: 'setProp',
+                            propName: 'selectedSubtitlesTrackId',
+                            propValue: null,
+                        });
+                    }
                     if (propValue !== null && selectedTrackId === propValue) {
                         return true;
                     }

package/src/withStreamingServer/withStreamingServer.js

@@ -375,7 +375,10 @@ function withStreamingServer(Video) {
 
                             return true;
                         });
-                        return isFormatSupported && areStreamsSupported;
+                        var hasEmbeddedSubtitles = probe.streams.some(function(stream) {
+                            return stream.track === 'subtitle';
+                        });
+                        return isFormatSupported && areStreamsSupported && !hasEmbeddedSubtitles;
                     })
                     .catch(function() {
                         // this uses content-type header in HTMLVideo which