yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-04 18:29:27 +02:00
Code Issues Releases Wiki Activity

Fix transcoding error

Browse source 
When transcoding.always_transcode_original_resolution is false
This commit is contained in:
Chocobozzz 2023-05-30 09:35:21 +02:00
parent 89eda2aab0
commit 29c7319c8a
No known key found for this signature in database
GPG key ID: 583A612D890159BE
4 changed files with 33 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

28
server/lib/transcoding/web-transcoding.ts
View file

@ -3,8 +3,8 @@ import { copyFile, move, remove, stat } from 'fs-extra'
import { basename, join } from 'path'
import { computeOutputFPS } from '@server/helpers/ffmpeg'
import { createTorrentAndSetInfoHash } from '@server/helpers/webtorrent'
import { VideoModel } from '@server/models/video/video'
import { MVideoFile, MVideoFullLight } from '@server/types/models'
import { toEven } from '@shared/core-utils'
import { ffprobePromise, getVideoStreamDuration, getVideoStreamFPS, TranscodeVODOptionsType } from '@shared/ffmpeg'
import { VideoResolution, VideoStorage } from '@shared/models'
import { CONFIG } from '../../initializers/config'
@ -13,8 +13,7 @@ import { generateWebTorrentVideoFilename } from '../paths'
import { buildFileMetadata } from '../video-file'
import { VideoPathManager } from '../video-path-manager'
import { buildFFmpegVOD } from './shared'
import { computeResolutionsToTranscode } from './transcoding-resolutions'
import { VideoModel } from '@server/models/video/video'
import { buildOriginalFileResolution } from './transcoding-resolutions'
// Optimize the original video file and replace it. The resolution is not changed.
export async function optimizeOriginalVideofile (options: {
@ -248,26 +247,3 @@ export async function onWebTorrentVideoFileTranscoding (options: {
mutexReleaser()
}
}
// ---------------------------------------------------------------------------
function buildOriginalFileResolution (inputResolution: number) {
if (CONFIG.TRANSCODING.ALWAYS_TRANSCODE_ORIGINAL_RESOLUTION === true) {
return toEven(inputResolution)
}
const resolutions = computeResolutionsToTranscode({
input: inputResolution,
type: 'vod',
includeInput: false,
strictLower: false,
// We don't really care about the audio resolution in this context
hasAudio: true
})
if (resolutions.length === 0) {
return toEven(inputResolution)
}
return Math.max(...resolutions)
}