Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Fix juddery video with variable fps input

Chocobozzz1d1ac573b96a
diff --git a/packages/ffmpeg/src/ffmpeg-default-transcoding-profile.ts b/packages/ffmpeg/src/ffmpeg-default-transcoding-profile.ts
index 1105d14f1a..2e0a02d13a 100644
--- a/packages/ffmpeg/src/ffmpeg-default-transcoding-profile.ts
+++ b/packages/ffmpeg/src/ffmpeg-default-transcoding-profile.ts
@@ -18,11 +18,11 @@ const defaultX264VODOptionsBuilder: EncoderOptionsBuilder = (options: EncoderOpt
const targetBitrate = getTargetBitrate({ inputBitrate, ratio: inputRatio, fps, resolution })
return {
- outputOptions: [
- ...getCommonOutputOptions(targetBitrate),
+ videoFilters: fps
+ ? [ { name: 'fps', rawOptions: `fps=${fps}` } ]
+ : undefined,
- `-r ${fps}`
- ]
+ outputOptions: getCommonOutputOptions(targetBitrate)
}
}
@@ -32,10 +32,13 @@ const defaultX264LiveOptionsBuilder: EncoderOptionsBuilder = (options: EncoderOp
const targetBitrate = getTargetBitrate({ inputBitrate, ratio: inputRatio, fps, resolution })
return {
+ videoFilters: fps
+ ? [ { name: 'fps', rawOptions: `fps=${fps}` } ]
+ : undefined,
+
outputOptions: [
...getCommonOutputOptions(targetBitrate, streamNum),
- `${buildStreamSuffix('-r:v', streamNum)} ${fps}`,
`${buildStreamSuffix('-b:v', streamNum)} ${targetBitrate}`
]
}
diff --git a/packages/ffmpeg/src/ffmpeg-live.ts b/packages/ffmpeg/src/ffmpeg-live.ts
index 5fa51c8b13..ce863da421 100644
--- a/packages/ffmpeg/src/ffmpeg-live.ts
+++ b/packages/ffmpeg/src/ffmpeg-live.ts
@@ -1,5 +1,5 @@
import { pick } from '@peertube/peertube-core-utils'
-import { VideoResolution } from '@peertube/peertube-models'
+import { EncoderOptions, VideoResolution } from '@peertube/peertube-models'
import { FfmpegCommand, FfprobeData, FilterSpecification } from 'fluent-ffmpeg'
import { join } from 'path'
import { FFmpegCommandWrapper, FFmpegCommandWrapperOptions } from './ffmpeg-command-wrapper.js'
@@ -142,6 +142,8 @@ export class FFmpegLive {
) {
const { inputUrl, bitrate, ratio, probe, splitAudioAndVideo, command, resolution, fps, streamNum, streamType, hasAudio } = options
+ const finalOutputName = `vout${resolution}`
+
const baseEncoderBuilderParams = {
input: inputUrl,
@@ -171,7 +173,7 @@ export class FFmpegLive {
if (streamType === 'audio') {
command.outputOption('-map a:0')
} else {
- command.outputOption(`-map [vout${resolution}]`)
+ command.outputOption(`-map [${finalOutputName}]`)
}
addDefaultEncoderParams({ command, encoder: builderResult.encoder, fps, streamNum })
@@ -192,12 +194,34 @@ export class FFmpegLive {
} else {
command.outputOption(`${buildStreamSuffix('-c:v', streamNum)} ${builderResult.encoder}`)
- complexFilter.push({
- inputs: `vtemp${resolution}`,
- filter: getScaleFilter(builderResult.result),
- options: `w=-2:h=${resolution}`,
- outputs: `vout${resolution}`
- })
+ // Apply additional video filters from encoder options (e.g., fps)
+ const videoFilters: EncoderOptions['videoFilters'] = [
+ {
+ name: getScaleFilter(builderResult.result),
+ rawOptions: `w=-2:h=${resolution}`
+ },
+
+ ...(builderResult.result.videoFilters || [])
+ ]
+
+ let lastOutputName = `vtemp${resolution}`
+ for (let i = 0; i < videoFilters.length; i++) {
+ const videoFilter = videoFilters[i]
+ const isLastFilter = i === videoFilters.length - 1
+
+ const filterOutput = isLastFilter
+ ? finalOutputName
+ : `vfiltered${resolution}_${i}`
+
+ complexFilter.push({
+ inputs: lastOutputName,
+ filter: videoFilter.name,
+ options: videoFilter.rawOptions,
+ outputs: filterOutput
+ })
+
+ lastOutputName = filterOutput
+ }
if (splitAudioAndVideo) {
const suffix = hasAudio
diff --git a/packages/ffmpeg/src/shared/presets.ts b/packages/ffmpeg/src/shared/presets.ts
index a681cf0c10..030b89b4ce 100644
--- a/packages/ffmpeg/src/shared/presets.ts
+++ b/packages/ffmpeg/src/shared/presets.ts
@@ -81,15 +81,29 @@ export async function presetVOD (options: {
commandWrapper.debugLog(
`Apply ffmpeg params from ${builderResult.encoder} for ${streamType} ` +
- `stream of input ${input} using ${commandWrapper.getProfile()} profile.`,
+ `stream of input ${input} using ${commandWrapper.getProfile()} profile.`,
{ builderResult, resolution, fps }
)
if (streamType === 'video') {
command.videoCodec(builderResult.encoder)
+ const videoFilters: string[] = []
+
if (scaleFilterValue) {
- command.outputOption(`-vf ${getScaleFilter(builderResult.result)}=${scaleFilterValue}`)
+ videoFilters.push(`${getScaleFilter(builderResult.result)}=${scaleFilterValue}`)
+ }
+
+ for (const builderVideoFilter of builderResult.result.videoFilters || []) {
+ videoFilters.push(
+ builderVideoFilter.rawOptions
+ ? `${builderVideoFilter.name}=${builderVideoFilter.rawOptions}`
+ : builderVideoFilter.name
+ )
+ }
+
+ if (videoFilters.length > 0) {
+ command.outputOption(`-vf ${videoFilters.join(',')}`)
}
} else if (streamType === 'audio') {
command.audioCodec(builderResult.encoder)
diff --git a/packages/models/src/videos/transcoding/video-transcoding.model.ts b/packages/models/src/videos/transcoding/video-transcoding.model.ts
index ea92976814..22e1770c64 100644
--- a/packages/models/src/videos/transcoding/video-transcoding.model.ts
+++ b/packages/models/src/videos/transcoding/video-transcoding.model.ts
@@ -31,14 +31,20 @@ export interface EncoderOptions {
name: string
}
+ // Additional video filters to apply (e.g., fps)
+ videoFilters?: {
+ name: string
+ rawOptions?: string
+ }[]
+
inputOptions?: string[]
outputOptions?: string[]
}
// All our encoders
-export interface EncoderProfile <T> {
- [ profile: string ]: T
+export interface EncoderProfile<T> {
+ [profile: string]: T
default: T
}
@@ -46,11 +52,11 @@ export interface EncoderProfile <T> {
export type AvailableEncoders = {
available: {
live: {
- [ encoder: string ]: EncoderProfile<EncoderOptionsBuilder>
+ [encoder: string]: EncoderProfile<EncoderOptionsBuilder>
}
vod: {
- [ encoder: string ]: EncoderProfile<EncoderOptionsBuilder>
+ [encoder: string]: EncoderProfile<EncoderOptionsBuilder>
}
}
diff --git a/packages/server-commands/src/videos/live.ts b/packages/server-commands/src/videos/live.ts
index 80fa1cb289..85b8c307d1 100644
--- a/packages/server-commands/src/videos/live.ts
+++ b/packages/server-commands/src/videos/live.ts
@@ -25,7 +25,7 @@ export function sendRTMPStream (options: {
command.outputOption('-c:v libx264')
command.outputOption('-g 120')
command.outputOption('-x264-params "no-scenecut=1"')
- command.outputOption('-r 60')
+ command.outputOption('-vf fps=60')
}
command.outputOption('-f flv')
diff --git a/packages/tests/src/shared/generate.ts b/packages/tests/src/shared/generate.ts
index a301c7db7b..c92445dc59 100644
--- a/packages/tests/src/shared/generate.ts
+++ b/packages/tests/src/shared/generate.ts
@@ -62,7 +62,7 @@ async function generateVideoWithFramerate (fps = 120, size = '1280x720') {
ffmpeg()
.outputOptions([ '-f rawvideo', '-video_size ' + size, '-i /dev/urandom' ])
.outputOptions([ '-ac 2', '-f s16le', '-i /dev/urandom', '-t 5' ])
- .outputOptions([ `-r ${fps}` ])
+ .outputOptions([ `-vf fps=${fps}` ])
.output(tempFixturePath)
.on('error', rej)
.on('end', () => res(tempFixturePath))