forks
/
peertube
1
0
Fork 0
Code Releases Activity

Merge branch 'release/5.1.0' into develop

This commit is contained in:
Chocobozzz 2023-03-07 11:59:47 +01:00
parent 09f3d81e0c ef19c8ae4c
commit 0e3026f315
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/app/+videos/+video-edit/shared/video-edit.component.html
View File

@ -45,9 +45,11 @@
<my-help helpType="markdownText">
<ng-template ptTemplate="preHtml">
<ng-container i18n>
Video descriptions are truncated by default and require manual action to expand them.
</ng-container>
<ng-container i18n>Video descriptions are truncated by default and require manual action to expand them.</ng-container>
<br />
<ng-container i18n>A timestamp (<i>00:05</i> for example) is automatically converted into a link to a part of the video.</ng-container>
</ng-template>
</my-help>

3
client/src/assets/player/shared/manager-options/hls-options-builder.ts
View File

@ -96,7 +96,6 @@ export class HLSOptionsBuilder {
segmentValidator: segmentValidatorFactory({
segmentsSha256Url: this.options.p2pMediaLoader.segmentsSha256Url,
isLive: this.options.common.isLive,
authorizationHeader: this.options.common.authorizationHeader,
requiresAuth: this.options.common.requiresAuth,
serverUrl: this.options.common.serverUrl
@ -129,7 +128,7 @@ export class HLSOptionsBuilder {
...base,
useP2P: false,
httpDownloadProbability: 1
requiredSegmentsPriority: 10
}
case LiveVideoLatencyMode.HIGH_LATENCY:

10
client/src/assets/player/shared/p2p-media-loader/segment-validator.ts
View File

@ -7,24 +7,20 @@ import { isSameOrigin } from '../common'
type SegmentsJSON = { [filename: string]: string | { [byterange: string]: string } }
const maxRetries = 3
const maxRetries = 10
function segmentValidatorFactory (options: {
serverUrl: string
segmentsSha256Url: string
isLive: boolean
authorizationHeader: () => string
requiresAuth: boolean
}) {
const { serverUrl, segmentsSha256Url, isLive, authorizationHeader, requiresAuth } = options
const { serverUrl, segmentsSha256Url, authorizationHeader, requiresAuth } = options
let segmentsJSON = fetchSha256Segments({ serverUrl, segmentsSha256Url, authorizationHeader, requiresAuth })
const regex = /bytes=(\d+)-(\d+)/
return async function segmentValidator (segment: Segment, _method: string, _peerId: string, retry = 1) {
// Wait for hash generation from the server
if (isLive) await wait(1000)
const filename = basename(removeQueryParams(segment.url))
const segmentValue = (await segmentsJSON)[filename]
@ -36,7 +32,7 @@ function segmentValidatorFactory (options: {
if (!segmentValue) {
logger.info(`Refetching sha segments for ${filename}`)
await wait(1000)
await wait(500)
segmentsJSON = fetchSha256Segments({ serverUrl, segmentsSha256Url, authorizationHeader, requiresAuth })
await segmentValidator(segment, _method, _peerId, retry + 1)

2
scripts/create-move-video-storage-job.ts
View File

@ -72,6 +72,8 @@ async function run () {
for (const id of ids) {
const videoFull = await VideoModel.loadFull(id)
if (videoFull.isLive) continue
const files = videoFull.VideoFiles || []
const hls = videoFull.getHLSPlaylist()