X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Fhls.ts;h=76380b1f23e9730a4603225d007dab7ae067b40e;hb=b405d663b4fcda051fe928f73b161b7040303b63;hp=c94b599df480ce3b282846e8e227ffc290aefe41;hpb=52201311e1973a12960466232d4dec861e8258ee;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/lib/hls.ts b/server/lib/hls.ts index c94b599df..76380b1f2 100644 --- a/server/lib/hls.ts +++ b/server/lib/hls.ts @@ -11,7 +11,7 @@ import { flatten, uniq } from 'lodash' import { VideoFileModel } from '../models/video/video-file' import { CONFIG } from '../initializers/config' import { sequelizeTypescript } from '../initializers/database' -import { MVideoWithFile } from '@server/typings/models' +import { MVideoWithFile } from '@server/types/models' import { getVideoFilename, getVideoFilePath } from './video-paths' async function updateStreamingPlaylistsInfohashesIfNeeded () { @@ -50,9 +50,13 @@ 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}"` + const videoCodec = await getVideoStreamCodec(videoFilePath) + line += `,CODECS="${videoCodec}` + + const audioCodec = await getAudioStreamCodec(videoFilePath) + if (audioCodec) line += `,${audioCodec}` + + line += '"' masterPlaylists.push(line) masterPlaylists.push(VideoStreamingPlaylistModel.getHlsPlaylistFilename(file.resolution))