X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Fvideo-transcoding.ts;h=a7b73a30db2a4be67525bc33f2af52868afc4ae0;hb=ef680f68351ec10ab73a1131570a6d14ce14c195;hp=9dd54837fb3c2fe01d8e7721f6b733aa30d1c7b9;hpb=5c7d650827cc471a03e7fa18362bcbcbe5d30838;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/video-transcoding.ts b/server/lib/video-transcoding.ts
index 9dd54837f..a7b73a30d 100644
--- a/server/lib/video-transcoding.ts
+++ b/server/lib/video-transcoding.ts
@@ -3,6 +3,7 @@ import { basename, extname as extnameUtil, join } from 'path'
 import {
   canDoQuickTranscode,
   getDurationFromVideoFile,
+  getMetadataFromFile,
   getVideoFileFPS,
   transcode,
   TranscodeOptions,
@@ -12,13 +13,14 @@ import { copyFile, ensureDir, move, remove, stat } from 'fs-extra'
 import { logger } from '../helpers/logger'
 import { VideoResolution } from '../../shared/models/videos'
 import { VideoFileModel } from '../models/video/video-file'
-import { updateMasterHLSPlaylist, updateSha256Segments } from './hls'
+import { updateMasterHLSPlaylist, updateSha256VODSegments } from './hls'
 import { VideoStreamingPlaylistModel } from '../models/video/video-streaming-playlist'
 import { VideoStreamingPlaylistType } from '../../shared/models/videos/video-streaming-playlist.type'
 import { CONFIG } from '../initializers/config'
-import { MStreamingPlaylistFilesVideo, MVideoFile, MVideoWithAllFiles, MVideoWithFile } from '@server/typings/models'
+import { MStreamingPlaylistFilesVideo, MVideoFile, MVideoWithAllFiles, MVideoWithFile } from '@server/types/models'
 import { createTorrentAndSetInfoHash } from '@server/helpers/webtorrent'
 import { generateVideoStreamingPlaylistName, getVideoFilename, getVideoFilePath } from './video-paths'
+import { spawn } from 'child_process'
 
 /**
  * Optimize the original video file and replace it. The resolution is not changed.
@@ -83,51 +85,18 @@ async function transcodeNewResolution (video: MVideoWithFile, resolution: VideoR
 
   const transcodeOptions = resolution === VideoResolution.H_NOVIDEO
     ? {
-        type: 'split-audio' as 'split-audio',
-        inputPath: videoInputPath,
-        outputPath: videoTranscodedPath,
-        resolution,
-      }
+      type: 'only-audio' as 'only-audio',
+      inputPath: videoInputPath,
+      outputPath: videoTranscodedPath,
+      resolution
+    }
     : {
-        type: 'video' as 'video',
-        inputPath: videoInputPath,
-        outputPath: videoTranscodedPath,
-        resolution,
-        isPortraitMode: isPortrait
-      }
-
-  await transcode(transcodeOptions)
-
-  return onVideoFileTranscoding(video, newVideoFile, videoTranscodedPath, videoOutputPath)
-}
-
-/**
- * Extract audio into a separate audio-only mp4.
- */
-async function splitAudioFile (video: MVideoWithFile) {
-  const videosDirectory = CONFIG.STORAGE.VIDEOS_DIR
-  const transcodeDirectory = CONFIG.STORAGE.TMP_DIR
-  const extname = '.mp4'
-  const resolution = VideoResolution.H_NOVIDEO
-
-  // We are sure it's x264 in mp4 because optimizeOriginalVideofile was already executed
-  const videoInputPath = join(videosDirectory, video.getVideoFilename(video.getOriginalFile()))
-
-  const newVideoFile = new VideoFileModel({
-    resolution,
-    extname,
-    size: 0,
-    videoId: video.id
-  })
-  const videoOutputPath = join(CONFIG.STORAGE.VIDEOS_DIR, video.getVideoFilename(newVideoFile))
-  const videoTranscodedPath = join(transcodeDirectory, video.getVideoFilename(newVideoFile))
-
-  const transcodeOptions = {
-    type: 'split-audio' as 'split-audio',
-    inputPath: videoInputPath,
-    outputPath: videoTranscodedPath,
-    resolution
-  }
+      type: 'video' as 'video',
+      inputPath: videoInputPath,
+      outputPath: videoTranscodedPath,
+      resolution,
+      isPortraitMode: isPortrait
+    }
 
   await transcode(transcodeOptions)
 
@@ -138,7 +107,7 @@ async function mergeAudioVideofile (video: MVideoWithAllFiles, resolution: Video
   const transcodeDirectory = CONFIG.STORAGE.TMP_DIR
   const newExtname = '.mp4'
 
-  const inputVideoFile = video.getMaxQualityFile()
+  const inputVideoFile = video.getMinQualityFile()
 
   const audioInputPath = getVideoFilePath(video, inputVideoFile)
   const videoTranscodedPath = join(transcodeDirectory, video.id + '-transcoded' + newExtname)
@@ -214,7 +183,7 @@ async function generateHlsPlaylist (video: MVideoWithFile, resolution: VideoReso
   const [ videoStreamingPlaylist ] = await VideoStreamingPlaylistModel.upsert({
     videoId: video.id,
     playlistUrl,
-    segmentsSha256Url: WEBSERVER.URL + VideoStreamingPlaylistModel.getHlsSha256SegmentsStaticPath(video.uuid),
+    segmentsSha256Url: WEBSERVER.URL + VideoStreamingPlaylistModel.getHlsSha256SegmentsStaticPath(video.uuid, video.isLive),
     p2pMediaLoaderInfohashes: VideoStreamingPlaylistModel.buildP2PMediaLoaderInfoHashes(playlistUrl, video.VideoFiles),
     p2pMediaLoaderPeerVersion: P2P_MEDIA_LOADER_PEER_VERSION,
 
@@ -235,18 +204,17 @@ async function generateHlsPlaylist (video: MVideoWithFile, resolution: VideoReso
 
   newVideoFile.size = stats.size
   newVideoFile.fps = await getVideoFileFPS(videoFilePath)
+  newVideoFile.metadata = await getMetadataFromFile(videoFilePath)
 
   await createTorrentAndSetInfoHash(videoStreamingPlaylist, newVideoFile)
 
-  const updatedVideoFile = await newVideoFile.save()
-
-  videoStreamingPlaylist.VideoFiles = await videoStreamingPlaylist.$get('VideoFiles') as VideoFileModel[]
-  videoStreamingPlaylist.VideoFiles.push(updatedVideoFile)
+  await VideoFileModel.customUpsert(newVideoFile, 'streaming-playlist', undefined)
+  videoStreamingPlaylist.VideoFiles = await videoStreamingPlaylist.$get('VideoFiles')
 
   video.setHLSPlaylist(videoStreamingPlaylist)
 
   await updateMasterHLSPlaylist(video)
-  await updateSha256Segments(video)
+  await updateSha256VODSegments(video)
 
   return video
 }
@@ -265,20 +233,18 @@ export {
 async function onVideoFileTranscoding (video: MVideoWithFile, videoFile: MVideoFile, transcodingPath: string, outputPath: string) {
   const stats = await stat(transcodingPath)
   const fps = await getVideoFileFPS(transcodingPath)
+  const metadata = await getMetadataFromFile(transcodingPath)
 
-  await move(transcodingPath, outputPath)
+  await move(transcodingPath, outputPath, { overwrite: true })
 
   videoFile.size = stats.size
   videoFile.fps = fps
+  videoFile.metadata = metadata
 
   await createTorrentAndSetInfoHash(video, videoFile)
 
-  const updatedVideoFile = await videoFile.save()
-
-  // Add it if this is a new created file
-  if (video.VideoFiles.some(f => f.id === videoFile.id) === false) {
-    video.VideoFiles.push(updatedVideoFile)
-  }
+  await VideoFileModel.customUpsert(videoFile, 'video', undefined)
+  video.VideoFiles = await video.$get('VideoFiles')
 
   return video
 }