interesting
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Force HLS transcoding 

Fix weird behaviour with some web browsers. Don't really know if it's a
ffmpeg bug, a safari bug or a peertube bug, but forcing transcoding
seems to fix this playback bug
This commit is contained in:
Chocobozzz 2020-12-22 15:42:02 +01:00
parent 1916c9663a
commit 236841a1d7
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
server/lib/job-queue/handlers/video-transcoding.ts
View File

@ -18,6 +18,7 @@ import { federateVideoIfNeeded } from '../../activitypub/videos'
import { Notifier } from '../../notifier' import { Notifier } from '../../notifier'
import { generateHlsPlaylist, mergeAudioVideofile, optimizeOriginalVideofile, transcodeNewResolution } from '../../video-transcoding' import { generateHlsPlaylist, mergeAudioVideofile, optimizeOriginalVideofile, transcodeNewResolution } from '../../video-transcoding'
import { JobQueue } from '../job-queue' import { JobQueue } from '../job-queue'
import { TranscodeOptionsType } from '@server/helpers/ffmpeg-utils'
async function processVideoTranscoding (job: Bull.Job) { async function processVideoTranscoding (job: Bull.Job) {
const payload = job.data as VideoTranscodingPayload const payload = job.data as VideoTranscodingPayload
@ -56,9 +57,9 @@ async function processVideoTranscoding (job: Bull.Job) {
await retryTransactionWrapper(publishNewResolutionIfNeeded, video, payload) await retryTransactionWrapper(publishNewResolutionIfNeeded, video, payload)
} else { } else {
await optimizeOriginalVideofile(video) const transcodeType = await optimizeOriginalVideofile(video)
await retryTransactionWrapper(onVideoFileOptimizerSuccess, video, payload) await retryTransactionWrapper(onVideoFileOptimizerSuccess, video, payload, transcodeType)
} }
return video return video
@ -83,10 +84,14 @@ async function onHlsPlaylistGenerationSuccess (video: MVideoFullLight) {
async function publishNewResolutionIfNeeded (video: MVideoUUID, payload?: NewResolutionTranscodingPayload | MergeAudioTranscodingPayload) { async function publishNewResolutionIfNeeded (video: MVideoUUID, payload?: NewResolutionTranscodingPayload | MergeAudioTranscodingPayload) {
await publishAndFederateIfNeeded(video) await publishAndFederateIfNeeded(video)
await createHlsJobIfEnabled(payload) createHlsJobIfEnabled(Object.assign({}, payload, { copyCodecs: true })
} }
async function onVideoFileOptimizerSuccess (videoArg: MVideoWithFile, payload: OptimizeTranscodingPayload) { async function onVideoFileOptimizerSuccess (
videoArg: MVideoWithFile,
payload: OptimizeTranscodingPayload,
transcodeType: TranscodeOptionsType
) {
if (videoArg === undefined) return undefined if (videoArg === undefined) return undefined
// Outside the transaction (IO on disk) // Outside the transaction (IO on disk)
@ -108,8 +113,13 @@ async function onVideoFileOptimizerSuccess (videoArg: MVideoWithFile, payload: O
let videoPublished = false let videoPublished = false
// Generate HLS version of the max quality file // Generate HLS version of the max quality file
const hlsPayload = Object.assign({}, payload, { resolution: videoDatabase.getMaxQualityFile().resolution }) const originalFileHLSPayload = Object.assign({}, payload, {
await createHlsJobIfEnabled(hlsPayload) isPortraitMode,
resolution: videoDatabase.getMaxQualityFile().resolution,
// If we quick transcoded original file, force transcoding for HLS to avoid some weird playback issues
copyCodecs: transcodeType !== 'quick-transcode'
})
createHlsJobIfEnabled(originalFileHLSPayload)
if (resolutionsEnabled.length !== 0) { if (resolutionsEnabled.length !== 0) {
for (const resolution of resolutionsEnabled) { for (const resolution of resolutionsEnabled) {
@ -161,7 +171,7 @@ export {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
function createHlsJobIfEnabled (payload?: { videoUUID: string, resolution: number, isPortraitMode?: boolean }) { function createHlsJobIfEnabled (payload: { videoUUID: string, resolution: number, isPortraitMode?: boolean, copyCodecs: boolean }) {
// Generate HLS playlist? // Generate HLS playlist?
if (payload && CONFIG.TRANSCODING.HLS.ENABLED) { if (payload && CONFIG.TRANSCODING.HLS.ENABLED) {
const hlsTranscodingPayload = { const hlsTranscodingPayload = {
@ -169,7 +179,7 @@ function createHlsJobIfEnabled (payload?: { videoUUID: string, resolution: numbe
videoUUID: payload.videoUUID, videoUUID: payload.videoUUID,
resolution: payload.resolution, resolution: payload.resolution,
isPortraitMode: payload.isPortraitMode, isPortraitMode: payload.isPortraitMode,
copyCodecs: true copyCodecs: payload.copyCodecs
} }
return JobQueue.Instance.createJob({ type: 'video-transcoding', payload: hlsTranscodingPayload }) return JobQueue.Instance.createJob({ type: 'video-transcoding', payload: hlsTranscodingPayload })

2
server/lib/video-transcoding.ts
View File

@ -59,6 +59,8 @@ async function optimizeOriginalVideofile (video: MVideoWithFile, inputVideoFileA
const videoOutputPath = getVideoFilePath(video, inputVideoFile) const videoOutputPath = getVideoFilePath(video, inputVideoFile)
await onVideoFileTranscoding(video, inputVideoFile, videoTranscodedPath, videoOutputPath) await onVideoFileTranscoding(video, inputVideoFile, videoTranscodedPath, videoOutputPath)
return transcodeType
} catch (err) { } catch (err) {
// Auto destruction... // Auto destruction...
video.destroy().catch(err => logger.error('Cannot destruct video after transcoding failure.', { err })) video.destroy().catch(err => logger.error('Cannot destruct video after transcoding failure.', { err }))