OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Hide useless error when destroying fake renderer

pull/1144/head
Chocobozzz 2018-09-28 14:22:25 +02:00
parent 65be133b90
commit 287918da17
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/src/assets/player/peertube-videojs-plugin.ts
View File

@ -55,8 +55,11 @@ class PeerTubePlugin extends Plugin {
private currentVideoFile: VideoFile private currentVideoFile: VideoFile
private torrent: WebTorrent.Torrent private torrent: WebTorrent.Torrent
private videoCaptions: VideoJSCaption[] private videoCaptions: VideoJSCaption[]
private renderer private renderer
private fakeRenderer private fakeRenderer
private destoyingFakeRenderer = false
private autoResolution = true private autoResolution = true
private forbidAutoResolution = false private forbidAutoResolution = false
private isAutoResolutionObservation = false private isAutoResolutionObservation = false
@ -599,11 +602,16 @@ class PeerTubePlugin extends Plugin {
} }
private renderFileInFakeElement (file: WebTorrent.TorrentFile, delay: number) { private renderFileInFakeElement (file: WebTorrent.TorrentFile, delay: number) {
this.destoyingFakeRenderer = false
const fakeVideoElem = document.createElement('video') const fakeVideoElem = document.createElement('video')
renderVideo(file, fakeVideoElem, { autoplay: false, controls: false }, (err, renderer) => { renderVideo(file, fakeVideoElem, { autoplay: false, controls: false }, (err, renderer) => {
this.fakeRenderer = renderer this.fakeRenderer = renderer
if (err) console.error('Cannot render new torrent in fake video element.', err) // The renderer returns an error when we destroy it, so skip them
if (this.destoyingFakeRenderer === false && err) {
console.error('Cannot render new torrent in fake video element.', err)
}
// Load the future file at the correct time (in delay MS - 2 seconds) // Load the future file at the correct time (in delay MS - 2 seconds)
fakeVideoElem.currentTime = this.player.currentTime() + (delay - 2000) fakeVideoElem.currentTime = this.player.currentTime() + (delay - 2000)
@ -612,6 +620,8 @@ class PeerTubePlugin extends Plugin {
private destroyFakeRenderer () { private destroyFakeRenderer () {
if (this.fakeRenderer) { if (this.fakeRenderer) {
this.destoyingFakeRenderer = true
if (this.fakeRenderer.destroy) { if (this.fakeRenderer.destroy) {
try { try {
this.fakeRenderer.destroy() this.fakeRenderer.destroy()