Use a profile manager for transcoding
This commit is contained in:
parent
923d3d5ad5
commit
529b37527c
|
@ -3,9 +3,9 @@ registerTSPaths()
|
||||||
|
|
||||||
import * as program from 'commander'
|
import * as program from 'commander'
|
||||||
import * as ffmpeg from 'fluent-ffmpeg'
|
import * as ffmpeg from 'fluent-ffmpeg'
|
||||||
import { availableEncoders } from '@server/lib/video-transcoding-profiles'
|
|
||||||
import { buildx264VODCommand, runCommand, TranscodeOptions } from '@server/helpers/ffmpeg-utils'
|
import { buildx264VODCommand, runCommand, TranscodeOptions } from '@server/helpers/ffmpeg-utils'
|
||||||
import { exit } from 'process'
|
import { exit } from 'process'
|
||||||
|
import { VideoTranscodingProfilesManager } from '@server/lib/video-transcoding-profiles'
|
||||||
|
|
||||||
program
|
program
|
||||||
.arguments('<path>')
|
.arguments('<path>')
|
||||||
|
@ -31,7 +31,7 @@ async function run (path: string, cmd: any) {
|
||||||
inputPath: path,
|
inputPath: path,
|
||||||
outputPath: '/dev/null',
|
outputPath: '/dev/null',
|
||||||
|
|
||||||
availableEncoders,
|
availableEncoders: VideoTranscodingProfilesManager.Instance.getAvailableEncoders(),
|
||||||
profile: 'default',
|
profile: 'default',
|
||||||
|
|
||||||
resolution: +cmd.resolution,
|
resolution: +cmd.resolution,
|
||||||
|
|
|
@ -2,7 +2,7 @@ import { Job } from 'bull'
|
||||||
import * as ffmpeg from 'fluent-ffmpeg'
|
import * as ffmpeg from 'fluent-ffmpeg'
|
||||||
import { readFile, remove, writeFile } from 'fs-extra'
|
import { readFile, remove, writeFile } from 'fs-extra'
|
||||||
import { dirname, join } from 'path'
|
import { dirname, join } from 'path'
|
||||||
import { FFMPEG_NICE, VIDEO_LIVE, VIDEO_TRANSCODING_ENCODERS } from '@server/initializers/constants'
|
import { FFMPEG_NICE, VIDEO_LIVE } from '@server/initializers/constants'
|
||||||
import { VideoResolution } from '../../shared/models/videos'
|
import { VideoResolution } from '../../shared/models/videos'
|
||||||
import { checkFFmpegEncoders } from '../initializers/checker-before-init'
|
import { checkFFmpegEncoders } from '../initializers/checker-before-init'
|
||||||
import { CONFIG } from '../initializers/config'
|
import { CONFIG } from '../initializers/config'
|
||||||
|
@ -46,11 +46,22 @@ export interface EncoderProfile <T> {
|
||||||
}
|
}
|
||||||
|
|
||||||
export type AvailableEncoders = {
|
export type AvailableEncoders = {
|
||||||
[ id in 'live' | 'vod' ]: {
|
live: {
|
||||||
[ encoder in 'libx264' | 'aac' | 'libfdk_aac' ]?: EncoderProfile<EncoderOptionsBuilder>
|
[ encoder: string ]: EncoderProfile<EncoderOptionsBuilder>
|
||||||
|
}
|
||||||
|
|
||||||
|
vod: {
|
||||||
|
[ encoder: string ]: EncoderProfile<EncoderOptionsBuilder>
|
||||||
|
}
|
||||||
|
|
||||||
|
encodersToTry: {
|
||||||
|
video: string[]
|
||||||
|
audio: string[]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type StreamType = 'audio' | 'video'
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
// Image manipulation
|
// Image manipulation
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
|
@ -243,8 +254,10 @@ async function getLiveTranscodingCommand (options: {
|
||||||
|
|
||||||
const baseEncoderBuilderParams = {
|
const baseEncoderBuilderParams = {
|
||||||
input,
|
input,
|
||||||
|
|
||||||
availableEncoders,
|
availableEncoders,
|
||||||
profile,
|
profile,
|
||||||
|
|
||||||
fps: resolutionFPS,
|
fps: resolutionFPS,
|
||||||
resolution,
|
resolution,
|
||||||
streamNum: i,
|
streamNum: i,
|
||||||
|
@ -252,7 +265,8 @@ async function getLiveTranscodingCommand (options: {
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
const builderResult = await getEncoderBuilderResult(Object.assign({}, baseEncoderBuilderParams, { streamType: 'VIDEO' }))
|
const streamType: StreamType = 'video'
|
||||||
|
const builderResult = await getEncoderBuilderResult(Object.assign({}, baseEncoderBuilderParams, { streamType }))
|
||||||
if (!builderResult) {
|
if (!builderResult) {
|
||||||
throw new Error('No available live video encoder found')
|
throw new Error('No available live video encoder found')
|
||||||
}
|
}
|
||||||
|
@ -268,7 +282,8 @@ async function getLiveTranscodingCommand (options: {
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
const builderResult = await getEncoderBuilderResult(Object.assign({}, baseEncoderBuilderParams, { streamType: 'AUDIO' }))
|
const streamType: StreamType = 'audio'
|
||||||
|
const builderResult = await getEncoderBuilderResult(Object.assign({}, baseEncoderBuilderParams, { streamType }))
|
||||||
if (!builderResult) {
|
if (!builderResult) {
|
||||||
throw new Error('No available live audio encoder found')
|
throw new Error('No available live audio encoder found')
|
||||||
}
|
}
|
||||||
|
@ -480,8 +495,11 @@ function getHLSVideoPath (options: HLSTranscodeOptions | HLSFromTSTranscodeOptio
|
||||||
// Transcoding presets
|
// Transcoding presets
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
// Run encoder builder depending on available encoders
|
||||||
|
// Try encoders by priority: if the encoder is available, run the chosen profile or fallback to the default one
|
||||||
|
// If the default one does not exist, check the next encoder
|
||||||
async function getEncoderBuilderResult (options: {
|
async function getEncoderBuilderResult (options: {
|
||||||
streamType: string
|
streamType: 'video' | 'audio'
|
||||||
input: string
|
input: string
|
||||||
|
|
||||||
availableEncoders: AvailableEncoders
|
availableEncoders: AvailableEncoders
|
||||||
|
@ -495,17 +513,24 @@ async function getEncoderBuilderResult (options: {
|
||||||
}) {
|
}) {
|
||||||
const { availableEncoders, input, profile, resolution, streamType, fps, streamNum, videoType } = options
|
const { availableEncoders, input, profile, resolution, streamType, fps, streamNum, videoType } = options
|
||||||
|
|
||||||
const encodersToTry: string[] = VIDEO_TRANSCODING_ENCODERS[streamType]
|
const encodersToTry = availableEncoders.encodersToTry[streamType]
|
||||||
|
const encoders = availableEncoders[videoType]
|
||||||
|
|
||||||
for (const encoder of encodersToTry) {
|
for (const encoder of encodersToTry) {
|
||||||
if (!(await checkFFmpegEncoders()).get(encoder) || !availableEncoders[videoType][encoder]) continue
|
if (!(await checkFFmpegEncoders()).get(encoder) || !encoders[encoder]) continue
|
||||||
|
|
||||||
const builderProfiles: EncoderProfile<EncoderOptionsBuilder> = availableEncoders[videoType][encoder]
|
// An object containing available profiles for this encoder
|
||||||
|
const builderProfiles: EncoderProfile<EncoderOptionsBuilder> = encoders[encoder]
|
||||||
let builder = builderProfiles[profile]
|
let builder = builderProfiles[profile]
|
||||||
|
|
||||||
if (!builder) {
|
if (!builder) {
|
||||||
logger.debug('Profile %s for encoder %s not available. Fallback to default.', profile, encoder)
|
logger.debug('Profile %s for encoder %s not available. Fallback to default.', profile, encoder)
|
||||||
builder = builderProfiles.default
|
builder = builderProfiles.default
|
||||||
|
|
||||||
|
if (!builder) {
|
||||||
|
logger.debug('Default profile for encoder %s not available. Try next available encoder.', encoder)
|
||||||
|
continue
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const result = await builder({ input, resolution: resolution, fps, streamNum })
|
const result = await builder({ input, resolution: resolution, fps, streamNum })
|
||||||
|
@ -538,11 +563,11 @@ async function presetVideo (
|
||||||
// Audio encoder
|
// Audio encoder
|
||||||
const parsedAudio = await getAudioStream(input)
|
const parsedAudio = await getAudioStream(input)
|
||||||
|
|
||||||
let streamsToProcess = [ 'AUDIO', 'VIDEO' ]
|
let streamsToProcess: StreamType[] = [ 'audio', 'video' ]
|
||||||
|
|
||||||
if (!parsedAudio.audioStream) {
|
if (!parsedAudio.audioStream) {
|
||||||
localCommand = localCommand.noAudio()
|
localCommand = localCommand.noAudio()
|
||||||
streamsToProcess = [ 'VIDEO' ]
|
streamsToProcess = [ 'audio' ]
|
||||||
}
|
}
|
||||||
|
|
||||||
for (const streamType of streamsToProcess) {
|
for (const streamType of streamsToProcess) {
|
||||||
|
@ -564,9 +589,9 @@ async function presetVideo (
|
||||||
|
|
||||||
logger.debug('Apply ffmpeg params from %s.', builderResult.encoder, builderResult)
|
logger.debug('Apply ffmpeg params from %s.', builderResult.encoder, builderResult)
|
||||||
|
|
||||||
if (streamType === 'VIDEO') {
|
if (streamType === 'video') {
|
||||||
localCommand.videoCodec(builderResult.encoder)
|
localCommand.videoCodec(builderResult.encoder)
|
||||||
} else if (streamType === 'AUDIO') {
|
} else if (streamType === 'audio') {
|
||||||
localCommand.audioCodec(builderResult.encoder)
|
localCommand.audioCodec(builderResult.encoder)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -341,17 +341,6 @@ const VIDEO_TRANSCODING_FPS: VideoTranscodingFPS = {
|
||||||
KEEP_ORIGIN_FPS_RESOLUTION_MIN: 720 // We keep the original FPS on high resolutions (720 minimum)
|
KEEP_ORIGIN_FPS_RESOLUTION_MIN: 720 // We keep the original FPS on high resolutions (720 minimum)
|
||||||
}
|
}
|
||||||
|
|
||||||
const VIDEO_TRANSCODING_ENCODERS = {
|
|
||||||
VIDEO: [ 'libx264' ],
|
|
||||||
|
|
||||||
// Try the first one, if not available try the second one etc
|
|
||||||
AUDIO: [
|
|
||||||
// we favor VBR, if a good AAC encoder is available
|
|
||||||
'libfdk_aac',
|
|
||||||
'aac'
|
|
||||||
]
|
|
||||||
}
|
|
||||||
|
|
||||||
const DEFAULT_AUDIO_RESOLUTION = VideoResolution.H_480P
|
const DEFAULT_AUDIO_RESOLUTION = VideoResolution.H_480P
|
||||||
|
|
||||||
const VIDEO_RATE_TYPES: { [ id: string ]: VideoRateType } = {
|
const VIDEO_RATE_TYPES: { [ id: string ]: VideoRateType } = {
|
||||||
|
@ -828,7 +817,6 @@ export {
|
||||||
ACTOR_FOLLOW_SCORE,
|
ACTOR_FOLLOW_SCORE,
|
||||||
PREVIEWS_SIZE,
|
PREVIEWS_SIZE,
|
||||||
REMOTE_SCHEME,
|
REMOTE_SCHEME,
|
||||||
VIDEO_TRANSCODING_ENCODERS,
|
|
||||||
FOLLOW_STATES,
|
FOLLOW_STATES,
|
||||||
DEFAULT_USER_THEME_NAME,
|
DEFAULT_USER_THEME_NAME,
|
||||||
SERVER_ACTOR_NAME,
|
SERVER_ACTOR_NAME,
|
||||||
|
|
|
@ -25,7 +25,7 @@ import { cleanupLive } from './job-queue/handlers/video-live-ending'
|
||||||
import { PeerTubeSocket } from './peertube-socket'
|
import { PeerTubeSocket } from './peertube-socket'
|
||||||
import { isAbleToUploadVideo } from './user'
|
import { isAbleToUploadVideo } from './user'
|
||||||
import { getHLSDirectory } from './video-paths'
|
import { getHLSDirectory } from './video-paths'
|
||||||
import { availableEncoders } from './video-transcoding-profiles'
|
import { VideoTranscodingProfilesManager } from './video-transcoding-profiles'
|
||||||
|
|
||||||
import memoizee = require('memoizee')
|
import memoizee = require('memoizee')
|
||||||
const NodeRtmpSession = require('node-media-server/node_rtmp_session')
|
const NodeRtmpSession = require('node-media-server/node_rtmp_session')
|
||||||
|
@ -337,7 +337,7 @@ class LiveManager {
|
||||||
outPath,
|
outPath,
|
||||||
resolutions: allResolutions,
|
resolutions: allResolutions,
|
||||||
fps,
|
fps,
|
||||||
availableEncoders,
|
availableEncoders: VideoTranscodingProfilesManager.Instance.getAvailableEncoders(),
|
||||||
profile: 'default'
|
profile: 'default'
|
||||||
})
|
})
|
||||||
: getLiveMuxingCommand(rtmpUrl, outPath)
|
: getLiveMuxingCommand(rtmpUrl, outPath)
|
||||||
|
|
|
@ -78,7 +78,25 @@ const defaultLibFDKAACVODOptionsBuilder: EncoderOptionsBuilder = ({ streamNum })
|
||||||
return { outputOptions: [ buildStreamSuffix('-q:a', streamNum), '5' ] }
|
return { outputOptions: [ buildStreamSuffix('-q:a', streamNum), '5' ] }
|
||||||
}
|
}
|
||||||
|
|
||||||
const availableEncoders: AvailableEncoders = {
|
// Used to get and update available encoders
|
||||||
|
class VideoTranscodingProfilesManager {
|
||||||
|
private static instance: VideoTranscodingProfilesManager
|
||||||
|
|
||||||
|
// 1 === less priority
|
||||||
|
private readonly encodersPriorities = {
|
||||||
|
video: [
|
||||||
|
{ name: 'libx264', priority: 100 }
|
||||||
|
],
|
||||||
|
|
||||||
|
// Try the first one, if not available try the second one etc
|
||||||
|
audio: [
|
||||||
|
// we favor VBR, if a good AAC encoder is available
|
||||||
|
{ name: 'libfdk_aac', priority: 200 },
|
||||||
|
{ name: 'aac', priority: 100 }
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
private readonly availableEncoders = {
|
||||||
vod: {
|
vod: {
|
||||||
libx264: {
|
libx264: {
|
||||||
default: defaultX264VODOptionsBuilder
|
default: defaultX264VODOptionsBuilder
|
||||||
|
@ -100,10 +118,43 @@ const availableEncoders: AvailableEncoders = {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private constructor () {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
getAvailableEncoders (): AvailableEncoders {
|
||||||
|
const encodersToTry = {
|
||||||
|
video: this.getEncodersByPriority('video'),
|
||||||
|
audio: this.getEncodersByPriority('audio')
|
||||||
|
}
|
||||||
|
|
||||||
|
return Object.assign({}, this.availableEncoders, { encodersToTry })
|
||||||
|
}
|
||||||
|
|
||||||
|
getAvailableProfiles (type: 'vod' | 'live') {
|
||||||
|
return this.availableEncoders[type]
|
||||||
|
}
|
||||||
|
|
||||||
|
private getEncodersByPriority (type: 'video' | 'audio') {
|
||||||
|
return this.encodersPriorities[type]
|
||||||
|
.sort((e1, e2) => {
|
||||||
|
if (e1.priority > e2.priority) return -1
|
||||||
|
else if (e1.priority === e2.priority) return 0
|
||||||
|
|
||||||
|
return 1
|
||||||
|
})
|
||||||
|
.map(e => e.name)
|
||||||
|
}
|
||||||
|
|
||||||
|
static get Instance () {
|
||||||
|
return this.instance || (this.instance = new this())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
export {
|
export {
|
||||||
availableEncoders
|
VideoTranscodingProfilesManager
|
||||||
}
|
}
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
|
|
|
@ -14,7 +14,7 @@ import { VideoFileModel } from '../models/video/video-file'
|
||||||
import { VideoStreamingPlaylistModel } from '../models/video/video-streaming-playlist'
|
import { VideoStreamingPlaylistModel } from '../models/video/video-streaming-playlist'
|
||||||
import { updateMasterHLSPlaylist, updateSha256VODSegments } from './hls'
|
import { updateMasterHLSPlaylist, updateSha256VODSegments } from './hls'
|
||||||
import { generateVideoStreamingPlaylistName, getVideoFilename, getVideoFilePath } from './video-paths'
|
import { generateVideoStreamingPlaylistName, getVideoFilename, getVideoFilePath } from './video-paths'
|
||||||
import { availableEncoders } from './video-transcoding-profiles'
|
import { VideoTranscodingProfilesManager } from './video-transcoding-profiles'
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
|
@ -41,7 +41,7 @@ async function optimizeOriginalVideofile (video: MVideoWithFile, inputVideoFile:
|
||||||
inputPath: videoInputPath,
|
inputPath: videoInputPath,
|
||||||
outputPath: videoTranscodedPath,
|
outputPath: videoTranscodedPath,
|
||||||
|
|
||||||
availableEncoders,
|
availableEncoders: VideoTranscodingProfilesManager.Instance.getAvailableEncoders(),
|
||||||
profile: 'default',
|
profile: 'default',
|
||||||
|
|
||||||
resolution: inputVideoFile.resolution,
|
resolution: inputVideoFile.resolution,
|
||||||
|
@ -95,7 +95,7 @@ async function transcodeNewWebTorrentResolution (video: MVideoWithFile, resoluti
|
||||||
inputPath: videoInputPath,
|
inputPath: videoInputPath,
|
||||||
outputPath: videoTranscodedPath,
|
outputPath: videoTranscodedPath,
|
||||||
|
|
||||||
availableEncoders,
|
availableEncoders: VideoTranscodingProfilesManager.Instance.getAvailableEncoders(),
|
||||||
profile: 'default',
|
profile: 'default',
|
||||||
|
|
||||||
resolution,
|
resolution,
|
||||||
|
@ -107,7 +107,7 @@ async function transcodeNewWebTorrentResolution (video: MVideoWithFile, resoluti
|
||||||
inputPath: videoInputPath,
|
inputPath: videoInputPath,
|
||||||
outputPath: videoTranscodedPath,
|
outputPath: videoTranscodedPath,
|
||||||
|
|
||||||
availableEncoders,
|
availableEncoders: VideoTranscodingProfilesManager.Instance.getAvailableEncoders(),
|
||||||
profile: 'default',
|
profile: 'default',
|
||||||
|
|
||||||
resolution,
|
resolution,
|
||||||
|
@ -142,7 +142,7 @@ async function mergeAudioVideofile (video: MVideoWithAllFiles, resolution: Video
|
||||||
inputPath: tmpPreviewPath,
|
inputPath: tmpPreviewPath,
|
||||||
outputPath: videoTranscodedPath,
|
outputPath: videoTranscodedPath,
|
||||||
|
|
||||||
availableEncoders,
|
availableEncoders: VideoTranscodingProfilesManager.Instance.getAvailableEncoders(),
|
||||||
profile: 'default',
|
profile: 'default',
|
||||||
|
|
||||||
audioPath: audioInputPath,
|
audioPath: audioInputPath,
|
||||||
|
@ -283,7 +283,7 @@ async function generateHlsPlaylistCommon (options: {
|
||||||
inputPath,
|
inputPath,
|
||||||
outputPath,
|
outputPath,
|
||||||
|
|
||||||
availableEncoders,
|
availableEncoders: VideoTranscodingProfilesManager.Instance.getAvailableEncoders(),
|
||||||
profile: 'default',
|
profile: 'default',
|
||||||
|
|
||||||
resolution,
|
resolution,
|
||||||
|
|
Loading…
Reference in New Issue