jellyfin/jellyfin-media-player
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-media-player.git synced 2025-02-17 04:17:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ian Walton 2021-08-01 13:40:59 -04:00
parent 8410913a32
commit 9587b504be
2 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
native/mpvAudioPlayer.js
View File

@ -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', [
{

42
native/mpvVideoPlayer.js
View File

@ -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
*/