IntenseWebs/PeerTube
3
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2026-09-03 20:53:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix audio merge fps typo

Browse Source
This commit is contained in:
Chocobozzz
2026-07-10 14:22:33 +02:00
parent e1f7835ad6
commit 79cb9e23b5
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/tests/src/api/transcoding/hls.ts
+2 -2
View File
@@ -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
})
})
packages/tests/src/api/transcoding/split-audio-and-video.ts
+2 -2
View File
@@ -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
})
})
server/core/initializers/constants.ts
+2 -2
View File
@@ -573,8 +573,8 @@ export const MAX_LOCAL_VIEWER_WATCH_SECTIONS = 100
export 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 = 25
export const VIDEO_RATE_TYPES: { [id: string]: VideoRateType } = {
LIKE: 'like',
server/core/lib/transcoding/shared/job-builders/abstract-job-builder.ts
+3 -3
View File
@@ -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: Transc
if (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_RESOLUTION
mergeOrOptimizePayload = this.buildMergeAudioPayload({
video,