From 52201311e1973a12960466232d4dec861e8258ee Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 26 Nov 2019 16:25:36 +0100 Subject: Add codec information in HLS playlist --- server/lib/hls.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'server/lib') diff --git a/server/lib/hls.ts b/server/lib/hls.ts index 943721dd7..c94b599df 100644 --- a/server/lib/hls.ts +++ b/server/lib/hls.ts @@ -1,7 +1,7 @@ import { basename, dirname, join } from 'path' import { HLS_STREAMING_PLAYLIST_DIRECTORY, P2P_MEDIA_LOADER_PEER_VERSION } from '../initializers/constants' import { close, ensureDir, move, open, outputJSON, pathExists, read, readFile, remove, writeFile } from 'fs-extra' -import { getVideoFileSize } from '../helpers/ffmpeg-utils' +import { getVideoStreamSize, getAudioStreamCodec, getVideoStreamCodec } from '../helpers/ffmpeg-utils' import { sha256 } from '../helpers/core-utils' import { VideoStreamingPlaylistModel } from '../models/video/video-streaming-playlist' import { logger } from '../helpers/logger' @@ -42,7 +42,7 @@ async function updateMasterHLSPlaylist (video: MVideoWithFile) { const videoFilePath = getVideoFilePath(streamingPlaylist, file) - const size = await getVideoFileSize(videoFilePath) + const size = await getVideoStreamSize(videoFilePath) const bandwidth = 'BANDWIDTH=' + video.getBandwidthBits(file) const resolution = `RESOLUTION=${size.width}x${size.height}` @@ -50,6 +50,10 @@ async function updateMasterHLSPlaylist (video: MVideoWithFile) { let line = `#EXT-X-STREAM-INF:${bandwidth},${resolution}` if (file.fps) line += ',FRAME-RATE=' + file.fps + const audioCodec = await getAudioStreamCodec(filePlaylistPath) + const videoCodec = await getVideoStreamCodec(filePlaylistPath) + line += `,CODECS="${videoCodec},${audioCodec}"` + masterPlaylists.push(line) masterPlaylists.push(VideoStreamingPlaylistModel.getHlsPlaylistFilename(file.resolution)) } -- cgit v1.2.3