From 7f6957f960a15f9a15dcd60aa1d1814576834be8 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 13 Aug 2024 08:24:43 +0200 Subject: [PATCH] Save --- packages/tests/src/api/object-storage/video-imports.ts | 2 +- packages/tests/src/api/runners/runner-common.ts | 2 +- packages/tests/src/api/runners/runner-vod-transcoding.ts | 2 +- packages/tests/src/api/transcoding/create-transcoding.ts | 2 +- packages/tests/src/api/videos/generate-download.ts | 2 +- packages/tests/src/api/videos/video-files.ts | 2 +- packages/tests/src/api/videos/video-source.ts | 4 ++-- packages/tests/src/feeds/feeds.ts | 2 +- packages/tests/src/plugins/plugin-helpers.ts | 2 +- packages/tests/src/shared/live.ts | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/tests/src/api/object-storage/video-imports.ts b/packages/tests/src/api/object-storage/video-imports.ts index ec269e7c076..7cf44387a3e 100644 --- a/packages/tests/src/api/object-storage/video-imports.ts +++ b/packages/tests/src/api/object-storage/video-imports.ts @@ -75,7 +75,7 @@ describe('Object storage for video import', function () { describe('With transcoding', async function () { before(async function () { - await server.config.enableTranscoding() + await server.config.enableTranscoding({ webVideo: true, hls: true, resolutions: 'max' }) }) it('Should import a video and have sent it to object storage', async function () { diff --git a/packages/tests/src/api/runners/runner-common.ts b/packages/tests/src/api/runners/runner-common.ts index ddcaa465244..f0234b0e630 100644 --- a/packages/tests/src/api/runners/runner-common.ts +++ b/packages/tests/src/api/runners/runner-common.ts @@ -41,7 +41,7 @@ describe('Test runner common actions', function () { await setAccessTokensToServers([ server ]) await setDefaultVideoChannel([ server ]) - await server.config.enableTranscoding({ hls: true, webVideo: true }) + await server.config.enableTranscoding({ hls: true, webVideo: true, resolutions: 'max' }) await server.config.enableRemoteTranscoding() }) diff --git a/packages/tests/src/api/runners/runner-vod-transcoding.ts b/packages/tests/src/api/runners/runner-vod-transcoding.ts index 869fd7621db..433e355a868 100644 --- a/packages/tests/src/api/runners/runner-vod-transcoding.ts +++ b/packages/tests/src/api/runners/runner-vod-transcoding.ts @@ -85,7 +85,7 @@ describe('Test runner VOD transcoding', function () { before(async function () { this.timeout(60000) - await servers[0].config.enableTranscoding({ hls: true, webVideo: true }) + await servers[0].config.enableTranscoding({ hls: true, webVideo: true, resolutions: 'max' }) }) it('Should error a transcoding job', async function () { diff --git a/packages/tests/src/api/transcoding/create-transcoding.ts b/packages/tests/src/api/transcoding/create-transcoding.ts index d2de20c7eef..a5caaf82aba 100644 --- a/packages/tests/src/api/transcoding/create-transcoding.ts +++ b/packages/tests/src/api/transcoding/create-transcoding.ts @@ -77,7 +77,7 @@ function runTests (options: { const video = await servers[0].videos.get({ id: videoUUID }) publishedAt = video.publishedAt as string - await servers[0].config.enableTranscoding() + await servers[0].config.enableTranscoding({ webVideo: true, hls: true, resolutions: 'max' }) await servers[0].config.setTranscodingConcurrency(concurrency) }) diff --git a/packages/tests/src/api/videos/generate-download.ts b/packages/tests/src/api/videos/generate-download.ts index 7f88c3333d9..0745ed84331 100644 --- a/packages/tests/src/api/videos/generate-download.ts +++ b/packages/tests/src/api/videos/generate-download.ts @@ -51,7 +51,7 @@ describe('Test generate download', function () { const resolutions = [ VideoResolution.H_NOVIDEO, VideoResolution.H_144P ] { - await server.config.enableTranscoding({ hls: true, webVideo: true, resolutions }) + await server.config.enableTranscoding({ hls: true, webVideo: true, splitAudioAndVideo: false, resolutions }) await server.videos.quickUpload({ name: 'common-' + seed }) await waitJobs(servers) } diff --git a/packages/tests/src/api/videos/video-files.ts b/packages/tests/src/api/videos/video-files.ts index 8d577e8765e..a5f3abd001c 100644 --- a/packages/tests/src/api/videos/video-files.ts +++ b/packages/tests/src/api/videos/video-files.ts @@ -25,7 +25,7 @@ describe('Test videos files', function () { await doubleFollow(servers[0], servers[1]) - await servers[0].config.enableTranscoding({ hls: true, webVideo: true }) + await servers[0].config.enableTranscoding({ hls: true, webVideo: true, resolutions: 'max' }) }) describe('When deleting all files', function () { diff --git a/packages/tests/src/api/videos/video-source.ts b/packages/tests/src/api/videos/video-source.ts index cf7f3186355..a1509945ae7 100644 --- a/packages/tests/src/api/videos/video-source.ts +++ b/packages/tests/src/api/videos/video-source.ts @@ -247,7 +247,7 @@ describe('Test video source management', function () { const previousPaths: string[] = [] - await servers[0].config.enableTranscoding({ hls: true, webVideo: true, with0p: true, keepOriginal: true }) + await servers[0].config.enableTranscoding({ hls: true, webVideo: true, with0p: true, keepOriginal: true, resolutions: 'max' }) const uploadFixture = 'video_short_720p.mp4' const { uuid: videoUUID } = await servers[0].videos.quickUpload({ name: 'fs with transcoding', fixture: uploadFixture }) @@ -527,7 +527,7 @@ describe('Test video source management', function () { const previousPaths: string[] = [] - await servers[0].config.enableTranscoding({ hls: true, webVideo: true, with0p: true, keepOriginal: true }) + await servers[0].config.enableTranscoding({ hls: true, webVideo: true, with0p: true, keepOriginal: true, resolutions: 'max' }) const fixture1 = 'video_short_360p.mp4' const { uuid: videoUUID } = await servers[0].videos.quickUpload({ diff --git a/packages/tests/src/feeds/feeds.ts b/packages/tests/src/feeds/feeds.ts index ed36a87bc54..755cce2eff3 100644 --- a/packages/tests/src/feeds/feeds.ts +++ b/packages/tests/src/feeds/feeds.ts @@ -56,7 +56,7 @@ describe('Test syndication feeds', () => { await doubleFollow(servers[0], servers[1]) await servers[0].config.enableLive({ allowReplay: false, transcoding: false }) - await serverHLSOnly.config.enableTranscoding({ webVideo: false, hls: true, with0p: true }) + await serverHLSOnly.config.enableTranscoding({ webVideo: false, hls: true, with0p: true, resolutions: 'max' }) { const user = await servers[0].users.getMyInfo() diff --git a/packages/tests/src/plugins/plugin-helpers.ts b/packages/tests/src/plugins/plugin-helpers.ts index d2bd8596e58..494c6257e89 100644 --- a/packages/tests/src/plugins/plugin-helpers.ts +++ b/packages/tests/src/plugins/plugin-helpers.ts @@ -285,7 +285,7 @@ describe('Test plugin helpers', function () { before(async function () { this.timeout(240000) - await servers[0].config.enableTranscoding() + await servers[0].config.enableTranscoding({ webVideo: true, hls: true, resolutions: 'max' }) const res = await servers[0].videos.quickUpload({ name: 'video1' }) videoUUID = res.uuid diff --git a/packages/tests/src/shared/live.ts b/packages/tests/src/shared/live.ts index f813525c371..f0a62d9cef8 100644 --- a/packages/tests/src/shared/live.ts +++ b/packages/tests/src/shared/live.ts @@ -1,5 +1,6 @@ /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ +import { getVideoStreamDimensionsInfo, getVideoStreamFPS } from '@peertube/peertube-ffmpeg' import { LiveVideo, VideoResolution, VideoStreamingPlaylistType } from '@peertube/peertube-models' import { sha1 } from '@peertube/peertube-node-utils' import { ObjectStorageCommand, PeerTubeServer } from '@peertube/peertube-server-commands' @@ -7,7 +8,6 @@ import { expect } from 'chai' import { pathExists } from 'fs-extra/esm' import { readdir } from 'fs/promises' import { join } from 'path' -import { getVideoStreamDimensionsInfo, getVideoStreamFPS } from '../../../ffmpeg/src/ffprobe.js' import { SQLCommand } from './sql-command.js' import { checkLiveSegmentHash, checkResolutionsInMasterPlaylist } from './streaming-playlists.js'