diff options
| author | Chocobozzz <me@florianbigard.com> | 2020-12-04 15:29:18 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2020-12-04 15:38:32 +0100 |
| commit | e772bdf14c46701552491dc337a21325c34e1ec2 (patch) | |
| tree | ce50d56a3433306beeb8c4c0cd711636bac242ee /server/helpers | |
| parent | 3851e732c4b1da0bc0c40a46ed5a89d93cdc5389 (diff) | |
| download | PeerTube-e772bdf14c46701552491dc337a21325c34e1ec2.tar.gz PeerTube-e772bdf14c46701552491dc337a21325c34e1ec2.tar.zst PeerTube-e772bdf14c46701552491dc337a21325c34e1ec2.zip | |
Load video in permanent live after last one ended
Diffstat (limited to 'server/helpers')
| -rw-r--r-- | server/helpers/ffmpeg-utils.ts | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/server/helpers/ffmpeg-utils.ts b/server/helpers/ffmpeg-utils.ts index 9d6fe76cb..bf6408d3e 100644 --- a/server/helpers/ffmpeg-utils.ts +++ b/server/helpers/ffmpeg-utils.ts | |||
| @@ -137,6 +137,8 @@ interface HLSTranscodeOptions extends BaseTranscodeOptions { | |||
| 137 | interface HLSFromTSTranscodeOptions extends BaseTranscodeOptions { | 137 | interface HLSFromTSTranscodeOptions extends BaseTranscodeOptions { |
| 138 | type: 'hls-from-ts' | 138 | type: 'hls-from-ts' |
| 139 | 139 | ||
| 140 | isAAC: boolean | ||
| 141 | |||
| 140 | hlsPlaylist: { | 142 | hlsPlaylist: { |
| 141 | videoFilename: string | 143 | videoFilename: string |
| 142 | } | 144 | } |
| @@ -456,9 +458,12 @@ async function buildHLSVODFromTSCommand (command: ffmpeg.FfmpegCommand, options: | |||
| 456 | const videoPath = getHLSVideoPath(options) | 458 | const videoPath = getHLSVideoPath(options) |
| 457 | 459 | ||
| 458 | command.outputOption('-c copy') | 460 | command.outputOption('-c copy') |
| 459 | // Required for example when copying an AAC stream from an MPEG-TS | 461 | |
| 460 | // Since it's a bitstream filter, we don't need to reencode the audio | 462 | if (options.isAAC) { |
| 461 | command.outputOption('-bsf:a aac_adtstoasc') | 463 | // Required for example when copying an AAC stream from an MPEG-TS |
| 464 | // Since it's a bitstream filter, we don't need to reencode the audio | ||
| 465 | command.outputOption('-bsf:a aac_adtstoasc') | ||
| 466 | } | ||
| 462 | 467 | ||
| 463 | addCommonHLSVODCommandOptions(command, videoPath) | 468 | addCommonHLSVODCommandOptions(command, videoPath) |
| 464 | 469 | ||