X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Flive-manager.ts;h=66b5d119bd5ecf1e4f448ce8766e53794e2b3bf1;hb=f43db2f46ee50bacb402a6ef42d768694c2bc9a8;hp=c8e5bcb774d7d0fb94acb114634c46456dc1e6a3;hpb=529b37527cff5203a0689a15ce73dcee6e1eece2;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/live-manager.ts b/server/lib/live-manager.ts index c8e5bcb77..66b5d119b 100644 --- a/server/lib/live-manager.ts +++ b/server/lib/live-manager.ts @@ -16,7 +16,7 @@ import { VideoModel } from '@server/models/video/video' import { VideoFileModel } from '@server/models/video/video-file' import { VideoLiveModel } from '@server/models/video/video-live' import { VideoStreamingPlaylistModel } from '@server/models/video/video-streaming-playlist' -import { MStreamingPlaylist, MUserId, MVideoLive, MVideoLiveVideo } from '@server/types/models' +import { MStreamingPlaylist, MStreamingPlaylistVideo, MUserId, MVideoLive, MVideoLiveVideo } from '@server/types/models' import { VideoState, VideoStreamingPlaylistType } from '@shared/models' import { federateVideoIfNeeded } from './activitypub/videos' import { buildSha256Segment } from './hls' @@ -277,7 +277,7 @@ class LiveManager { return this.runMuxing({ sessionId, videoLive, - playlist: videoStreamingPlaylist, + playlist: Object.assign(videoStreamingPlaylist, { Video: video }), rtmpUrl, fps, allResolutions @@ -287,7 +287,7 @@ class LiveManager { private async runMuxing (options: { sessionId: string videoLive: MVideoLiveVideo - playlist: MStreamingPlaylist + playlist: MStreamingPlaylistVideo rtmpUrl: string fps: number allResolutions: number[] @@ -338,7 +338,7 @@ class LiveManager { resolutions: allResolutions, fps, availableEncoders: VideoTranscodingProfilesManager.Instance.getAvailableEncoders(), - profile: 'default' + profile: CONFIG.LIVE.TRANSCODING.PROFILE }) : getLiveMuxingCommand(rtmpUrl, outPath) @@ -495,7 +495,7 @@ class LiveManager { await federateVideoIfNeeded(fullVideo, false) } catch (err) { - logger.error('Cannot save/federate new video state of live streaming.', { err }) + logger.error('Cannot save/federate new video state of live streaming of video id %d.', videoId, { err }) } }