X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Fvideo-transcoding.ts;h=e7108bd5a971dd9fec05673273d06beffd131643;hb=b49f22d8f9a52ab75fd38db2d377249eb58fa678;hp=e267b1397cf72c53144c01a0fbffae5f49018bd3;hpb=053aed43fb255b4ae4324a845534f2f562c3b6cc;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/video-transcoding.ts b/server/lib/video-transcoding.ts index e267b1397..e7108bd5a 100644 --- a/server/lib/video-transcoding.ts +++ b/server/lib/video-transcoding.ts @@ -4,15 +4,8 @@ import { createTorrentAndSetInfoHash } from '@server/helpers/webtorrent' import { MStreamingPlaylistFilesVideo, MVideoFile, MVideoWithAllFiles, MVideoWithFile } from '@server/types/models' import { VideoResolution } from '../../shared/models/videos' import { VideoStreamingPlaylistType } from '../../shared/models/videos/video-streaming-playlist.type' -import { - canDoQuickTranscode, - getDurationFromVideoFile, - getMetadataFromFile, - getVideoFileFPS, - transcode, - TranscodeOptions, - TranscodeOptionsType -} from '../helpers/ffmpeg-utils' +import { transcode, TranscodeOptions, TranscodeOptionsType } from '../helpers/ffmpeg-utils' +import { canDoQuickTranscode, getDurationFromVideoFile, getMetadataFromFile, getVideoFileFPS } from '../helpers/ffprobe-utils' import { logger } from '../helpers/logger' import { CONFIG } from '../initializers/config' import { HLS_STREAMING_PLAYLIST_DIRECTORY, P2P_MEDIA_LOADER_PEER_VERSION, WEBSERVER } from '../initializers/constants' @@ -20,10 +13,16 @@ import { VideoFileModel } from '../models/video/video-file' import { VideoStreamingPlaylistModel } from '../models/video/video-streaming-playlist' import { updateMasterHLSPlaylist, updateSha256VODSegments } from './hls' import { generateVideoStreamingPlaylistName, getVideoFilename, getVideoFilePath } from './video-paths' +import { availableEncoders } from './video-transcoding-profiles' /** - * Optimize the original video file and replace it. The resolution is not changed. + * + * Functions that run transcoding functions, update the database, cleanup files, create torrent files... + * Mainly called by the job queue + * */ + +// Optimize the original video file and replace it. The resolution is not changed. async function optimizeOriginalVideofile (video: MVideoWithFile, inputVideoFileArg?: MVideoFile) { const transcodeDirectory = CONFIG.STORAGE.TMP_DIR const newExtname = '.mp4' @@ -38,8 +37,13 @@ async function optimizeOriginalVideofile (video: MVideoWithFile, inputVideoFileA const transcodeOptions: TranscodeOptions = { type: transcodeType, + inputPath: videoInputPath, outputPath: videoTranscodedPath, + + availableEncoders, + profile: 'default', + resolution: inputVideoFile.resolution } @@ -63,9 +67,7 @@ async function optimizeOriginalVideofile (video: MVideoWithFile, inputVideoFileA } } -/** - * Transcode the original video file to a lower resolution. - */ +// Transcode the original video file to a lower resolution. async function transcodeNewResolution (video: MVideoWithFile, resolution: VideoResolution, isPortrait: boolean) { const transcodeDirectory = CONFIG.STORAGE.TMP_DIR const extname = '.mp4' @@ -85,14 +87,23 @@ async function transcodeNewResolution (video: MVideoWithFile, resolution: VideoR const transcodeOptions = resolution === VideoResolution.H_NOVIDEO ? { type: 'only-audio' as 'only-audio', + inputPath: videoInputPath, outputPath: videoTranscodedPath, + + availableEncoders, + profile: 'default', + resolution } : { type: 'video' as 'video', inputPath: videoInputPath, outputPath: videoTranscodedPath, + + availableEncoders, + profile: 'default', + resolution, isPortraitMode: isPortrait } @@ -102,6 +113,7 @@ async function transcodeNewResolution (video: MVideoWithFile, resolution: VideoR return onVideoFileTranscoding(video, newVideoFile, videoTranscodedPath, videoOutputPath) } +// Merge an image with an audio file to create a video async function mergeAudioVideofile (video: MVideoWithAllFiles, resolution: VideoResolution) { const transcodeDirectory = CONFIG.STORAGE.TMP_DIR const newExtname = '.mp4' @@ -118,8 +130,13 @@ async function mergeAudioVideofile (video: MVideoWithAllFiles, resolution: Video const transcodeOptions = { type: 'merge-audio' as 'merge-audio', + inputPath: tmpPreviewPath, outputPath: videoTranscodedPath, + + availableEncoders, + profile: 'default', + audioPath: audioInputPath, resolution } @@ -146,14 +163,83 @@ async function mergeAudioVideofile (video: MVideoWithAllFiles, resolution: Video return onVideoFileTranscoding(video, inputVideoFile, videoTranscodedPath, videoOutputPath) } -async function generateHlsPlaylist (options: { +// Concat TS segments from a live video to a fragmented mp4 HLS playlist +async function generateHlsPlaylistFromTS (options: { + video: MVideoWithFile + concatenatedTsFilePath: string + resolution: VideoResolution + isPortraitMode: boolean + isAAC: boolean +}) { + return generateHlsPlaylistCommon({ + video: options.video, + resolution: options.resolution, + isPortraitMode: options.isPortraitMode, + inputPath: options.concatenatedTsFilePath, + type: 'hls-from-ts' as 'hls-from-ts', + isAAC: options.isAAC + }) +} + +// Generate an HLS playlist from an input file, and update the master playlist +function generateHlsPlaylist (options: { video: MVideoWithFile videoInputPath: string resolution: VideoResolution copyCodecs: boolean isPortraitMode: boolean }) { - const { video, videoInputPath, resolution, copyCodecs, isPortraitMode } = options + return generateHlsPlaylistCommon({ + video: options.video, + resolution: options.resolution, + copyCodecs: options.copyCodecs, + isPortraitMode: options.isPortraitMode, + inputPath: options.videoInputPath, + type: 'hls' as 'hls' + }) +} + +// --------------------------------------------------------------------------- + +export { + generateHlsPlaylist, + generateHlsPlaylistFromTS, + optimizeOriginalVideofile, + transcodeNewResolution, + mergeAudioVideofile +} + +// --------------------------------------------------------------------------- + +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, { overwrite: true }) + + videoFile.size = stats.size + videoFile.fps = fps + videoFile.metadata = metadata + + await createTorrentAndSetInfoHash(video, videoFile) + + await VideoFileModel.customUpsert(videoFile, 'video', undefined) + video.VideoFiles = await video.$get('VideoFiles') + + return video +} + +async function generateHlsPlaylistCommon (options: { + type: 'hls' | 'hls-from-ts' + video: MVideoWithFile + inputPath: string + resolution: VideoResolution + copyCodecs?: boolean + isAAC?: boolean + isPortraitMode: boolean +}) { + const { type, video, inputPath, resolution, copyCodecs, isPortraitMode, isAAC } = options const baseHlsDirectory = join(HLS_STREAMING_PLAYLIST_DIRECTORY, video.uuid) await ensureDir(join(HLS_STREAMING_PLAYLIST_DIRECTORY, video.uuid)) @@ -162,20 +248,25 @@ async function generateHlsPlaylist (options: { const videoFilename = generateVideoStreamingPlaylistName(video.uuid, resolution) const transcodeOptions = { - type: 'hls' as 'hls', - inputPath: videoInputPath, + type, + + inputPath, outputPath, + + availableEncoders, + profile: 'default', + resolution, copyCodecs, isPortraitMode, + isAAC, + hlsPlaylist: { videoFilename } } - logger.debug('Will run transcode.', { transcodeOptions }) - await transcode(transcodeOptions) const playlistUrl = WEBSERVER.URL + VideoStreamingPlaylistModel.getHlsMasterPlaylistStaticPath(video.uuid) @@ -221,35 +312,5 @@ async function generateHlsPlaylist (options: { await updateMasterHLSPlaylist(video) await updateSha256VODSegments(video) - return video -} - -// --------------------------------------------------------------------------- - -export { - generateHlsPlaylist, - optimizeOriginalVideofile, - transcodeNewResolution, - mergeAudioVideofile -} - -// --------------------------------------------------------------------------- - -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, { overwrite: true }) - - videoFile.size = stats.size - videoFile.fps = fps - videoFile.metadata = metadata - - await createTorrentAndSetInfoHash(video, videoFile) - - await VideoFileModel.customUpsert(videoFile, 'video', undefined) - video.VideoFiles = await video.$get('VideoFiles') - - return video + return outputPath }