IntenseWebs/PeerTube
3
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

More robust live handler on invalid ffprobe

Browse Source
This commit is contained in:
Chocobozzz
2025-02-12 10:33:37 +01:00
parent cb5f0b8959
commit 56419fd515
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
server/core/lib/live/live-manager.ts
View File

@@ -251,6 +251,8 @@ class LiveManager {
}) { }) {
const { inputLocalUrl, inputPublicUrl, sessionId, streamKey } = options const { inputLocalUrl, inputPublicUrl, sessionId, streamKey } = options
logger.debug(`Handling session ${sessionId}`, lTags(sessionId))
const videoLive = await VideoLiveModel.loadByStreamKey(streamKey) const videoLive = await VideoLiveModel.loadByStreamKey(streamKey)
if (!videoLive) { if (!videoLive) {
logger.warn('Unknown live video with stream key %s.', streamKey, lTags(sessionId)) logger.warn('Unknown live video with stream key %s.', streamKey, lTags(sessionId))
@@ -270,7 +272,10 @@ class LiveManager {
} }
if (this.videoSessions.has(video.uuid)) { if (this.videoSessions.has(video.uuid)) {
logger.warn('Video %s has already a live session. Refusing stream %s.', video.uuid, streamKey, lTags(sessionId, video.uuid)) logger.warn(
'Video %s has already a live session %s. Refusing stream %s.',
video.uuid, this.videoSessions.get(video.uuid), streamKey, lTags(sessionId, video.uuid)
)
return this.abortSession(sessionId) return this.abortSession(sessionId)
} }
@@ -286,8 +291,19 @@ class LiveManager {
this.videoSessions.set(video.uuid, sessionId) this.videoSessions.set(video.uuid, sessionId)
logger.debug('Probing ' + inputLocalUrl, lTags(sessionId, video.uuid))
const now = Date.now() const now = Date.now()
const probe = await ffprobePromise(inputLocalUrl) let probe: FfprobeData
try {
probe = await ffprobePromise(inputLocalUrl)
} catch (err) {
logger.error('Cannot probe ' + inputLocalUrl, { err, ...lTags(sessionId, video.uuid) })
this.videoSessions.delete(video.uuid)
return this.abortSession(sessionId)
}
const [ { resolution, ratio }, fps, bitrate, hasAudio, hasVideo ] = await Promise.all([ const [ { resolution, ratio }, fps, bitrate, hasAudio, hasVideo ] = await Promise.all([
getVideoStreamDimensionsInfo(inputLocalUrl, probe), getVideoStreamDimensionsInfo(inputLocalUrl, probe),