IntenseWebs/PeerTube
3
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2024-12-01 21:09:17 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix resolution to transcode hook name

Browse Source
This commit is contained in:
Chocobozzz 2022-08-05 13:40:56 +02:00
parent 84cae54e7a
commit 64fd6158fd
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/controllers/api/videos/transcoding.ts
View File

@ -33,7 +33,7 @@ async function createTranscoding (req: express.Request, res: express.Response) {
const { resolution: maxResolution, audioStream } = await video.probeMaxQualityFile() const { resolution: maxResolution, audioStream } = await video.probeMaxQualityFile()
const resolutions = await Hooks.wrapObject( const resolutions = await Hooks.wrapObject(
computeResolutionsToTranscode({ inputResolution: maxResolution, type: 'vod', includeInputResolution: true }), computeResolutionsToTranscode({ inputResolution: maxResolution, type: 'vod', includeInputResolution: true }),
'filter:transcoding.manual.lower-resolutions-to-transcode.result', 'filter:transcoding.manual.resolutions-to-transcode.result',
body body
) )

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

@ -266,7 +266,7 @@ async function createLowerResolutionsJobs (options: {
// Create transcoding jobs if there are enabled resolutions // Create transcoding jobs if there are enabled resolutions
const resolutionsEnabled = await Hooks.wrapObject( const resolutionsEnabled = await Hooks.wrapObject(
computeResolutionsToTranscode({ inputResolution: videoFileResolution, type: 'vod', includeInputResolution: false }), computeResolutionsToTranscode({ inputResolution: videoFileResolution, type: 'vod', includeInputResolution: false }),
'filter:transcoding.auto.lower-resolutions-to-transcode.result', 'filter:transcoding.auto.resolutions-to-transcode.result',
options options
) )

2
server/lib/live/live-manager.ts
View File

@ -245,7 +245,7 @@ class LiveManager {
const allResolutions = await Hooks.wrapObject( const allResolutions = await Hooks.wrapObject(
this.buildAllResolutionsToTranscode(resolution), this.buildAllResolutionsToTranscode(resolution),
'filter:transcoding.auto.lower-resolutions-to-transcode.result', 'filter:transcoding.auto.resolutions-to-transcode.result',
{ video } { video }
) )

2
server/tests/fixtures/peertube-plugin-test/main.js vendored
View File

@ -301,7 +301,7 @@ async function register ({ registerHook, registerSetting, settingsManager, stora
}) })
registerHook({ registerHook({
target: 'filter:transcoding.auto.lower-resolutions-to-transcode.result', target: 'filter:transcoding.auto.resolutions-to-transcode.result',
handler: (object, context) => { handler: (object, context) => {
if (context.video.name.includes('transcode-filter')) { if (context.video.name.includes('transcode-filter')) {
object = [ 100 ] object = [ 100 ]

2
server/tests/plugins/filter-hooks.ts
View File

@ -680,7 +680,7 @@ describe('Test plugin filter hooks', function () {
describe('Transcoding filters', async function () { describe('Transcoding filters', async function () {
it('Should run filter:transcoding.auto.lower-resolutions-to-transcode.result', async function () { it('Should run filter:transcoding.auto.resolutions-to-transcode.result', async function () {
const { uuid } = await servers[0].videos.quickUpload({ name: 'transcode-filter' }) const { uuid } = await servers[0].videos.quickUpload({ name: 'transcode-filter' })
await waitJobs(servers) await waitJobs(servers)

4
shared/models/plugins/server/server-hook.model.ts
View File

@ -102,8 +102,8 @@ export const serverFilterHookObject = {
'filter:job-queue.process.params': true, 'filter:job-queue.process.params': true,
'filter:job-queue.process.result': true, 'filter:job-queue.process.result': true,
'filter:transcoding.manual.lower-resolutions-to-transcode.result': true, 'filter:transcoding.manual.resolutions-to-transcode.result': true,
'filter:transcoding.auto.lower-resolutions-to-transcode.result': true 'filter:transcoding.auto.resolutions-to-transcode.result': true
} }
export type ServerFilterHookName = keyof typeof serverFilterHookObject export type ServerFilterHookName = keyof typeof serverFilterHookObject