ActivityPub-federated video streaming platform using P2P directly in your web browser
Fix audio merge fps typo
Chocobozzz79cb9e23b52f
diff --git a/packages/tests/src/api/transcoding/hls.ts b/packages/tests/src/api/transcoding/hls.tsindex 4309731296..cea6dea700 100644--- a/packages/tests/src/api/transcoding/hls.ts+++ b/packages/tests/src/api/transcoding/hls.ts@@ -11,7 +11,7 @@ import {setAccessTokensToServers,waitJobs} from '@peertube/peertube-server-commands'-import { DEFAULT_AUDIO_RESOLUTION } from '@peertube/peertube-server/core/initializers/constants.js'+import { DEFAULT_AUDIO_MERGE_RESOLUTION } from '@peertube/peertube-server/core/initializers/constants.js'import { checkDirectoryIsEmpty, checkTmpIsEmpty } from '@tests/shared/directories.js'import { completeCheckHlsPlaylist } from '@tests/shared/streaming-playlists.js'import { join } from 'path'@@ -72,7 +72,7 @@ describe('Test HLS videos', function () {servers,videoUUID: uuid,hlsOnly,- resolutions: [ DEFAULT_AUDIO_RESOLUTION, 360, 240 ],+ resolutions: [ DEFAULT_AUDIO_MERGE_RESOLUTION, 360, 240 ],objectStorageBaseUrl})})diff --git a/packages/tests/src/api/transcoding/split-audio-and-video.ts b/packages/tests/src/api/transcoding/split-audio-and-video.tsindex 2b2d7a1ea5..48383beaf1 100644--- a/packages/tests/src/api/transcoding/split-audio-and-video.ts+++ b/packages/tests/src/api/transcoding/split-audio-and-video.ts@@ -12,7 +12,7 @@ import {setAccessTokensToServers,waitJobs} from '@peertube/peertube-server-commands'-import { DEFAULT_AUDIO_RESOLUTION } from '@peertube/peertube-server/core/initializers/constants.js'+import { DEFAULT_AUDIO_MERGE_RESOLUTION } from '@peertube/peertube-server/core/initializers/constants.js'import { checkDirectoryIsEmpty, checkTmpIsEmpty } from '@tests/shared/directories.js'import { completeCheckHlsPlaylist } from '@tests/shared/streaming-playlists.js'import { expect } from 'chai'@@ -80,7 +80,7 @@ describe('Test HLS with audio and video splitted', function () {videoUUID: uuid,hlsOnly,splittedAudio: true,- resolutions: [ DEFAULT_AUDIO_RESOLUTION, 360, 240 ],+ resolutions: [ DEFAULT_AUDIO_MERGE_RESOLUTION, 360, 240 ],objectStorageBaseUrl})})diff --git a/server/core/initializers/constants.ts b/server/core/initializers/constants.tsindex 22a8396913..52fd1aa255 100644--- a/server/core/initializers/constants.ts+++ b/server/core/initializers/constants.ts@@ -573,8 +573,8 @@ export const MAX_LOCAL_VIEWER_WATCH_SECTIONS = 100export let CONTACT_FORM_LIFETIME = 60000 * 60 // 1 hour-export const DEFAULT_AUDIO_RESOLUTION = VideoResolution.H_480P-export const DEFAULT_AUDIO_MERGE_RESOLUTION = 25+export const DEFAULT_AUDIO_MERGE_RESOLUTION = VideoResolution.H_480P+export const DEFAULT_AUDIO_MERGE_FPS = 25export const VIDEO_RATE_TYPES: { [id: string]: VideoRateType } = {LIKE: 'like',diff --git a/server/core/lib/transcoding/shared/job-builders/abstract-job-builder.ts b/server/core/lib/transcoding/shared/job-builders/abstract-job-builder.tsindex c311bf46aa..9bf9fb40bb 100644--- a/server/core/lib/transcoding/shared/job-builders/abstract-job-builder.ts+++ b/server/core/lib/transcoding/shared/job-builders/abstract-job-builder.ts@@ -2,7 +2,7 @@ import { VideoFileStreamType, VideoResolution } from '@peertube/peertube-models'import { computeOutputFPS } from '@server/helpers/ffmpeg/framerate.js'import { logger, loggerTagsFactory } from '@server/helpers/logger.js'import { CONFIG } from '@server/initializers/config.js'-import { DEFAULT_AUDIO_MERGE_RESOLUTION, DEFAULT_AUDIO_RESOLUTION } from '@server/initializers/constants.js'+import { DEFAULT_AUDIO_MERGE_FPS, DEFAULT_AUDIO_MERGE_RESOLUTION } from '@server/initializers/constants.js'import { Hooks } from '@server/lib/plugins/hooks.js'import { MUserId, MVideoFile, MVideoFull } from '@server/types/models/index.js'import { buildOriginalFileResolution, computeResolutionsToTranscode } from '../../transcoding-resolutions.js'@@ -33,8 +33,8 @@ export abstract class AbstractJobBuilder<P extends { transcodingPriority: Transcif (videoFile.isAudio()) {// The first transcoding job will transcode to this FPS value- maxFPS = Math.min(DEFAULT_AUDIO_MERGE_RESOLUTION, CONFIG.TRANSCODING.FPS.MAX)- maxResolution = DEFAULT_AUDIO_RESOLUTION+ maxFPS = Math.min(DEFAULT_AUDIO_MERGE_FPS, CONFIG.TRANSCODING.FPS.MAX)+ maxResolution = DEFAULT_AUDIO_MERGE_RESOLUTIONmergeOrOptimizePayload = this.buildMergeAudioPayload({video,