aboutsummaryrefslogtreecommitdiffhomepage
path: root/client
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2022-03-03 14:30:55 +0100
committerChocobozzz <me@florianbigard.com>2022-03-08 09:45:40 +0100
commite55079c90b0bc8ec287e6a09b981d53f2f46d379 (patch)
treee9de1dfc499507dc8a9c732bdcd37fc8f6ba040a /client
parentf6f48301a9ad392759d714d2cff13f1564942a50 (diff)
downloadPeerTube-e55079c90b0bc8ec287e6a09b981d53f2f46d379.tar.gz
PeerTube-e55079c90b0bc8ec287e6a09b981d53f2f46d379.tar.zst
PeerTube-e55079c90b0bc8ec287e6a09b981d53f2f46d379.zip
Fix stuck hls player with bad redundancy
Diffstat (limited to 'client')
-rw-r--r--client/package.json4
-rw-r--r--client/src/assets/player/peertube-player-options-builder.ts6
-rw-r--r--client/yarn.lock16
3 files changed, 15 insertions, 11 deletions
diff --git a/client/package.json b/client/package.json
index 721f6ea84..26ca15210 100644
--- a/client/package.json
+++ b/client/package.json
@@ -53,8 +53,8 @@
53 "@ngx-loading-bar/core": "^6.0.0", 53 "@ngx-loading-bar/core": "^6.0.0",
54 "@ngx-loading-bar/http-client": "^6.0.0", 54 "@ngx-loading-bar/http-client": "^6.0.0",
55 "@ngx-loading-bar/router": "^6.0.0", 55 "@ngx-loading-bar/router": "^6.0.0",
56 "@peertube/p2p-media-loader-core": "^1.0.5", 56 "@peertube/p2p-media-loader-core": "^1.0.6",
57 "@peertube/p2p-media-loader-hlsjs": "^1.0.7", 57 "@peertube/p2p-media-loader-hlsjs": "^1.0.8",
58 "@peertube/videojs-contextmenu": "^5.5.0", 58 "@peertube/videojs-contextmenu": "^5.5.0",
59 "@peertube/xliffmerge": "^2.0.3", 59 "@peertube/xliffmerge": "^2.0.3",
60 "@types/chart.js": "^2.9.16", 60 "@types/chart.js": "^2.9.16",
diff --git a/client/src/assets/player/peertube-player-options-builder.ts b/client/src/assets/player/peertube-player-options-builder.ts
index 71be5ccff..7a82b128d 100644
--- a/client/src/assets/player/peertube-player-options-builder.ts
+++ b/client/src/assets/player/peertube-player-options-builder.ts
@@ -268,10 +268,14 @@ export class PeertubePlayerOptionsBuilder {
268 268
269 return { 269 return {
270 trackerAnnounce, 270 trackerAnnounce,
271 segmentValidator: segmentValidatorFactory(this.options.p2pMediaLoader.segmentsSha256Url, this.options.common.isLive),
272 rtcConfig: getRtcConfig(), 271 rtcConfig: getRtcConfig(),
272
273 simultaneousHttpDownloads: 1, 273 simultaneousHttpDownloads: 1,
274 httpFailedSegmentTimeout: 1000,
275
276 segmentValidator: segmentValidatorFactory(this.options.p2pMediaLoader.segmentsSha256Url, this.options.common.isLive),
274 segmentUrlBuilder: segmentUrlBuilderFactory(redundancyUrlManager, 1), 277 segmentUrlBuilder: segmentUrlBuilderFactory(redundancyUrlManager, 1),
278
275 useP2P: this.options.common.p2pEnabled, 279 useP2P: this.options.common.p2pEnabled,
276 consumeOnly, 280 consumeOnly,
277 281
diff --git a/client/yarn.lock b/client/yarn.lock
index 2c2123c36..847fe77d2 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -1564,10 +1564,10 @@
1564 tslib "^2.3.0" 1564 tslib "^2.3.0"
1565 yargs-parser "20.0.0" 1565 yargs-parser "20.0.0"
1566 1566
1567"@peertube/p2p-media-loader-core@^1.0.5": 1567"@peertube/p2p-media-loader-core@^1.0.6":
1568 version "1.0.5" 1568 version "1.0.6"
1569 resolved "https://registry.yarnpkg.com/@peertube/p2p-media-loader-core/-/p2p-media-loader-core-1.0.5.tgz#a9332cd35854be8641b04dd99a1fb444528ddaa8" 1569 resolved "https://registry.yarnpkg.com/@peertube/p2p-media-loader-core/-/p2p-media-loader-core-1.0.6.tgz#e5d1b02aa60fe3a8b82dd486745d9ac8cdddbac0"
1570 integrity sha512-AeZELrwP0LW+VO65MKFYwsObNr3uavoYp4pTnutX/Csv+S5ICT13o99lndfq5p1IKkS7UmDt5ffY9VFlr0GZrQ== 1570 integrity sha512-S3xdYU5MPIf8LtXpd2EXtJJLIPtjQxRYbS3ytnx5t83/ALnP+p8OVR5u+sq3ghq5EMsxbCXUn29pR88BHSdyQw==
1571 dependencies: 1571 dependencies:
1572 bittorrent-tracker "^9.16.1" 1572 bittorrent-tracker "^9.16.1"
1573 debug "^4.3.1" 1573 debug "^4.3.1"
@@ -1575,10 +1575,10 @@
1575 sha.js "^2.4.11" 1575 sha.js "^2.4.11"
1576 simple-peer "^9.10.0" 1576 simple-peer "^9.10.0"
1577 1577
1578"@peertube/p2p-media-loader-hlsjs@^1.0.7": 1578"@peertube/p2p-media-loader-hlsjs@^1.0.8":
1579 version "1.0.7" 1579 version "1.0.8"
1580 resolved "https://registry.yarnpkg.com/@peertube/p2p-media-loader-hlsjs/-/p2p-media-loader-hlsjs-1.0.7.tgz#2246f9ad8c541efa031056fbc9e1ffe38bf391b5" 1580 resolved "https://registry.yarnpkg.com/@peertube/p2p-media-loader-hlsjs/-/p2p-media-loader-hlsjs-1.0.8.tgz#fb638709fe7155aecd978f4a58c03f660c3649f8"
1581 integrity sha512-fK5YchZUK1zjoCak+1KYLWt9fGBeIkUOx/joVw+suHoe8y16X6QTpYoB8FGaz+lNm8G6FOcDgcX7CEYu0I4azA== 1581 integrity sha512-x+NNNdwiE87chZRv3RbDfWNvhAca1MkhmbF7vYwnQnBPZndpv6053dSnTUmckihRSAfW0wNi1evbFQ80ip57dw==
1582 dependencies: 1582 dependencies:
1583 events "^3.3.0" 1583 events "^3.3.0"
1584 m3u8-parser "^4.6.0" 1584 m3u8-parser "^4.6.0"