Save

Chocobozzz · Aug 13, 2024 · 7f6957f · 7f6957f
1 parent 1122e27
commit 7f6957f
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,13 +1,13 @@
 /* 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'
 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'