import { HLS_STREAMING_PLAYLIST_DIRECTORY, P2P_MEDIA_LOADER_PEER_VERSION, WEBSERVER } from '../initializers/constants'
-import { join } from 'path'
-import { canDoQuickTranscode, getVideoFileFPS, transcode, TranscodeOptions, TranscodeOptionsType } from '../helpers/ffmpeg-utils'
-import { ensureDir, move, remove, stat } from 'fs-extra'
+import { basename, extname as extnameUtil, join } from 'path'
+import {
+ canDoQuickTranscode,
+ getDurationFromVideoFile,
+ getMetadataFromFile,
+ getVideoFileFPS,
+ transcode,
+ TranscodeOptions,
+ TranscodeOptionsType
+} from '../helpers/ffmpeg-utils'
+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 { VideoStreamingPlaylistModel } from '../models/video/video-streaming-playlist'
import { VideoStreamingPlaylistType } from '../../shared/models/videos/video-streaming-playlist.type'
import { CONFIG } from '../initializers/config'
-import { MVideoFile, MVideoWithFile, MVideoWithFileThumbnail } 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'
/**
* Optimize the original video file and replace it. The resolution is not changed.
*/
-async function optimizeVideofile (video: MVideoWithFile, inputVideoFileArg?: MVideoFile) {
- const videosDirectory = CONFIG.STORAGE.VIDEOS_DIR
+async function optimizeOriginalVideofile (video: MVideoWithFile, inputVideoFileArg?: MVideoFile) {
const transcodeDirectory = CONFIG.STORAGE.TMP_DIR
const newExtname = '.mp4'
- const inputVideoFile = inputVideoFileArg ? inputVideoFileArg : video.getOriginalFile()
- const videoInputPath = join(videosDirectory, video.getVideoFilename(inputVideoFile))
+ const inputVideoFile = inputVideoFileArg || video.getMaxQualityFile()
+ const videoInputPath = getVideoFilePath(video, inputVideoFile)
const videoTranscodedPath = join(transcodeDirectory, video.id + '-transcoded' + newExtname)
const transcodeType: TranscodeOptionsType = await canDoQuickTranscode(videoInputPath)
: 'video'
const transcodeOptions: TranscodeOptions = {
- type: transcodeType as any, // FIXME: typing issue
+ type: transcodeType,
inputPath: videoInputPath,
outputPath: videoTranscodedPath,
resolution: inputVideoFile.resolution
// Important to do this before getVideoFilename() to take in account the new file extension
inputVideoFile.extname = newExtname
- const videoOutputPath = video.getVideoFilePath(inputVideoFile)
+ const videoOutputPath = getVideoFilePath(video, inputVideoFile)
await onVideoFileTranscoding(video, inputVideoFile, videoTranscodedPath, videoOutputPath)
} catch (err) {
/**
* Transcode the original video file to a lower resolution.
*/
-async function transcodeOriginalVideofile (video: MVideoWithFile, resolution: VideoResolution, isPortrait: boolean) {
- const videosDirectory = CONFIG.STORAGE.VIDEOS_DIR
+async function transcodeNewResolution (video: MVideoWithFile, resolution: VideoResolution, isPortrait: boolean) {
const transcodeDirectory = CONFIG.STORAGE.TMP_DIR
const extname = '.mp4'
// We are sure it's x264 in mp4 because optimizeOriginalVideofile was already executed
- const videoInputPath = join(videosDirectory, video.getVideoFilename(video.getOriginalFile()))
+ const videoInputPath = getVideoFilePath(video, video.getMaxQualityFile())
const newVideoFile = new VideoFileModel({
resolution,
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: 'video' as 'video',
- inputPath: videoInputPath,
- outputPath: videoTranscodedPath,
- resolution,
- isPortraitMode: isPortrait
- }
+ const videoOutputPath = getVideoFilePath(video, newVideoFile)
+ const videoTranscodedPath = join(transcodeDirectory, getVideoFilename(video, newVideoFile))
+
+ const transcodeOptions = resolution === VideoResolution.H_NOVIDEO
+ ? {
+ 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)
}
-async function mergeAudioVideofile (video: MVideoWithFileThumbnail, resolution: VideoResolution) {
- const videosDirectory = CONFIG.STORAGE.VIDEOS_DIR
+async function mergeAudioVideofile (video: MVideoWithAllFiles, resolution: VideoResolution) {
const transcodeDirectory = CONFIG.STORAGE.TMP_DIR
const newExtname = '.mp4'
- const inputVideoFile = video.getOriginalFile()
+ const inputVideoFile = video.getMinQualityFile()
- const audioInputPath = join(videosDirectory, video.getVideoFilename(video.getOriginalFile()))
+ const audioInputPath = getVideoFilePath(video, inputVideoFile)
const videoTranscodedPath = join(transcodeDirectory, video.id + '-transcoded' + newExtname)
+ // If the user updates the video preview during transcoding
+ const previewPath = video.getPreview().getPath()
+ const tmpPreviewPath = join(CONFIG.STORAGE.TMP_DIR, basename(previewPath))
+ await copyFile(previewPath, tmpPreviewPath)
+
const transcodeOptions = {
type: 'merge-audio' as 'merge-audio',
- inputPath: video.getPreview().getPath(),
+ inputPath: tmpPreviewPath,
outputPath: videoTranscodedPath,
audioPath: audioInputPath,
resolution
}
- await transcode(transcodeOptions)
+ try {
+ await transcode(transcodeOptions)
- await remove(audioInputPath)
+ await remove(audioInputPath)
+ await remove(tmpPreviewPath)
+ } catch (err) {
+ await remove(tmpPreviewPath)
+ throw err
+ }
// Important to do this before getVideoFilename() to take in account the new file extension
inputVideoFile.extname = newExtname
- const videoOutputPath = video.getVideoFilePath(inputVideoFile)
+ const videoOutputPath = getVideoFilePath(video, inputVideoFile)
+ // ffmpeg generated a new video file, so update the video duration
+ // See https://trac.ffmpeg.org/ticket/5456
+ video.duration = await getDurationFromVideoFile(videoTranscodedPath)
+ await video.save()
return onVideoFileTranscoding(video, inputVideoFile, videoTranscodedPath, videoOutputPath)
}
-async function generateHlsPlaylist (video: MVideoWithFile, resolution: VideoResolution, isPortraitMode: boolean) {
+async function generateHlsPlaylist (video: MVideoWithFile, resolution: VideoResolution, copyCodecs: boolean, isPortraitMode: boolean) {
const baseHlsDirectory = join(HLS_STREAMING_PLAYLIST_DIRECTORY, video.uuid)
await ensureDir(join(HLS_STREAMING_PLAYLIST_DIRECTORY, video.uuid))
- const videoInputPath = join(CONFIG.STORAGE.VIDEOS_DIR, video.getVideoFilename(video.getFile(resolution)))
+ const videoFileInput = copyCodecs
+ ? video.getWebTorrentFile(resolution)
+ : video.getMaxQualityFile()
+
+ const videoOrStreamingPlaylist = videoFileInput.getVideoOrStreamingPlaylist()
+ const videoInputPath = getVideoFilePath(videoOrStreamingPlaylist, videoFileInput)
+
const outputPath = join(baseHlsDirectory, VideoStreamingPlaylistModel.getHlsPlaylistFilename(resolution))
+ const videoFilename = generateVideoStreamingPlaylistName(video.uuid, resolution)
const transcodeOptions = {
type: 'hls' as 'hls',
inputPath: videoInputPath,
outputPath,
resolution,
+ copyCodecs,
isPortraitMode,
hlsPlaylist: {
- videoFilename: VideoStreamingPlaylistModel.getHlsVideoName(video.uuid, resolution)
+ videoFilename
}
}
- await transcode(transcodeOptions)
+ logger.debug('Will run transcode.', { transcodeOptions })
- await updateMasterHLSPlaylist(video)
- await updateSha256Segments(video)
+ await transcode(transcodeOptions)
const playlistUrl = WEBSERVER.URL + VideoStreamingPlaylistModel.getHlsMasterPlaylistStaticPath(video.uuid)
- await VideoStreamingPlaylistModel.upsert({
+ const [ videoStreamingPlaylist ] = await VideoStreamingPlaylistModel.upsert({
videoId: video.id,
playlistUrl,
segmentsSha256Url: WEBSERVER.URL + VideoStreamingPlaylistModel.getHlsSha256SegmentsStaticPath(video.uuid),
p2pMediaLoaderPeerVersion: P2P_MEDIA_LOADER_PEER_VERSION,
type: VideoStreamingPlaylistType.HLS
+ }, { returning: true }) as [ MStreamingPlaylistFilesVideo, boolean ]
+ videoStreamingPlaylist.Video = video
+
+ const newVideoFile = new VideoFileModel({
+ resolution,
+ extname: extnameUtil(videoFilename),
+ size: 0,
+ fps: -1,
+ videoStreamingPlaylistId: videoStreamingPlaylist.id
})
+
+ const videoFilePath = getVideoFilePath(videoStreamingPlaylist, newVideoFile)
+ const stats = await stat(videoFilePath)
+
+ newVideoFile.size = stats.size
+ newVideoFile.fps = await getVideoFileFPS(videoFilePath)
+ newVideoFile.metadata = await getMetadataFromFile(videoFilePath)
+
+ await createTorrentAndSetInfoHash(videoStreamingPlaylist, newVideoFile)
+
+ await VideoFileModel.customUpsert(newVideoFile, 'streaming-playlist', undefined)
+ videoStreamingPlaylist.VideoFiles = await videoStreamingPlaylist.$get('VideoFiles')
+
+ video.setHLSPlaylist(videoStreamingPlaylist)
+
+ await updateMasterHLSPlaylist(video)
+ await updateSha256Segments(video)
+
+ return video
}
// ---------------------------------------------------------------------------
export {
generateHlsPlaylist,
- optimizeVideofile,
- transcodeOriginalVideofile,
+ 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)
videoFile.size = stats.size
videoFile.fps = fps
+ videoFile.metadata = metadata
- await video.createTorrentAndSetInfoHash(videoFile)
+ await createTorrentAndSetInfoHash(video, videoFile)
const updatedVideoFile = await videoFile.save()
projects / oweals / peertube.git / blobdiff