X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fvideos%2Fvideo-transcoder.ts;h=eefd32ef81a34e0785a1b2709962542b3bacd1a6;hb=73471b1a52f242e86364ffb077ea6cadb3b07ae2;hp=4a39ee3e3ce204c098d4b822b937a1d70195103a;hpb=7160878c4a7650261e476f08d031ea71fe38bd34;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/api/videos/video-transcoder.ts b/server/tests/api/videos/video-transcoder.ts
index 4a39ee3e3..eefd32ef8 100644
--- a/server/tests/api/videos/video-transcoder.ts
+++ b/server/tests/api/videos/video-transcoder.ts
@@ -3,13 +3,13 @@
 import * as chai from 'chai'
 import 'mocha'
 import { omit } from 'lodash'
-import * as ffmpeg from 'fluent-ffmpeg'
-import { VideoDetails, VideoState } from '../../../../shared/models/videos'
-import { getVideoFileFPS, audio } from '../../../helpers/ffmpeg-utils'
+import { getMaxBitrate, VideoDetails, VideoResolution, VideoState } from '../../../../shared/models/videos'
+import { audio, getVideoFileBitrate, getVideoFileFPS, getVideoFileResolution } from '../../../helpers/ffmpeg-utils'
 import {
   buildAbsoluteFixturePath,
   doubleFollow,
   flushAndRunMultipleServers,
+  generateHighBitrateVideo,
   getMyVideos,
   getVideo,
   getVideosList,
@@ -19,9 +19,10 @@ import {
   setAccessTokensToServers,
   uploadVideo,
   webtorrentAdd
-} from '../../utils'
-import { join } from 'path'
-import { waitJobs } from '../../utils/server/jobs'
+} from '../../../../shared/utils'
+import { extname, join } from 'path'
+import { waitJobs } from '../../../../shared/utils/server/jobs'
+import { VIDEO_TRANSCODING_FPS } from '../../../../server/initializers/constants'
 
 const expect = chai.expect
 
@@ -35,6 +36,8 @@ describe('Test video transcoding', function () {
     servers = await flushAndRunMultipleServers(2)
 
     await setAccessTokensToServers(servers)
+
+    await doubleFollow(servers[0], servers[1])
   })
 
   it('Should not transcode video on server 1', async function () {
@@ -49,20 +52,22 @@ describe('Test video transcoding', function () {
 
     await waitJobs(servers)
 
-    const res = await getVideosList(servers[0].url)
-    const video = res.body.data[0]
+    for (const server of servers) {
+      const res = await getVideosList(server.url)
+      const video = res.body.data[ 0 ]
 
-    const res2 = await getVideo(servers[0].url, video.id)
-    const videoDetails = res2.body
-    expect(videoDetails.files).to.have.lengthOf(1)
+      const res2 = await getVideo(server.url, video.id)
+      const videoDetails = res2.body
+      expect(videoDetails.files).to.have.lengthOf(1)
 
-    const magnetUri = videoDetails.files[0].magnetUri
-    expect(magnetUri).to.match(/\.webm/)
+      const magnetUri = videoDetails.files[ 0 ].magnetUri
+      expect(magnetUri).to.match(/\.webm/)
 
-    const torrent = await webtorrentAdd(magnetUri)
-    expect(torrent.files).to.be.an('array')
-    expect(torrent.files.length).to.equal(1)
-    expect(torrent.files[0].path).match(/\.webm$/)
+      const torrent = await webtorrentAdd(magnetUri, true)
+      expect(torrent.files).to.be.an('array')
+      expect(torrent.files.length).to.equal(1)
+      expect(torrent.files[ 0 ].path).match(/\.webm$/)
+    }
   })
 
   it('Should transcode video on server 2', async function () {
@@ -77,21 +82,23 @@ describe('Test video transcoding', function () {
 
     await waitJobs(servers)
 
-    const res = await getVideosList(servers[1].url)
+    for (const server of servers) {
+      const res = await getVideosList(server.url)
 
-    const video = res.body.data[0]
-    const res2 = await getVideo(servers[1].url, video.id)
-    const videoDetails = res2.body
+      const video = res.body.data.find(v => v.name === videoAttributes.name)
+      const res2 = await getVideo(server.url, video.id)
+      const videoDetails = res2.body
 
-    expect(videoDetails.files).to.have.lengthOf(4)
+      expect(videoDetails.files).to.have.lengthOf(4)
 
-    const magnetUri = videoDetails.files[0].magnetUri
-    expect(magnetUri).to.match(/\.mp4/)
+      const magnetUri = videoDetails.files[ 0 ].magnetUri
+      expect(magnetUri).to.match(/\.mp4/)
 
-    const torrent = await webtorrentAdd(magnetUri)
-    expect(torrent.files).to.be.an('array')
-    expect(torrent.files.length).to.equal(1)
-    expect(torrent.files[0].path).match(/\.mp4$/)
+      const torrent = await webtorrentAdd(magnetUri, true)
+      expect(torrent.files).to.be.an('array')
+      expect(torrent.files.length).to.equal(1)
+      expect(torrent.files[ 0 ].path).match(/\.mp4$/)
+    }
   })
 
   it('Should transcode high bit rate mp3 to proper bit rate', async function () {
@@ -105,22 +112,24 @@ describe('Test video transcoding', function () {
 
     await waitJobs(servers)
 
-    const res = await getVideosList(servers[1].url)
+    for (const server of servers) {
+      const res = await getVideosList(server.url)
 
-    const video = res.body.data.find(v => v.name === videoAttributes.name)
-    const res2 = await getVideo(servers[1].url, video.id)
-    const videoDetails: VideoDetails = res2.body
+      const video = res.body.data.find(v => v.name === videoAttributes.name)
+      const res2 = await getVideo(server.url, video.id)
+      const videoDetails: VideoDetails = res2.body
 
-    expect(videoDetails.files).to.have.lengthOf(4)
+      expect(videoDetails.files).to.have.lengthOf(4)
 
-    const path = join(root(), 'test2', 'videos', video.uuid + '-240.mp4')
-    const probe = await audio.get(ffmpeg, path)
+      const path = join(root(), 'test2', 'videos', video.uuid + '-240.mp4')
+      const probe = await audio.get(path)
 
-    if (probe.audioStream) {
-      expect(probe.audioStream['codec_name']).to.be.equal('aac')
-      expect(probe.audioStream['bit_rate']).to.be.at.most(384 * 8000)
-    } else {
-      this.fail('Could not retrieve the audio stream on ' + probe.absolutePath)
+      if (probe.audioStream) {
+        expect(probe.audioStream[ 'codec_name' ]).to.be.equal('aac')
+        expect(probe.audioStream[ 'bit_rate' ]).to.be.at.most(384 * 8000)
+      } else {
+        this.fail('Could not retrieve the audio stream on ' + probe.absolutePath)
+      }
     }
   })
 
@@ -135,16 +144,18 @@ describe('Test video transcoding', function () {
 
     await waitJobs(servers)
 
-    const res = await getVideosList(servers[1].url)
+    for (const server of servers) {
+      const res = await getVideosList(server.url)
 
-    const video = res.body.data.find(v => v.name === videoAttributes.name)
-    const res2 = await getVideo(servers[1].url, video.id)
-    const videoDetails: VideoDetails = res2.body
+      const video = res.body.data.find(v => v.name === videoAttributes.name)
+      const res2 = await getVideo(server.url, video.id)
+      const videoDetails: VideoDetails = res2.body
 
-    expect(videoDetails.files).to.have.lengthOf(4)
-    const path = join(root(), 'test2', 'videos', video.uuid + '-240.mp4')
-    const probe = await audio.get(ffmpeg, path)
-    expect(probe).to.not.have.property('audioStream')
+      expect(videoDetails.files).to.have.lengthOf(4)
+      const path = join(root(), 'test2', 'videos', video.uuid + '-240.mp4')
+      const probe = await audio.get(path)
+      expect(probe).to.not.have.property('audioStream')
+    }
   })
 
   it('Should leave the audio untouched, but properly transcode the video', async function () {
@@ -158,22 +169,24 @@ describe('Test video transcoding', function () {
 
     await waitJobs(servers)
 
-    const res = await getVideosList(servers[1].url)
-
-    const video = res.body.data.find(v => v.name === videoAttributes.name)
-    const res2 = await getVideo(servers[1].url, video.id)
-    const videoDetails: VideoDetails = res2.body
-
-    expect(videoDetails.files).to.have.lengthOf(4)
-    const fixturePath = buildAbsoluteFixturePath(videoAttributes.fixture)
-    const fixtureVideoProbe = await audio.get(ffmpeg, fixturePath)
-    const path = join(root(), 'test2', 'videos', video.uuid + '-240.mp4')
-    const videoProbe = await audio.get(ffmpeg, path)
-    if (videoProbe.audioStream && fixtureVideoProbe.audioStream) {
-      const toOmit = [ 'max_bit_rate', 'duration', 'duration_ts', 'nb_frames', 'start_time', 'start_pts' ]
-      expect(omit(videoProbe.audioStream, toOmit)).to.be.deep.equal(omit(fixtureVideoProbe.audioStream, toOmit))
-    } else {
-      this.fail('Could not retrieve the audio stream on ' + videoProbe.absolutePath)
+    for (const server of servers) {
+      const res = await getVideosList(server.url)
+
+      const video = res.body.data.find(v => v.name === videoAttributes.name)
+      const res2 = await getVideo(server.url, video.id)
+      const videoDetails: VideoDetails = res2.body
+
+      expect(videoDetails.files).to.have.lengthOf(4)
+      const fixturePath = buildAbsoluteFixturePath(videoAttributes.fixture)
+      const fixtureVideoProbe = await audio.get(fixturePath)
+      const path = join(root(), 'test2', 'videos', video.uuid + '-240.mp4')
+      const videoProbe = await audio.get(path)
+      if (videoProbe.audioStream && fixtureVideoProbe.audioStream) {
+        const toOmit = [ 'max_bit_rate', 'duration', 'duration_ts', 'nb_frames', 'start_time', 'start_pts' ]
+        expect(omit(videoProbe.audioStream, toOmit)).to.be.deep.equal(omit(fixtureVideoProbe.audioStream, toOmit))
+      } else {
+        this.fail('Could not retrieve the audio stream on ' + videoProbe.absolutePath)
+      }
     }
   })
 
@@ -189,38 +202,36 @@ describe('Test video transcoding', function () {
 
     await waitJobs(servers)
 
-    const res = await getVideosList(servers[1].url)
+    for (const server of servers) {
+      const res = await getVideosList(server.url)
 
-    const video = res.body.data.find(v => v.name === videoAttributes.name)
-    const res2 = await getVideo(servers[1].url, video.id)
-    const videoDetails: VideoDetails = res2.body
+      const video = res.body.data.find(v => v.name === videoAttributes.name)
+      const res2 = await getVideo(server.url, video.id)
+      const videoDetails: VideoDetails = res2.body
 
-    expect(videoDetails.files).to.have.lengthOf(4)
-    expect(videoDetails.files[0].fps).to.be.above(58).and.below(62)
-    expect(videoDetails.files[1].fps).to.be.below(31)
-    expect(videoDetails.files[2].fps).to.be.below(31)
-    expect(videoDetails.files[3].fps).to.be.below(31)
+      expect(videoDetails.files).to.have.lengthOf(4)
+      expect(videoDetails.files[ 0 ].fps).to.be.above(58).and.below(62)
+      expect(videoDetails.files[ 1 ].fps).to.be.below(31)
+      expect(videoDetails.files[ 2 ].fps).to.be.below(31)
+      expect(videoDetails.files[ 3 ].fps).to.be.below(31)
 
-    for (const resolution of [ '240', '360', '480' ]) {
-      const path = join(root(), 'test2', 'videos', video.uuid + '-' + resolution + '.mp4')
-      const fps = await getVideoFileFPS(path)
+      for (const resolution of [ '240', '360', '480' ]) {
+        const path = join(root(), 'test2', 'videos', video.uuid + '-' + resolution + '.mp4')
+        const fps = await getVideoFileFPS(path)
 
-      expect(fps).to.be.below(31)
-    }
+        expect(fps).to.be.below(31)
+      }
 
-    const path = join(root(), 'test2', 'videos', video.uuid + '-720.mp4')
-    const fps = await getVideoFileFPS(path)
+      const path = join(root(), 'test2', 'videos', video.uuid + '-720.mp4')
+      const fps = await getVideoFileFPS(path)
 
-    expect(fps).to.be.above(58).and.below(62)
+      expect(fps).to.be.above(58).and.below(62)
+    }
   })
 
-  it('Should wait transcoding before publishing the video', async function () {
+  it('Should wait for transcoding before publishing the video', async function () {
     this.timeout(80000)
 
-    await doubleFollow(servers[0], servers[1])
-
-    await waitJobs(servers)
-
     {
       // Upload the video, but wait transcoding
       const videoAttributes = {
@@ -271,6 +282,73 @@ describe('Test video transcoding', function () {
     }
   })
 
+  it('Should respect maximum bitrate values', async function () {
+    this.timeout(160000)
+
+    let tempFixturePath: string
+
+    {
+      tempFixturePath = await generateHighBitrateVideo()
+
+      const bitrate = await getVideoFileBitrate(tempFixturePath)
+      expect(bitrate).to.be.above(getMaxBitrate(VideoResolution.H_1080P, 60, VIDEO_TRANSCODING_FPS))
+    }
+
+    const videoAttributes = {
+      name: 'high bitrate video',
+      description: 'high bitrate video',
+      fixture: tempFixturePath
+    }
+
+    await uploadVideo(servers[1].url, servers[1].accessToken, videoAttributes)
+
+    await waitJobs(servers)
+
+    for (const server of servers) {
+      const res = await getVideosList(server.url)
+
+      const video = res.body.data.find(v => v.name === videoAttributes.name)
+
+      for (const resolution of ['240', '360', '480', '720', '1080']) {
+        const path = join(root(), 'test2', 'videos', video.uuid + '-' + resolution + '.mp4')
+        const bitrate = await getVideoFileBitrate(path)
+        const fps = await getVideoFileFPS(path)
+        const resolution2 = await getVideoFileResolution(path)
+
+        expect(resolution2.videoFileResolution.toString()).to.equal(resolution)
+        expect(bitrate).to.be.below(getMaxBitrate(resolution2.videoFileResolution, fps, VIDEO_TRANSCODING_FPS))
+      }
+    }
+  })
+
+  it('Should accept and transcode additional extensions', async function () {
+    this.timeout(300000)
+
+    for (const fixture of [ 'video_short.mkv', 'video_short.avi' ]) {
+      const videoAttributes = {
+        name: fixture,
+        fixture
+      }
+
+      await uploadVideo(servers[ 1 ].url, servers[ 1 ].accessToken, videoAttributes)
+
+      await waitJobs(servers)
+
+      for (const server of servers) {
+        const res = await getVideosList(server.url)
+
+        const video = res.body.data.find(v => v.name === videoAttributes.name)
+        const res2 = await getVideo(server.url, video.id)
+        const videoDetails = res2.body
+
+        expect(videoDetails.files).to.have.lengthOf(4)
+
+        const magnetUri = videoDetails.files[ 0 ].magnetUri
+        expect(magnetUri).to.contain('.mp4')
+      }
+    }
+  })
+
   after(async function () {
     killallServers(servers)
   })