-
import { readdir, readFile } from 'fs-extra'
import { createServer, Server } from 'net'
import { join } from 'path'
getLiveSegmentTime,
getVideoStreamBitrate,
getVideoStreamDimensionsInfo,
- getVideoStreamFPS
+ getVideoStreamFPS,
+ hasAudioStream
} from '@server/helpers/ffmpeg'
import { logger, loggerTagsFactory } from '@server/helpers/logger'
import { CONFIG, registerConfigChangedHandler } from '@server/initializers/config'
import { VideoLiveSessionModel } from '@server/models/video/video-live-session'
import { VideoStreamingPlaylistModel } from '@server/models/video/video-streaming-playlist'
import { MStreamingPlaylistVideo, MVideo, MVideoLiveSession, MVideoLiveVideo } from '@server/types/models'
-import { wait } from '@shared/core-utils'
-import { LiveVideoError, VideoState, VideoStreamingPlaylistType } from '@shared/models'
+import { pick, wait } from '@shared/core-utils'
+import { LiveVideoError, VideoState, VideoStorage, VideoStreamingPlaylistType } from '@shared/models'
import { federateVideoIfNeeded } from '../activitypub/videos'
import { JobQueue } from '../job-queue'
import { generateHLSMasterPlaylistFilename, generateHlsSha256SegmentsFilename, getLiveReplayBaseDirectory } from '../paths'
import { PeerTubeSocket } from '../peertube-socket'
import { Hooks } from '../plugins/hooks'
import { LiveQuotaStore } from './live-quota-store'
-import { cleanupPermanentLive } from './live-utils'
+import { cleanupAndDestroyPermanentLive } from './live-utils'
import { MuxingSession } from './shared'
const NodeRtmpSession = require('node-media-server/src/node_rtmp_session')
if (oldStreamingPlaylist) {
if (!videoLive.permanentLive) throw new Error('Found previous session in a non permanent live: ' + video.uuid)
- await cleanupPermanentLive(video, oldStreamingPlaylist)
+ await cleanupAndDestroyPermanentLive(video, oldStreamingPlaylist)
}
this.videoSessions.set(video.id, sessionId)
const now = Date.now()
const probe = await ffprobePromise(inputUrl)
- const [ { resolution, ratio }, fps, bitrate ] = await Promise.all([
+ const [ { resolution, ratio }, fps, bitrate, hasAudio ] = await Promise.all([
getVideoStreamDimensionsInfo(inputUrl, probe),
getVideoStreamFPS(inputUrl, probe),
- getVideoStreamBitrate(inputUrl, probe)
+ getVideoStreamBitrate(inputUrl, probe),
+ hasAudioStream(inputUrl, probe)
])
logger.info(
)
const allResolutions = await Hooks.wrapObject(
- this.buildAllResolutionsToTranscode(resolution),
+ this.buildAllResolutionsToTranscode(resolution, hasAudio),
'filter:transcoding.auto.resolutions-to-transcode.result',
{ video }
)
return this.runMuxingSession({
sessionId,
videoLive,
+
streamingPlaylist,
inputUrl,
fps,
bitrate,
ratio,
- allResolutions
+ allResolutions,
+ hasAudio
})
}
private async runMuxingSession (options: {
sessionId: string
videoLive: MVideoLiveVideo
+
streamingPlaylist: MStreamingPlaylistVideo
inputUrl: string
fps: number
bitrate: number
ratio: number
allResolutions: number[]
+ hasAudio: boolean
}) {
- const { sessionId, videoLive, streamingPlaylist, allResolutions, fps, bitrate, ratio, inputUrl } = options
+ const { sessionId, videoLive } = options
const videoUUID = videoLive.Video.uuid
const localLTags = lTags(sessionId, videoUUID)
const muxingSession = new MuxingSession({
context: this.getContext(),
- user,
sessionId,
videoLive,
- streamingPlaylist,
- inputUrl,
- bitrate,
- ratio,
- fps,
- allResolutions
+ user,
+
+ ...pick(options, [ 'streamingPlaylist', 'inputUrl', 'bitrate', 'ratio', 'fps', 'allResolutions', 'hasAudio' ])
})
- muxingSession.on('master-playlist-created', () => this.publishAndFederateLive(videoLive, localLTags))
+ muxingSession.on('live-ready', () => this.publishAndFederateLive(videoLive, localLTags))
muxingSession.on('bad-socket-health', ({ videoId }) => {
logger.error(
await liveSession.save()
}
- JobQueue.Instance.createJob({
+ JobQueue.Instance.createJobAsync({
type: 'video-live-ending',
payload: {
videoId: fullVideo.id,
streamingPlaylistId: fullVideo.getHLSPlaylist()?.id,
publishedAt: fullVideo.publishedAt.toISOString()
- }
- }, { delay: cleanupNow ? 0 : VIDEO_LIVE.CLEANUP_DELAY })
+ },
+
+ delay: cleanupNow
+ ? 0
+ : VIDEO_LIVE.CLEANUP_DELAY
+ })
fullVideo.state = live.permanentLive
? VideoState.WAITING_FOR_LIVE
return join(directory, files.sort().reverse()[0])
}
- private buildAllResolutionsToTranscode (originResolution: number) {
+ private buildAllResolutionsToTranscode (originResolution: number, hasAudio: boolean) {
const includeInput = CONFIG.LIVE.TRANSCODING.ALWAYS_TRANSCODE_ORIGINAL_RESOLUTION
const resolutionsEnabled = CONFIG.LIVE.TRANSCODING.ENABLED
- ? computeResolutionsToTranscode({ input: originResolution, type: 'live', includeInput, strictLower: false })
+ ? computeResolutionsToTranscode({ input: originResolution, type: 'live', includeInput, strictLower: false, hasAudio })
: []
if (resolutionsEnabled.length === 0) {
playlist.p2pMediaLoaderPeerVersion = P2P_MEDIA_LOADER_PEER_VERSION
playlist.type = VideoStreamingPlaylistType.HLS
+ playlist.storage = CONFIG.OBJECT_STORAGE.ENABLED
+ ? VideoStorage.OBJECT_STORAGE
+ : VideoStorage.FILE_SYSTEM
+
playlist.assignP2PMediaLoaderInfoHashes(video, allResolutions)
return playlist.save()