Prevent app crash when media fails to load. (#88)

jellyfin · Aug 1, 2021 · 9587b50 · 9587b50
1 parent 8410913
commit 9587b50
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 16 deletions.
diff --git a/native/mpvAudioPlayer.js b/native/mpvAudioPlayer.js
@@ -30,7 +30,7 @@ function cancelFadeTimeout() {
 }
 
 class mpvAudioPlayer {
-    constructor({ events, appHost, appSettings }) {
+    constructor({ events, appHost, appSettings, toast }) {
         const self = this;
 
         self.events = events;
@@ -178,7 +178,8 @@ class mpvAudioPlayer {
         }
 
         function onError(error) {
-            console.error(`media element error: ${error}`);
+            console.error(`media error: ${error}`);
+            toast(`media error: ${error}`);
 
             self.events.trigger(self, 'error', [
                 {

diff --git a/native/mpvVideoPlayer.js b/native/mpvVideoPlayer.js
@@ -7,7 +7,7 @@
     }
 
     class mpvVideoPlayer {
-        constructor({ events, loading, appRouter, globalize, appHost, appSettings }) {
+        constructor({ events, loading, appRouter, globalize, appHost, appSettings, toast }) {
             this.events = events;
             this.loading = loading;
             this.appRouter = appRouter;
@@ -190,11 +190,20 @@
              * @param e {Event} The event received from the `<video>` element
              */
             this.onError = (error) => {
-                console.error(`media element error: ${error}`);
+                this.removeMediaDialog();
+                toast(`media error: ${error}`);
+                console.error(`media error: ${error}`);
 
                 this.events.trigger(this, 'error', [
                     {
-                        type: 'mediadecodeerror'
+                        type: 'mediadecodeerror',
+                        // Prevent jellyfin-web retrying with transcode
+                        // which crashes the player
+                        streamInfo: {
+                            mediaSource: {
+                                SupportsTranscoding: false
+                            }
+                        }
                     }
                 ]);
             };
@@ -375,23 +384,14 @@
             return Promise.resolve();
         }
 
-        destroy() {
+        removeMediaDialog() {
+            this.loading.hide();
             window.api.player.stop();
             window.api.power.setScreensaverEnabled(true);
 
             this.appRouter.setTransparency('none');
             document.body.classList.remove('hide-scroll');
 
-            const player = window.api.player;
-            this._hasConnection = false;
-            player.playing.disconnect(this.onPlaying);
-            player.positionUpdate.disconnect(this.onTimeUpdate);
-            player.finished.disconnect(this.onEnded);
-            this._duration = undefined;
-            player.updateDuration.disconnect(this.onDuration);
-            player.error.disconnect(this.onError);
-            player.paused.disconnect(this.onPause);
-
             const dlg = this._videoDialog;
             if (dlg) {
                 this._videoDialog = null;
@@ -404,6 +404,20 @@
             }
         }
 
+        destroy() {
+            this.removeMediaDialog();
+
+            const player = window.api.player;
+            this._hasConnection = false;
+            player.playing.disconnect(this.onPlaying);
+            player.positionUpdate.disconnect(this.onTimeUpdate);
+            player.finished.disconnect(this.onEnded);
+            this._duration = undefined;
+            player.updateDuration.disconnect(this.onDuration);
+            player.error.disconnect(this.onError);
+            player.paused.disconnect(this.onPause);
+        }
+
         /**
          * @private
          */