X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Fvideo-transcoding.ts;h=dcda82e0a169ad549813062cd68eada603662181;hb=923ff87da2761fd88a8ca269ac1ef403abb583d2;hp=4fd1d62a9140f0655d976741ebbcdae83d0919ff;hpb=92e0f42e8ce5f1ab5e4023900b8194627231a11b;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/video-transcoding.ts b/server/lib/video-transcoding.ts index 4fd1d62a9..dcda82e0a 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, @@ -202,11 +203,12 @@ 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) - await newVideoFile.save() - videoStreamingPlaylist.VideoFiles = await videoStreamingPlaylist.$get('VideoFiles') as VideoFileModel[] + await VideoFileModel.customUpsert(newVideoFile, 'streaming-playlist', undefined) + videoStreamingPlaylist.VideoFiles = await videoStreamingPlaylist.$get('VideoFiles') video.setHLSPlaylist(videoStreamingPlaylist) @@ -230,11 +232,13 @@ 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) videoFile.size = stats.size videoFile.fps = fps + videoFile.metadata = metadata await createTorrentAndSetInfoHash(video, videoFile)