aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/lib/video-transcoding.ts
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2019-04-08 12:08:16 +0200
committerChocobozzz <me@florianbigard.com>2019-04-08 12:08:16 +0200
commit594d0c6a7c64b045c11508bb4e4b19b75b3fc557 (patch)
tree942e4a3715f7bc97a57fe3c04dc1dd160899de02 /server/lib/video-transcoding.ts
parent0e9c48c2edbb3871b0ca3ccd6718f2c99f9760b6 (diff)
downloadPeerTube-594d0c6a7c64b045c11508bb4e4b19b75b3fc557.tar.gz
PeerTube-594d0c6a7c64b045c11508bb4e4b19b75b3fc557.tar.zst
PeerTube-594d0c6a7c64b045c11508bb4e4b19b75b3fc557.zip
Fix HLS federation
Diffstat (limited to 'server/lib/video-transcoding.ts')
-rw-r--r--server/lib/video-transcoding.ts3
1 files changed, 2 insertions, 1 deletions
diff --git a/server/lib/video-transcoding.ts b/server/lib/video-transcoding.ts
index c29e34ab5..dbc22816c 100644
--- a/server/lib/video-transcoding.ts
+++ b/server/lib/video-transcoding.ts
@@ -1,4 +1,4 @@
1import { CONFIG, HLS_STREAMING_PLAYLIST_DIRECTORY } from '../initializers' 1import { CONFIG, HLS_STREAMING_PLAYLIST_DIRECTORY, P2P_MEDIA_LOADER_PEER_VERSION } from '../initializers'
2import { join } from 'path' 2import { join } from 'path'
3import { getVideoFileFPS, transcode } from '../helpers/ffmpeg-utils' 3import { getVideoFileFPS, transcode } from '../helpers/ffmpeg-utils'
4import { ensureDir, move, remove, stat } from 'fs-extra' 4import { ensureDir, move, remove, stat } from 'fs-extra'
@@ -118,6 +118,7 @@ async function generateHlsPlaylist (video: VideoModel, resolution: VideoResoluti
118 playlistUrl, 118 playlistUrl,
119 segmentsSha256Url: CONFIG.WEBSERVER.URL + VideoStreamingPlaylistModel.getHlsSha256SegmentsStaticPath(video.uuid), 119 segmentsSha256Url: CONFIG.WEBSERVER.URL + VideoStreamingPlaylistModel.getHlsSha256SegmentsStaticPath(video.uuid),
120 p2pMediaLoaderInfohashes: VideoStreamingPlaylistModel.buildP2PMediaLoaderInfoHashes(playlistUrl, video.VideoFiles), 120 p2pMediaLoaderInfohashes: VideoStreamingPlaylistModel.buildP2PMediaLoaderInfoHashes(playlistUrl, video.VideoFiles),
121 p2pMediaLoaderPeerVersion: P2P_MEDIA_LOADER_PEER_VERSION,
121 122
122 type: VideoStreamingPlaylistType.HLS 123 type: VideoStreamingPlaylistType.HLS
123 }) 124 })