Add ability for plugins to specify scale filter

2 files changed, 85 insertions, 46 deletions

diff --git a/server/tests/fixtures/peertube-plugin-test-transcoding-one/main.js b/server/tests/fixtures/peertube-plugin-test-transcoding-one/main.js
index 366b827a9..59b136947 100644
--- a/server/tests/fixtures/peertube-plugin-test-transcoding-one/main.js
+++ b/server/tests/fixtures/peertube-plugin-test-transcoding-one/main.js
@@ -1,63 +1,84 @@
 async function register ({ transcodingManager }) {
 
+  // Output options
   {
-    const builder = () => {
-      return {
-        outputOptions: [
-          '-r 10'
-        ]
+    {
+      const builder = () => {
+        return {
+          outputOptions: [
+            '-r 10'
+          ]
+        }
       }
-    }
 
-    transcodingManager.addVODProfile('libx264', 'low-vod', builder)
-  }
+      transcodingManager.addVODProfile('libx264', 'low-vod', builder)
+    }
 
-  {
-    const builder = () => {
-      return {
-        videoFilters: [
-          'fps=10'
-        ]
+    {
+      const builder = (options) => {
+        return {
+          outputOptions: [
+            '-r:' + options.streamNum + ' 5'
+          ]
+        }
       }
-    }
 
-    transcodingManager.addVODProfile('libx264', 'video-filters-vod', builder)
+      transcodingManager.addLiveProfile('libx264', 'low-live', builder)
+    }
   }
 
+  // Input options
   {
-    const builder = () => {
-      return {
-        inputOptions: [
-          '-r 5'
-        ]
+    {
+      const builder = () => {
+        return {
+          inputOptions: [
+            '-r 5'
+          ]
+        }
       }
-    }
 
-    transcodingManager.addVODProfile('libx264', 'input-options-vod', builder)
-  }
+      transcodingManager.addVODProfile('libx264', 'input-options-vod', builder)
+    }
 
-  {
-    const builder = (options) => {
-      return {
-        outputOptions: [
-          '-r:' + options.streamNum + ' 5'
-        ]
+    {
+      const builder = () => {
+        return {
+          inputOptions: [
+            '-r 5'
+          ]
+        }
       }
-    }
 
-    transcodingManager.addLiveProfile('libx264', 'low-live', builder)
+      transcodingManager.addLiveProfile('libx264', 'input-options-live', builder)
+    }
   }
 
+  // Scale filters
   {
-    const builder = () => {
-      return {
-        inputOptions: [
-          '-r 5'
-        ]
+    {
+      const builder = () => {
+        return {
+          scaleFilter: {
+            name: 'Glomgold'
+          }
+        }
       }
+
+      transcodingManager.addVODProfile('libx264', 'bad-scale-vod', builder)
     }
 
-    transcodingManager.addLiveProfile('libx264', 'input-options-live', builder)
+    {
+      const builder = () => {
+        return {
+          scaleFilter: {
+            name: 'Flintheart'
+          }
+        }
+      }
+
+      transcodingManager.addLiveProfile('libx264', 'bad-scale-live', builder)
+    }
   }
 }
 
diff --git a/server/tests/plugins/plugin-transcoding.ts b/server/tests/plugins/plugin-transcoding.ts
index 415705ca1..b6dff930e 100644
--- a/server/tests/plugins/plugin-transcoding.ts
+++ b/server/tests/plugins/plugin-transcoding.ts
@@ -15,9 +15,11 @@ import {
   sendRTMPStreamInVideo,
   setAccessTokensToServers,
   setDefaultVideoChannel,
+  testFfmpegStreamError,
   uninstallPlugin,
   updateCustomSubConfig,
   uploadVideoAndGetId,
+  waitFfmpegUntilError,
   waitJobs,
   waitUntilLivePublished
 } from '../../../shared/extra-utils'
@@ -119,8 +121,8 @@ describe('Test transcoding plugins', function () {
       const res = await getConfig(server.url)
       const config = res.body as ServerConfig
 
-      expect(config.transcoding.availableProfiles).to.have.members([ 'default', 'low-vod', 'video-filters-vod', 'input-options-vod' ])
-      expect(config.live.transcoding.availableProfiles).to.have.members([ 'default', 'low-live', 'input-options-live' ])
+      expect(config.transcoding.availableProfiles).to.have.members([ 'default', 'low-vod', 'input-options-vod', 'bad-scale-vod' ])
+      expect(config.live.transcoding.availableProfiles).to.have.members([ 'default', 'low-live', 'input-options-live', 'bad-scale-live' ])
     })
 
     it('Should not use the plugin profile if not chosen by the admin', async function () {
@@ -143,26 +145,31 @@ describe('Test transcoding plugins', function () {
       await checkVideoFPS(videoUUID, 'below', 12)
     })
 
-    it('Should apply video filters in vod profile', async function () {
+    it('Should apply input options in vod profile', async function () {
       this.timeout(120000)
 
-      await updateConf(server, 'video-filters-vod', 'default')
+      await updateConf(server, 'input-options-vod', 'default')
 
       const videoUUID = (await uploadVideoAndGetId({ server, videoName: 'video' })).uuid
       await waitJobs([ server ])
 
-      await checkVideoFPS(videoUUID, 'below', 12)
+      await checkVideoFPS(videoUUID, 'below', 6)
     })
 
-    it('Should apply input options in vod profile', async function () {
+    it('Should apply the scale filter in vod profile', async function () {
       this.timeout(120000)
 
-      await updateConf(server, 'input-options-vod', 'default')
+      await updateConf(server, 'bad-scale-vod', 'default')
 
       const videoUUID = (await uploadVideoAndGetId({ server, videoName: 'video' })).uuid
       await waitJobs([ server ])
 
-      await checkVideoFPS(videoUUID, 'below', 6)
+      // Transcoding failed
+      const res = await getVideo(server.url, videoUUID)
+      const video: VideoDetails = res.body
+
+      expect(video.files).to.have.lengthOf(1)
+      expect(video.streamingPlaylists).to.have.lengthOf(0)
     })
 
     it('Should not use the plugin profile if not chosen by the admin', async function () {
@@ -205,6 +212,17 @@ describe('Test transcoding plugins', function () {
       await checkLiveFPS(liveVideoId, 'below', 6)
     })
 
+    it('Should apply the scale filter name on live profile', async function () {
+      this.timeout(120000)
+
+      await updateConf(server, 'low-vod', 'bad-scale-live')
+
+      const liveVideoId = await createLiveWrapper(server)
+
+      const command = await sendRTMPStreamInVideo(server.url, server.accessToken, liveVideoId, 'video_short2.webm')
+      await testFfmpegStreamError(command, true)
+    })
+
     it('Should default to the default profile if the specified profile does not exist', async function () {
       this.timeout(120000)