aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-06-08 10:17:47 +0200
committerChocobozzz <me@florianbigard.com>2021-06-08 10:17:47 +0200
commitffacd78f21d4021b3c0f654ff63ef29ca7afcde3 (patch)
treee2cebf3ccb43b9c5ffcab68a838d6f25d3719c0a
parenta13df19d578d3c5bf8babfc1864e45fbfda98a47 (diff)
downloadPeerTube-ffacd78f21d4021b3c0f654ff63ef29ca7afcde3.tar.gz
PeerTube-ffacd78f21d4021b3c0f654ff63ef29ca7afcde3.tar.zst
PeerTube-ffacd78f21d4021b3c0f654ff63ef29ca7afcde3.zip
Load embed api resolutions on init
-rw-r--r--client/src/assets/player/p2p-media-loader/p2p-media-loader-plugin.ts4
-rw-r--r--client/src/standalone/videos/embed-api.ts6
2 files changed, 8 insertions, 2 deletions
diff --git a/client/src/assets/player/p2p-media-loader/p2p-media-loader-plugin.ts b/client/src/assets/player/p2p-media-loader/p2p-media-loader-plugin.ts
index 4275a5e5e..f1bd9f0c4 100644
--- a/client/src/assets/player/p2p-media-loader/p2p-media-loader-plugin.ts
+++ b/client/src/assets/player/p2p-media-loader/p2p-media-loader-plugin.ts
@@ -124,6 +124,10 @@ class P2pMediaLoaderPlugin extends Plugin {
124 this.trigger('resolutionChange', { auto: this.hlsjs.autoLevelEnabled, resolutionId: data.height }) 124 this.trigger('resolutionChange', { auto: this.hlsjs.autoLevelEnabled, resolutionId: data.height })
125 }) 125 })
126 126
127 this.hlsjs.on(Hlsjs.Events.MANIFEST_LOADED, (_: any, data: any) => {
128 this.trigger('resolutionsLoaded')
129 })
130
127 this.p2pEngine.on(Events.SegmentError, (segment: Segment, err) => { 131 this.p2pEngine.on(Events.SegmentError, (segment: Segment, err) => {
128 console.error('Segment error.', segment, err) 132 console.error('Segment error.', segment, err)
129 133
diff --git a/client/src/standalone/videos/embed-api.ts b/client/src/standalone/videos/embed-api.ts
index 94e39ec29..75174f2f8 100644
--- a/client/src/standalone/videos/embed-api.ts
+++ b/client/src/standalone/videos/embed-api.ts
@@ -140,12 +140,14 @@ export class PeerTubeEmbedApi {
140 }) 140 })
141 141
142 // PeerTube specific capabilities 142 // PeerTube specific capabilities
143
144 if (this.isWebtorrent()) { 143 if (this.isWebtorrent()) {
145 this.embed.player.webtorrent().on('autoResolutionUpdate', () => this.loadWebTorrentResolutions()) 144 this.embed.player.webtorrent().on('autoResolutionUpdate', () => this.loadWebTorrentResolutions())
146 this.embed.player.webtorrent().on('videoFileUpdate', () => this.loadWebTorrentResolutions()) 145 this.embed.player.webtorrent().on('videoFileUpdate', () => this.loadWebTorrentResolutions())
146
147 this.loadWebTorrentResolutions()
147 } else { 148 } else {
148 this.embed.player.p2pMediaLoader().on('resolutionChange', () => this.loadP2PMediaLoaderResolutions()) 149 this.embed.player.p2pMediaLoader().on('resolutionChange', () => this.loadP2PMediaLoaderResolutions())
150 this.embed.player.p2pMediaLoader().on('resolutionsLoaded', () => this.loadP2PMediaLoaderResolutions())
149 } 151 }
150 152
151 this.embed.player.on('volumechange', () => { 153 this.embed.player.on('volumechange', () => {
@@ -207,6 +209,6 @@ export class PeerTubeEmbedApi {
207 } 209 }
208 210
209 private isWebtorrent () { 211 private isWebtorrent () {
210 return this.embed.player.webtorrent 212 return !!this.embed.player.webtorrent
211 } 213 }
212} 214}