@stremio/stremio-video 0.0.74 → 0.0.76

package/package.json

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

package/src/ShellVideo/ShellVideo.js

@@ -26,6 +26,7 @@ var stremioToMPVProps = {
     'subtitlesTextColor': 'sub-color',
     'subtitlesBackgroundColor': 'sub-back-color',
     'subtitlesOutlineColor': 'sub-border-color',
+    'hdrInfo': null,
 };
 
 function parseVersion(version) {
@@ -191,6 +192,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 +261,7 @@ function ShellVideo(options) {
     });
 
     function getProp(propName) {
+        if (propName === 'hdrInfo') return props.hdrInfo || null;
         if(stremioToMPVProps[propName]) return props[stremioToMPVProps[propName]];
         // eslint-disable-next-line no-console
         console.log('Unsupported prop requested', propName);
@@ -371,9 +390,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]);

package/src/withHTMLSubtitles/withHTMLSubtitles.js

@@ -43,6 +43,7 @@ function withHTMLSubtitles(Video) {
         var videoState = {
             time: null,
             paused: false,
+            buffering: false,
             lastSyncAt: null,
             playbackSpeed: 1
         };
@@ -78,7 +79,7 @@ function withHTMLSubtitles(Video) {
             if (videoState.time === null || !isFinite(videoState.time)) {
                 return null;
             }
-            if (videoState.paused || videoState.lastSyncAt === null) {
+            if (videoState.paused || videoState.buffering || videoState.lastSyncAt === null) {
                 return videoState.time;
             }
             return videoState.time + (Date.now() - videoState.lastSyncAt) * videoState.playbackSpeed;
@@ -156,7 +157,7 @@ function withHTMLSubtitles(Video) {
                     break;
                 }
                 case 'paused': {
-                    if (propValue && !videoState.paused && videoState.lastSyncAt !== null && videoState.time !== null) {
+                    if (propValue && !videoState.paused && !videoState.buffering && videoState.lastSyncAt !== null && videoState.time !== null) {
                         videoState.time = videoState.time + (Date.now() - videoState.lastSyncAt) * videoState.playbackSpeed;
                         videoState.lastSyncAt = Date.now();
                     } else if (!propValue && videoState.paused) {
@@ -165,9 +166,19 @@ function withHTMLSubtitles(Video) {
                     videoState.paused = propValue;
                     break;
                 }
+                case 'buffering': {
+                    if (propValue && !videoState.buffering && !videoState.paused && videoState.lastSyncAt !== null && videoState.time !== null) {
+                        videoState.time = videoState.time + (Date.now() - videoState.lastSyncAt) * videoState.playbackSpeed;
+                        videoState.lastSyncAt = Date.now();
+                    } else if (!propValue && videoState.buffering) {
+                        videoState.lastSyncAt = Date.now();
+                    }
+                    videoState.buffering = propValue;
+                    break;
+                }
                 case 'playbackSpeed': {
                     if (propValue !== null && isFinite(propValue)) {
-                        if (!videoState.paused && videoState.lastSyncAt !== null && videoState.time !== null) {
+                        if (!videoState.paused && !videoState.buffering && videoState.lastSyncAt !== null && videoState.time !== null) {
                             videoState.time = videoState.time + (Date.now() - videoState.lastSyncAt) * videoState.playbackSpeed;
                             videoState.lastSyncAt = Date.now();
                         }
@@ -289,6 +300,9 @@ function withHTMLSubtitles(Video) {
         function setProp(propName, propValue) {
             switch (propName) {
                 case 'selectedExtraSubtitlesTrackId': {
+                    if (propValue !== null && selectedTrackId === propValue) {
+                        return true;
+                    }
                     cuesByTime = null;
                     selectedTrackId = null;
                     delay = null;