aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/lib/live-manager.ts
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-02-16 16:25:53 +0100
committerChocobozzz <chocobozzz@cpy.re>2021-02-18 13:38:09 +0100
commit90a8bd305de4153ec21137a73ff482dcc2e3e19b (patch)
tree2e35b5504ec11bc51579c92a70c77ed3d5ace816 /server/lib/live-manager.ts
parent684cdacbbd775b5f404dd7b373e02dd21baf5ff0 (diff)
downloadPeerTube-90a8bd305de4153ec21137a73ff482dcc2e3e19b.tar.gz
PeerTube-90a8bd305de4153ec21137a73ff482dcc2e3e19b.tar.zst
PeerTube-90a8bd305de4153ec21137a73ff482dcc2e3e19b.zip
Dissociate video file names and video uuid
Diffstat (limited to 'server/lib/live-manager.ts')
-rw-r--r--server/lib/live-manager.ts6
1 files changed, 3 insertions, 3 deletions
diff --git a/server/lib/live-manager.ts b/server/lib/live-manager.ts
index 9f17b8820..b549c189f 100644
--- a/server/lib/live-manager.ts
+++ b/server/lib/live-manager.ts
@@ -16,7 +16,7 @@ import { VideoModel } from '@server/models/video/video'
16import { VideoFileModel } from '@server/models/video/video-file' 16import { VideoFileModel } from '@server/models/video/video-file'
17import { VideoLiveModel } from '@server/models/video/video-live' 17import { VideoLiveModel } from '@server/models/video/video-live'
18import { VideoStreamingPlaylistModel } from '@server/models/video/video-streaming-playlist' 18import { VideoStreamingPlaylistModel } from '@server/models/video/video-streaming-playlist'
19import { MStreamingPlaylist, MUserId, MVideoLive, MVideoLiveVideo } from '@server/types/models' 19import { MStreamingPlaylist, MStreamingPlaylistVideo, MUserId, MVideoLive, MVideoLiveVideo } from '@server/types/models'
20import { VideoState, VideoStreamingPlaylistType } from '@shared/models' 20import { VideoState, VideoStreamingPlaylistType } from '@shared/models'
21import { federateVideoIfNeeded } from './activitypub/videos' 21import { federateVideoIfNeeded } from './activitypub/videos'
22import { buildSha256Segment } from './hls' 22import { buildSha256Segment } from './hls'
@@ -277,7 +277,7 @@ class LiveManager {
277 return this.runMuxing({ 277 return this.runMuxing({
278 sessionId, 278 sessionId,
279 videoLive, 279 videoLive,
280 playlist: videoStreamingPlaylist, 280 playlist: Object.assign(videoStreamingPlaylist, { Video: video }),
281 rtmpUrl, 281 rtmpUrl,
282 fps, 282 fps,
283 allResolutions 283 allResolutions
@@ -287,7 +287,7 @@ class LiveManager {
287 private async runMuxing (options: { 287 private async runMuxing (options: {
288 sessionId: string 288 sessionId: string
289 videoLive: MVideoLiveVideo 289 videoLive: MVideoLiveVideo
290 playlist: MStreamingPlaylist 290 playlist: MStreamingPlaylistVideo
291 rtmpUrl: string 291 rtmpUrl: string
292 fps: number 292 fps: number
293 allResolutions: number[] 293 allResolutions: number[]