X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Flive-manager.ts;h=d63e79dfc6edb8055aa98ba8bfb9ee32e4127840;hb=4ec25ae825f8dee44d948b38d8216f9a239ff7b3;hp=31753619caa5b86d8dfda909b75f36308f19d45f;hpb=210856a7be4631540791bad027fb3ef0f7a51f14;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/live-manager.ts b/server/lib/live-manager.ts
index 31753619c..d63e79dfc 100644
--- a/server/lib/live-manager.ts
+++ b/server/lib/live-manager.ts
@@ -4,13 +4,8 @@ import { FfmpegCommand } from 'fluent-ffmpeg'
 import { ensureDir, stat } from 'fs-extra'
 import { basename } from 'path'
 import { isTestInstance } from '@server/helpers/core-utils'
-import {
-  computeResolutionsToTranscode,
-  getVideoFileFPS,
-  getVideoFileResolution,
-  runLiveMuxing,
-  runLiveTranscoding
-} from '@server/helpers/ffmpeg-utils'
+import { getLiveMuxingCommand, getLiveTranscodingCommand } from '@server/helpers/ffmpeg-utils'
+import { computeResolutionsToTranscode, getVideoFileFPS, getVideoFileResolution } from '@server/helpers/ffprobe-utils'
 import { logger } from '@server/helpers/logger'
 import { CONFIG, registerConfigChangedHandler } from '@server/initializers/config'
 import { MEMOIZE_TTL, P2P_MEDIA_LOADER_PEER_VERSION, VIDEO_LIVE, VIEW_LIFETIME, WEBSERVER } from '@server/initializers/constants'
@@ -27,6 +22,7 @@ import { JobQueue } from './job-queue'
 import { PeerTubeSocket } from './peertube-socket'
 import { isAbleToUploadVideo } from './user'
 import { getHLSDirectory } from './video-paths'
+import { availableEncoders } from './video-transcoding-profiles'
 
 import memoizee = require('memoizee')
 const NodeRtmpServer = require('node-media-server/node_rtmp_server')
@@ -99,6 +95,10 @@ class LiveManager {
       }
     })
 
+    // Cleanup broken lives, that were terminated by a server restart for example
+    this.handleBrokenLives()
+      .catch(err => logger.error('Cannot handle broken lives.', { err }))
+
     setInterval(() => this.updateLiveViews(), VIEW_LIFETIME.LIVE)
   }
 
@@ -199,13 +199,15 @@ class LiveManager {
       ? computeResolutionsToTranscode(resolutionResult.videoFileResolution, 'live')
       : []
 
-    logger.info('Will mux/transcode live video of original resolution %d.', session.videoHeight, { resolutionsEnabled })
+    const allResolutions = resolutionsEnabled.concat([ session.videoHeight ])
+
+    logger.info('Will mux/transcode live video of original resolution %d.', session.videoHeight, { allResolutions })
 
     const [ videoStreamingPlaylist ] = await VideoStreamingPlaylistModel.upsert({
       videoId: video.id,
       playlistUrl,
       segmentsSha256Url: WEBSERVER.URL + VideoStreamingPlaylistModel.getHlsSha256SegmentsStaticPath(video.uuid, video.isLive),
-      p2pMediaLoaderInfohashes: VideoStreamingPlaylistModel.buildP2PMediaLoaderInfoHashes(playlistUrl, resolutionsEnabled),
+      p2pMediaLoaderInfohashes: VideoStreamingPlaylistModel.buildP2PMediaLoaderInfoHashes(playlistUrl, allResolutions),
       p2pMediaLoaderPeerVersion: P2P_MEDIA_LOADER_PEER_VERSION,
 
       type: VideoStreamingPlaylistType.HLS
@@ -215,10 +217,9 @@ class LiveManager {
       sessionId,
       videoLive,
       playlist: videoStreamingPlaylist,
-      originalResolution: session.videoHeight,
       rtmpUrl,
       fps,
-      resolutionsEnabled
+      allResolutions
     })
   }
 
@@ -228,12 +229,10 @@ class LiveManager {
     playlist: MStreamingPlaylist
     rtmpUrl: string
     fps: number
-    resolutionsEnabled: number[]
-    originalResolution: number
+    allResolutions: number[]
   }) {
-    const { sessionId, videoLive, playlist, resolutionsEnabled, originalResolution, fps, rtmpUrl } = options
+    const { sessionId, videoLive, playlist, allResolutions, fps, rtmpUrl } = options
     const startStreamDateTime = new Date().getTime()
-    const allResolutions = resolutionsEnabled.concat([ originalResolution ])
 
     const user = await UserModel.loadByLiveId(videoLive.id)
     if (!this.livesPerUser.has(user.id)) {
@@ -266,24 +265,42 @@ class LiveManager {
     const deleteSegments = videoLive.saveReplay === false
 
     const ffmpegExec = CONFIG.LIVE.TRANSCODING.ENABLED
-      ? runLiveTranscoding(rtmpUrl, outPath, allResolutions, fps, deleteSegments)
-      : runLiveMuxing(rtmpUrl, outPath, deleteSegments)
+      ? await getLiveTranscodingCommand({
+        rtmpUrl,
+        outPath,
+        resolutions: allResolutions,
+        fps,
+        deleteSegments,
+        availableEncoders,
+        profile: 'default'
+      })
+      : getLiveMuxingCommand(rtmpUrl, outPath, deleteSegments)
 
     logger.info('Running live muxing/transcoding for %s.', videoUUID)
     this.transSessions.set(sessionId, ffmpegExec)
 
     const tsWatcher = chokidar.watch(outPath + '/*.ts')
 
-    let segmentsToProcess: string[] = []
+    const segmentsToProcessPerPlaylist: { [playlistId: string]: string[] } = {}
+    const playlistIdMatcher = /^([\d+])-/
 
-    const addHandler = segmentPath => {
+    const processHashSegments = (segmentsToProcess: string[]) => {
       // Add sha hash of previous segments, because ffmpeg should have finished generating them
       for (const previousSegment of segmentsToProcess) {
         this.addSegmentSha(videoUUID, previousSegment)
           .catch(err => logger.error('Cannot add sha segment of video %s -> %s.', videoUUID, previousSegment, { err }))
       }
+    }
+
+    const addHandler = segmentPath => {
+      logger.debug('Live add handler of %s.', segmentPath)
+
+      const playlistId = basename(segmentPath).match(playlistIdMatcher)[0]
 
-      segmentsToProcess = [ segmentPath ]
+      const segmentsToProcess = segmentsToProcessPerPlaylist[playlistId] || []
+      processHashSegments(segmentsToProcess)
+
+      segmentsToProcessPerPlaylist[playlistId] = [ segmentPath ]
 
       // Duration constraint check
       if (this.isDurationConstraintValid(startStreamDateTime) !== true) {
@@ -324,11 +341,15 @@ class LiveManager {
         await video.save()
         videoLive.Video = video
 
-        await federateVideoIfNeeded(video, false)
+        setTimeout(() => {
+          federateVideoIfNeeded(video, false)
+            .catch(err => logger.error('Cannot federate live video %s.', video.url, { err }))
+
+          PeerTubeSocket.Instance.sendVideoLiveNewState(video)
+        }, VIDEO_LIVE.SEGMENT_TIME_SECONDS * 1000 * VIDEO_LIVE.EDGE_LIVE_DELAY_SEGMENTS_NOTIFICATION)
 
-        PeerTubeSocket.Instance.sendVideoLiveNewState(video)
       } catch (err) {
-        logger.error('Cannot federate video %d.', videoLive.videoId, { err })
+        logger.error('Cannot save/federate live video %d.', videoLive.videoId, { err })
       } finally {
         masterWatcher.close()
           .catch(err => logger.error('Cannot close master watcher of %s.', outPath, { err }))
@@ -341,11 +362,21 @@ class LiveManager {
       this.transSessions.delete(sessionId)
       this.watchersPerVideo.delete(videoLive.videoId)
 
-      Promise.all([ tsWatcher.close(), masterWatcher.close() ])
-        .catch(err => logger.error('Cannot close watchers of %s.', outPath, { err }))
-
-      this.onEndTransmuxing(videoLive.Video.id)
-        .catch(err => logger.error('Error in closed transmuxing.', { err }))
+      setTimeout(() => {
+        // Wait latest segments generation, and close watchers
+
+        Promise.all([ tsWatcher.close(), masterWatcher.close() ])
+        .then(() => {
+          // Process remaining segments hash
+          for (const key of Object.keys(segmentsToProcessPerPlaylist)) {
+            processHashSegments(segmentsToProcessPerPlaylist[key])
+          }
+        })
+        .catch(err => logger.error('Cannot close watchers of %s or process remaining hash segments.', outPath, { err }))
+
+        this.onEndTransmuxing(videoLive.Video.id)
+          .catch(err => logger.error('Error in closed transmuxing.', { err }))
+      }, 1000)
     }
 
     ffmpegExec.on('error', (err, stdout, stderr) => {
@@ -360,6 +391,8 @@ class LiveManager {
     })
 
     ffmpegExec.on('end', () => onFFmpegEnded())
+
+    ffmpegExec.run()
   }
 
   private async onEndTransmuxing (videoId: number, cleanupNow = false) {
@@ -461,6 +494,14 @@ class LiveManager {
     }
   }
 
+  private async handleBrokenLives () {
+    const videoIds = await VideoModel.listPublishedLiveIds()
+
+    for (const id of videoIds) {
+      await this.onEndTransmuxing(id, true)
+    }
+  }
+
   static get Instance () {
     return this.instance || (this.instance = new this())
   }