2 files changed, 75 insertions, 2 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 5990ce1ce..366b827a9 100644
--- a/server/tests/fixtures/peertube-plugin-test-transcoding-one/main.js
+++ b/server/tests/fixtures/peertube-plugin-test-transcoding-one/main.js
@@ -13,6 +13,30 @@ async function register ({ transcodingManager }) {
   }
 
   {
+    const builder = () => {
+      return {
+        videoFilters: [
+          'fps=10'
+        ]
+      }
+    }
+
+    transcodingManager.addVODProfile('libx264', 'video-filters-vod', builder)
+  }
+
+  {
+    const builder = () => {
+      return {
+        inputOptions: [
+          '-r 5'
+        ]
+      }
+    }
+
+    transcodingManager.addVODProfile('libx264', 'input-options-vod', builder)
+  }
+
+  {
     const builder = (options) => {
       return {
         outputOptions: [
@@ -23,8 +47,21 @@ async function register ({ transcodingManager }) {
 
     transcodingManager.addLiveProfile('libx264', 'low-live', builder)
   }
+
+  {
+    const builder = () => {
+      return {
+        inputOptions: [
+          '-r 5'
+        ]
+      }
+    }
+
+    transcodingManager.addLiveProfile('libx264', 'input-options-live', builder)
+  }
 }
 
+
 async function unregister () {
   return
 }
diff --git a/server/tests/plugins/plugin-transcoding.ts b/server/tests/plugins/plugin-transcoding.ts
index ecea21e69..415705ca1 100644
--- a/server/tests/plugins/plugin-transcoding.ts
+++ b/server/tests/plugins/plugin-transcoding.ts
@@ -119,8 +119,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' ])
-      expect(config.live.transcoding.availableProfiles).to.have.members([ 'default', 'low-live' ])
+      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' ])
     })
 
     it('Should not use the plugin profile if not chosen by the admin', async function () {
@@ -143,6 +143,28 @@ describe('Test transcoding plugins', function () {
       await checkVideoFPS(videoUUID, 'below', 12)
     })
 
+    it('Should apply video filters in vod profile', async function () {
+      this.timeout(120000)
+
+      await updateConf(server, 'video-filters-vod', 'default')
+
+      const videoUUID = (await uploadVideoAndGetId({ server, videoName: 'video' })).uuid
+      await waitJobs([ server ])
+
+      await checkVideoFPS(videoUUID, 'below', 12)
+    })
+
+    it('Should apply input options in vod profile', async function () {
+      this.timeout(120000)
+
+      await updateConf(server, 'input-options-vod', 'default')
+
+      const videoUUID = (await uploadVideoAndGetId({ server, videoName: 'video' })).uuid
+      await waitJobs([ server ])
+
+      await checkVideoFPS(videoUUID, 'below', 6)
+    })
+
     it('Should not use the plugin profile if not chosen by the admin', async function () {
       this.timeout(120000)
 
@@ -169,6 +191,20 @@ describe('Test transcoding plugins', function () {
       await checkLiveFPS(liveVideoId, 'below', 12)
     })
 
+    it('Should apply the input options on live profile', async function () {
+      this.timeout(120000)
+
+      await updateConf(server, 'low-vod', 'input-options-live')
+
+      const liveVideoId = await createLiveWrapper(server)
+
+      await sendRTMPStreamInVideo(server.url, server.accessToken, liveVideoId, 'video_short2.webm')
+      await waitUntilLivePublished(server.url, server.accessToken, liveVideoId)
+      await waitJobs([ server ])
+
+      await checkLiveFPS(liveVideoId, 'below', 6)
+    })
+
     it('Should default to the default profile if the specified profile does not exist', async function () {
       this.timeout(120000)