@stremio/stremio-video 0.0.75 → 0.0.77

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@stremio/stremio-video",
-    "version": "0.0.75",
+    "version": "0.0.77",
     "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) {
@@ -308,6 +310,9 @@ function HTMLVideo(options) {
 
                 return videoElement.playbackRate;
             }
+            case 'videoScale': {
+                return videoElement.style.objectFit || 'contain';
+            }
             default: {
                 return null;
             }
@@ -520,6 +525,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;
             }
         }
@@ -696,7 +710,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

@@ -26,6 +26,8 @@ var stremioToMPVProps = {
     'subtitlesTextColor': 'sub-color',
     'subtitlesBackgroundColor': 'sub-back-color',
     'subtitlesOutlineColor': 'sub-border-color',
+    'hdrInfo': null,
+    'videoScale': null,
 };
 
 function parseVersion(version) {
@@ -191,6 +193,23 @@ function ShellVideo(options) {
                 props[args.name] = embeddedProp(args);
                 break;
             }
+            case 'video-params': {
+                props[args.name] = args.data;
+                var params = args.data || {};
+                var gamma = typeof params.gamma === 'string' ? params.gamma : null;
+                if (gamma === 'pq' || gamma === 'hlg') {
+                    props.hdrInfo = {
+                        gamma: gamma,
+                        primaries: typeof params.primaries === 'string' ? params.primaries : null,
+                        maxCll: typeof params['max-cll'] === 'number' ? params['max-cll'] : null,
+                        maxLuma: typeof params['max-luma'] === 'number' ? params['max-luma'] : null,
+                    };
+                } else {
+                    props.hdrInfo = null;
+                }
+                onPropChanged('hdrInfo');
+                break;
+            }
             // In that case onPropChanged() is manually invoked as track-list contains all
             // the tracks but we have different event for each track type
             case 'track-list': {
@@ -243,6 +262,8 @@ 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);
@@ -288,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;
@@ -371,9 +413,14 @@ function ShellVideo(options) {
                         var hwdecValue = commandArgs.hardwareDecoding ? 'auto-copy' : 'no';
                         ipc.send('mpv-set-prop', ['hwdec', hwdecValue]);
 
-                        // Video mode
-                        var videoOutput = commandArgs.platform === 'windows' ? (commandArgs.videoMode === null ? 'gpu-next' : 'gpu') : 'libmpv';
-                        ipc.send('mpv-set-prop', ['vo', videoOutput]);
+                        // 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]);
+                        }
 
                         var separateWindow = options.mpvSeparateWindow ? 'yes' : 'no';
                         ipc.send('mpv-set-prop', ['osc', separateWindow]);