Try to cache video_high_bitrate_1080p in travis

.travis.yml

@@ -14,7 +14,10 @@ addons:
       - g++-4.9
   postgresql: "9.4"
 
-cache: yarn
+cache:
+  directories:
+    - $HOME/.cache/yarn
+    - $HOME/fixtures
 
 sudo: false
 

server/tests/api/videos/video-transcoder.ts

@@ -4,8 +4,8 @@ import * as chai from 'chai'
 import 'mocha'
 import { omit } from 'lodash'
 import * as ffmpeg from 'fluent-ffmpeg'
-import { VideoDetails, VideoState, getMaxBitrate, VideoResolution } from '../../../../shared/models/videos'
-import { getVideoFileFPS, audio, getVideoFileBitrate, getVideoFileResolution } 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,
@@ -20,9 +20,9 @@ import {
   uploadVideo,
   webtorrentAdd
 } from '../../utils'
-import { join, basename } from 'path'
+import { join } from 'path'
 import { waitJobs } from '../../utils/server/jobs'
-import { remove } from 'fs-extra'
+import { pathExists } from 'fs-extra'
 import { VIDEO_TRANSCODING_FPS } from '../../../../server/initializers/constants'
 
 const expect = chai.expect
@@ -283,11 +283,14 @@ describe('Test video transcoding', function () {
     }
   })
 
-  const tempFixturePath = buildAbsoluteFixturePath('video_high_bitrate_1080p.mp4')
+  const tempFixturePath = buildAbsoluteFixturePath('video_high_bitrate_1080p.mp4', true)
   it('Should respect maximum bitrate values', async function () {
     this.timeout(160000)
 
     {
+      const exists = await pathExists(tempFixturePath)
+      if (!exists) {
+
         // Generate a random, high bitrate video on the fly, so we don't have to include
         // a large file in the repo. The video needs to have a certain minimum length so
         // that FFmpeg properly applies bitrate limits.
@@ -302,14 +305,16 @@ describe('Test video transcoding', function () {
             .on('end', res)
             .run()
         })
+      }
 
       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: basename(tempFixturePath)
+      fixture: tempFixturePath
     }
 
     await uploadVideo(servers[1].url, servers[1].accessToken, videoAttributes)
@@ -331,11 +336,9 @@ describe('Test video transcoding', function () {
         expect(bitrate).to.be.below(getMaxBitrate(resolution2.videoFileResolution, fps, VIDEO_TRANSCODING_FPS))
       }
     }
-    }
   })
 
   after(async function () {
-    remove(tempFixturePath)
     killallServers(servers)
   })
 })

server/tests/utils/miscs/miscs.ts

@@ -51,11 +51,13 @@ async function testImage (url: string, imageName: string, imagePath: string, ext
   expect(data.length).to.be.below(maxLength)
 }
 
-function buildAbsoluteFixturePath (path: string) {
+function buildAbsoluteFixturePath (path: string, customTravisPath = false) {
   if (isAbsolute(path)) {
     return path
   }
 
+  if (customTravisPath && process.env.TRAVIS) return join(process.env.HOME, 'fixtures', path)
+
   return join(__dirname, '..', '..', 'fixtures', path)
 }
 

shared/models/videos/video-resolution.enum.ts

@@ -34,24 +34,24 @@ export function getTargetBitrate (resolution: VideoResolution, fps: number,
       // quality according to Google Live Encoder: 2,250 - 6,000 Kbps
       // Quality according to YouTube Video Info: 2634 Kbps
       return 2600 * 1000
-    } else {
+    }
+
     // quality according to Google Live Encoder: 1,500 - 4,000 Kbps
     // Quality according to YouTube Video Info: 1752 Kbps
     return 1750 * 1000
-    }
   case VideoResolution.H_1080P: // fallthrough
   default:
     if (fps === fpsTranscodingConstants.MAX) {
       // quality according to Google Live Encoder: 3000 - 6000 Kbps
       // Quality according to YouTube Video Info: 4387 Kbps
       return 4400 * 1000
-    } else {
+    }
+
     // quality according to Google Live Encoder: 3000 - 6000 Kbps
     // Quality according to YouTube Video Info: 3277 Kbps
     return 3300 * 1000
   }
 }
-}
 
 /**
  * The maximum bitrate we expect to see on a transcoded video in bytes per second.