import 'mocha'
import * as chai from 'chai'
import { omit } from 'lodash'
-import { getMaxBitrate } from '@shared/core-utils'
+import { canDoQuickTranscode } from '@server/helpers/ffmpeg'
+import { generateHighBitrateVideo, generateVideoWithFramerate, getAllFiles } from '@server/tests/shared'
+import { buildAbsoluteFixturePath, getMaxBitrate, getMinLimitBitrate } from '@shared/core-utils'
+import {
+ getAudioStream,
+ buildFileMetadata,
+ getVideoStreamBitrate,
+ getVideoStreamFPS,
+ getVideoStreamDimensionsInfo,
+ hasAudioStream
+} from '@shared/extra-utils'
+import { HttpStatusCode, VideoState } from '@shared/models'
import {
- buildAbsoluteFixturePath,
cleanupTests,
createMultipleServers,
doubleFollow,
- generateHighBitrateVideo,
- generateVideoWithFramerate,
- getFileSize,
makeGetRequest,
PeerTubeServer,
setAccessTokensToServers,
waitJobs,
webtorrentAdd
-} from '@shared/extra-utils'
-import { HttpStatusCode, VideoState } from '@shared/models'
-import {
- canDoQuickTranscode,
- getAudioStream,
- getMetadataFromFile,
- getVideoFileBitrate,
- getVideoFileFPS,
- getVideoFileResolution
-} from '../../../helpers/ffprobe-utils'
+} from '@shared/server-commands'
const expect = chai.expect
webtorrent: { enabled: true },
resolutions: {
'0p': false,
+ '144p': true,
'240p': true,
'360p': true,
'480p': true,
const video = data.find(v => v.name === attributes.name)
const videoDetails = await server.videos.get({ id: video.id })
- expect(videoDetails.files).to.have.lengthOf(4)
+ expect(videoDetails.files).to.have.lengthOf(5)
const magnetUri = videoDetails.files[0].magnetUri
expect(magnetUri).to.match(/\.mp4/)
const video = data.find(v => v.name === attributes.name)
const videoDetails = await server.videos.get({ id: video.id })
- expect(videoDetails.files).to.have.lengthOf(4)
+ expect(videoDetails.files).to.have.lengthOf(5)
const magnetUri = videoDetails.files[0].magnetUri
expect(magnetUri).to.contain('.mp4')
await waitJobs(servers)
- const resolutions = [ 240, 360, 480, 720, 1080, 1440, 2160 ]
+ const resolutions = [ 144, 240, 360, 480, 720, 1080, 1440, 2160 ]
for (const server of servers) {
const videoDetails = await server.videos.get({ id: video4k })
const video = data.find(v => v.name === attributes.name)
const videoDetails = await server.videos.get({ id: video.id })
- expect(videoDetails.files).to.have.lengthOf(4)
+ expect(videoDetails.files).to.have.lengthOf(5)
const file = videoDetails.files.find(f => f.resolution.id === 240)
const path = servers[1].servers.buildWebTorrentFilePath(file.fileUrl)
const file = videoDetails.files.find(f => f.resolution.id === 240)
const path = servers[1].servers.buildWebTorrentFilePath(file.fileUrl)
- const probe = await getAudioStream(path)
- expect(probe).to.not.have.property('audioStream')
+ expect(await hasAudioStream(path)).to.be.false
}
})
const video = data.find(v => v.name === attributes.name)
const videoDetails = await server.videos.get({ id: video.id })
- expect(videoDetails.files).to.have.lengthOf(4)
+ expect(videoDetails.files).to.have.lengthOf(5)
const fixturePath = buildAbsoluteFixturePath(attributes.fixture)
const fixtureVideoProbe = await getAudioStream(fixturePath)
webtorrent: { enabled: true },
resolutions: {
'0p': false,
+ '144p': false,
'240p': false,
'360p': false,
'480p': false,
webtorrent: { enabled: true },
resolutions: {
'0p': true,
+ '144p': false,
'240p': false,
'360p': false
}
const video = data.find(v => v.name === attributes.name)
const videoDetails = await server.videos.get({ id: video.id })
- expect(videoDetails.files).to.have.lengthOf(4)
+ expect(videoDetails.files).to.have.lengthOf(5)
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[4].fps).to.be.below(31)
- for (const resolution of [ 240, 360, 480 ]) {
+ for (const resolution of [ 144, 240, 360, 480 ]) {
const file = videoDetails.files.find(f => f.resolution.id === resolution)
const path = servers[1].servers.buildWebTorrentFilePath(file.fileUrl)
- const fps = await getVideoFileFPS(path)
+ const fps = await getVideoStreamFPS(path)
expect(fps).to.be.below(31)
}
const file = videoDetails.files.find(f => f.resolution.id === 720)
const path = servers[1].servers.buildWebTorrentFilePath(file.fileUrl)
- const fps = await getVideoFileFPS(path)
+ const fps = await getVideoStreamFPS(path)
expect(fps).to.be.above(58).and.below(62)
}
{
tempFixturePath = await generateVideoWithFramerate(59)
- const fps = await getVideoFileFPS(tempFixturePath)
+ const fps = await getVideoStreamFPS(tempFixturePath)
expect(fps).to.be.equal(59)
}
{
const file = video.files.find(f => f.resolution.id === 240)
const path = servers[1].servers.buildWebTorrentFilePath(file.fileUrl)
- const fps = await getVideoFileFPS(path)
+ const fps = await getVideoStreamFPS(path)
expect(fps).to.be.equal(25)
}
{
const file = video.files.find(f => f.resolution.id === 720)
const path = servers[1].servers.buildWebTorrentFilePath(file.fileUrl)
- const fps = await getVideoFileFPS(path)
+ const fps = await getVideoStreamFPS(path)
expect(fps).to.be.equal(59)
}
}
const file = video.files.find(f => f.resolution.id === resolution)
const path = servers[1].servers.buildWebTorrentFilePath(file.fileUrl)
- const bitrate = await getVideoFileBitrate(path)
- const fps = await getVideoFileFPS(path)
- const dataResolution = await getVideoFileResolution(path)
+ const bitrate = await getVideoStreamBitrate(path)
+ const fps = await getVideoStreamFPS(path)
+ const dataResolution = await getVideoStreamDimensionsInfo(path)
expect(resolution).to.equal(resolution)
}
})
- it('Should not transcode to an higher bitrate than the original file', async function () {
+ it('Should not transcode to an higher bitrate than the original file but above our low limit', async function () {
this.timeout(160_000)
const newConfig = {
transcoding: {
enabled: true,
resolutions: {
+ '144p': true,
'240p': true,
'360p': true,
'480p': true,
const file = video.files.find(f => f.resolution.id === r)
const path = servers[1].servers.buildWebTorrentFilePath(file.fileUrl)
- const size = await getFileSize(path)
- expect(size, `${path} not below ${60_000}`).to.be.below(60_000)
+ const bitrate = await getVideoStreamBitrate(path)
+
+ const inputBitrate = 60_000
+ const limit = getMinLimitBitrate({ fps: 10, ratio: 1, resolution: r })
+ let belowValue = Math.max(inputBitrate, limit)
+ belowValue += belowValue * 0.20 // Apply 20% margin because bitrate control is not very precise
+
+ expect(bitrate, `${path} not below ${limit}`).to.be.below(belowValue)
}
})
})
const video = await servers[1].videos.get({ id: videoUUID })
const file = video.files.find(f => f.resolution.id === 240)
const path = servers[1].servers.buildWebTorrentFilePath(file.fileUrl)
- const metadata = await getMetadataFromFile(path)
+ const metadata = await buildFileMetadata(path)
// expected format properties
for (const p of [
for (const server of servers) {
const videoDetails = await server.videos.get({ id: videoUUID })
- const videoFiles = videoDetails.files
- .concat(videoDetails.streamingPlaylists[0].files)
- expect(videoFiles).to.have.lengthOf(8)
+ const videoFiles = getAllFiles(videoDetails)
+ expect(videoFiles).to.have.lengthOf(10)
for (const file of videoFiles) {
expect(file.metadata).to.be.undefined
const body = await servers[1].jobs.list({
start: 0,
count: 100,
- sort: '-createdAt',
+ sort: 'createdAt',
jobType: 'video-transcoding'
})
const jobs = body.data
const transcodingJobs = jobs.filter(j => j.data.videoUUID === video4k)
- expect(transcodingJobs).to.have.lengthOf(14)
+ expect(transcodingJobs).to.have.lengthOf(16)
const hlsJobs = transcodingJobs.filter(j => j.data.type === 'new-resolution-to-hls')
const webtorrentJobs = transcodingJobs.filter(j => j.data.type === 'new-resolution-to-webtorrent')
const optimizeJobs = transcodingJobs.filter(j => j.data.type === 'optimize-to-webtorrent')
- expect(hlsJobs).to.have.lengthOf(7)
- expect(webtorrentJobs).to.have.lengthOf(6)
+ expect(hlsJobs).to.have.lengthOf(8)
+ expect(webtorrentJobs).to.have.lengthOf(7)
expect(optimizeJobs).to.have.lengthOf(1)
for (const j of optimizeJobs.concat(hlsJobs.concat(webtorrentJobs))) {