diff options
Diffstat (limited to 'server/lib/live/shared/muxing-session.ts')
-rw-r--r-- | server/lib/live/shared/muxing-session.ts | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/server/lib/live/shared/muxing-session.ts b/server/lib/live/shared/muxing-session.ts index 588ee8749..1ee9b430f 100644 --- a/server/lib/live/shared/muxing-session.ts +++ b/server/lib/live/shared/muxing-session.ts | |||
@@ -28,7 +28,7 @@ interface MuxingSessionEvents { | |||
28 | 'quota-exceeded': ({ videoId: number }) => void | 28 | 'quota-exceeded': ({ videoId: number }) => void |
29 | 29 | ||
30 | 'ffmpeg-end': ({ videoId: number }) => void | 30 | 'ffmpeg-end': ({ videoId: number }) => void |
31 | 'ffmpeg-error': ({ sessionId: string }) => void | 31 | 'ffmpeg-error': ({ videoId: string }) => void |
32 | 32 | ||
33 | 'after-cleanup': ({ videoId: number }) => void | 33 | 'after-cleanup': ({ videoId: number }) => void |
34 | } | 34 | } |
@@ -164,7 +164,11 @@ class MuxingSession extends EventEmitter { | |||
164 | this.onFFmpegError({ err, stdout, stderr, outPath: this.outDirectory, ffmpegShellCommand }) | 164 | this.onFFmpegError({ err, stdout, stderr, outPath: this.outDirectory, ffmpegShellCommand }) |
165 | }) | 165 | }) |
166 | 166 | ||
167 | this.ffmpegCommand.on('end', () => this.onFFmpegEnded(this.outDirectory)) | 167 | this.ffmpegCommand.on('end', () => { |
168 | this.emit('ffmpeg-end', ({ videoId: this.videoId })) | ||
169 | |||
170 | this.onFFmpegEnded(this.outDirectory) | ||
171 | }) | ||
168 | 172 | ||
169 | this.ffmpegCommand.run() | 173 | this.ffmpegCommand.run() |
170 | } | 174 | } |
@@ -197,7 +201,7 @@ class MuxingSession extends EventEmitter { | |||
197 | 201 | ||
198 | logger.error('Live transcoding error.', { err, stdout, stderr, ffmpegShellCommand, ...this.lTags() }) | 202 | logger.error('Live transcoding error.', { err, stdout, stderr, ffmpegShellCommand, ...this.lTags() }) |
199 | 203 | ||
200 | this.emit('ffmpeg-error', ({ sessionId: this.sessionId })) | 204 | this.emit('ffmpeg-error', ({ videoId: this.videoId })) |
201 | } | 205 | } |
202 | 206 | ||
203 | private onFFmpegEnded (outPath: string) { | 207 | private onFFmpegEnded (outPath: string) { |