import 'mocha'
import * as chai from 'chai'
import { omit } from 'lodash'
-import { join } from 'path'
-import { HttpStatusCode } from '@shared/core-utils'
+import { getMaxBitrate, getMinLimitBitrate } from '@shared/core-utils'
import {
buildAbsoluteFixturePath,
cleanupTests,
+ createMultipleServers,
doubleFollow,
- flushAndRunMultipleServers,
generateHighBitrateVideo,
generateVideoWithFramerate,
makeGetRequest,
- ServerInfo,
+ PeerTubeServer,
setAccessTokensToServers,
waitJobs,
webtorrentAdd
} from '@shared/extra-utils'
-import { getMaxBitrate, VideoResolution, VideoState } from '@shared/models'
-import { VIDEO_TRANSCODING_FPS } from '../../../../server/initializers/constants'
+import { HttpStatusCode, VideoState } from '@shared/models'
import {
canDoQuickTranscode,
getAudioStream,
const expect = chai.expect
-function updateConfigForTranscoding (server: ServerInfo) {
- return server.configCommand.updateCustomSubConfig({
+function updateConfigForTranscoding (server: PeerTubeServer) {
+ return server.config.updateCustomSubConfig({
newConfig: {
transcoding: {
enabled: true,
webtorrent: { enabled: true },
resolutions: {
'0p': false,
+ '144p': true,
'240p': true,
'360p': true,
'480p': true,
}
describe('Test video transcoding', function () {
- let servers: ServerInfo[] = []
+ let servers: PeerTubeServer[] = []
let video4k: string
before(async function () {
this.timeout(30_000)
// Run servers
- servers = await flushAndRunMultipleServers(2)
+ servers = await createMultipleServers(2)
await setAccessTokensToServers(servers)
description: 'my super description for server 1',
fixture: 'video_short.webm'
}
- await servers[0].videosCommand.upload({ attributes })
+ await servers[0].videos.upload({ attributes })
await waitJobs(servers)
for (const server of servers) {
- const { data } = await server.videosCommand.list()
+ const { data } = await server.videos.list()
const video = data[0]
- const videoDetails = await server.videosCommand.get({ id: video.id })
+ const videoDetails = await server.videos.get({ id: video.id })
expect(videoDetails.files).to.have.lengthOf(1)
const magnetUri = videoDetails.files[0].magnetUri
description: 'my super description for server 2',
fixture: 'video_short.webm'
}
- await servers[1].videosCommand.upload({ attributes })
+ await servers[1].videos.upload({ attributes })
await waitJobs(servers)
for (const server of servers) {
- const { data } = await server.videosCommand.list()
+ const { data } = await server.videos.list()
const video = data.find(v => v.name === attributes.name)
- const videoDetails = await server.videosCommand.get({ id: video.id })
+ 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/)
fixture: 'video_short1.webm',
waitTranscoding: true
}
- const { uuid } = await servers[1].videosCommand.upload({ attributes })
+ const { uuid } = await servers[1].videos.upload({ attributes })
const videoId = uuid
// Should be in transcode state
- const body = await servers[1].videosCommand.get({ id: videoId })
+ const body = await servers[1].videos.get({ id: videoId })
expect(body.name).to.equal('waiting video')
expect(body.state.id).to.equal(VideoState.TO_TRANSCODE)
expect(body.state.label).to.equal('To transcode')
{
// Should have my video
- const { data } = await servers[1].videosCommand.listMyVideos()
+ const { data } = await servers[1].videos.listMyVideos()
const videoToFindInMine = data.find(v => v.name === attributes.name)
expect(videoToFindInMine).not.to.be.undefined
expect(videoToFindInMine.state.id).to.equal(VideoState.TO_TRANSCODE)
{
// Should not list this video
- const { data } = await servers[1].videosCommand.list()
+ const { data } = await servers[1].videos.list()
const videoToFindInList = data.find(v => v.name === attributes.name)
expect(videoToFindInList).to.be.undefined
}
// Server 1 should not have the video yet
- await servers[0].videosCommand.get({ id: videoId, expectedStatus: HttpStatusCode.NOT_FOUND_404 })
+ await servers[0].videos.get({ id: videoId, expectedStatus: HttpStatusCode.NOT_FOUND_404 })
}
await waitJobs(servers)
for (const server of servers) {
- const { data } = await server.videosCommand.list()
+ const { data } = await server.videos.list()
const videoToFind = data.find(v => v.name === 'waiting video')
expect(videoToFind).not.to.be.undefined
- const videoDetails = await server.videosCommand.get({ id: videoToFind.id })
+ const videoDetails = await server.videos.get({ id: videoToFind.id })
expect(videoDetails.state.id).to.equal(VideoState.PUBLISHED)
expect(videoDetails.state.label).to.equal('Published')
it('Should accept and transcode additional extensions', async function () {
this.timeout(300_000)
- let tempFixturePath: string
-
- {
- tempFixturePath = await generateHighBitrateVideo()
-
- const bitrate = await getVideoFileBitrate(tempFixturePath)
- expect(bitrate).to.be.above(getMaxBitrate(VideoResolution.H_1080P, 25, VIDEO_TRANSCODING_FPS))
- }
-
for (const fixture of [ 'video_short.mkv', 'video_short.avi' ]) {
const attributes = {
name: fixture,
fixture
}
- await servers[1].videosCommand.upload({ attributes })
+ await servers[1].videos.upload({ attributes })
await waitJobs(servers)
for (const server of servers) {
- const { data } = await server.videosCommand.list()
+ const { data } = await server.videos.list()
const video = data.find(v => v.name === attributes.name)
- const videoDetails = await server.videosCommand.get({ id: video.id })
- expect(videoDetails.files).to.have.lengthOf(4)
+ const videoDetails = await server.videos.get({ id: video.id })
+ expect(videoDetails.files).to.have.lengthOf(5)
const magnetUri = videoDetails.files[0].magnetUri
expect(magnetUri).to.contain('.mp4')
fixture: 'video_short_4k.mp4'
}
- const { uuid } = await servers[1].videosCommand.upload({ attributes })
+ const { uuid } = await servers[1].videos.upload({ attributes })
video4k = uuid
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.videosCommand.get({ id: video4k })
+ const videoDetails = await server.videos.get({ id: video4k })
expect(videoDetails.files).to.have.lengthOf(resolutions.length)
for (const r of resolutions) {
name: 'mp3_256k',
fixture: 'video_short_mp3_256k.mp4'
}
- await servers[1].videosCommand.upload({ attributes })
+ await servers[1].videos.upload({ attributes })
await waitJobs(servers)
for (const server of servers) {
- const { data } = await server.videosCommand.list()
+ const { data } = await server.videos.list()
const video = data.find(v => v.name === attributes.name)
- const videoDetails = await server.videosCommand.get({ id: video.id })
+ const videoDetails = await server.videos.get({ id: video.id })
- expect(videoDetails.files).to.have.lengthOf(4)
+ expect(videoDetails.files).to.have.lengthOf(5)
- const path = servers[1].serversCommand.buildDirectory(join('videos', video.uuid + '-240.mp4'))
+ const file = videoDetails.files.find(f => f.resolution.id === 240)
+ const path = servers[1].servers.buildWebTorrentFilePath(file.fileUrl)
const probe = await getAudioStream(path)
if (probe.audioStream) {
name: 'no_audio',
fixture: 'video_short_no_audio.mp4'
}
- await servers[1].videosCommand.upload({ attributes })
+ await servers[1].videos.upload({ attributes })
await waitJobs(servers)
for (const server of servers) {
- const { data } = await server.videosCommand.list()
+ const { data } = await server.videos.list()
const video = data.find(v => v.name === attributes.name)
- const videoDetails = await server.videosCommand.get({ id: video.id })
+ const videoDetails = await server.videos.get({ id: video.id })
+
+ const file = videoDetails.files.find(f => f.resolution.id === 240)
+ const path = servers[1].servers.buildWebTorrentFilePath(file.fileUrl)
- expect(videoDetails.files).to.have.lengthOf(4)
- const path = servers[1].serversCommand.buildDirectory(join('videos', video.uuid + '-240.mp4'))
const probe = await getAudioStream(path)
expect(probe).to.not.have.property('audioStream')
}
name: 'untouched_audio',
fixture: 'video_short.mp4'
}
- await servers[1].videosCommand.upload({ attributes })
+ await servers[1].videos.upload({ attributes })
await waitJobs(servers)
for (const server of servers) {
- const { data } = await server.videosCommand.list()
+ const { data } = await server.videos.list()
const video = data.find(v => v.name === attributes.name)
- const videoDetails = await server.videosCommand.get({ id: video.id })
+ 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)
- const path = servers[1].serversCommand.buildDirectory(join('videos', video.uuid + '-240.mp4'))
+
+ const file = videoDetails.files.find(f => f.resolution.id === 240)
+ const path = servers[1].servers.buildWebTorrentFilePath(file.fileUrl)
const videoProbe = await getAudioStream(path)
function runSuite (mode: 'legacy' | 'resumable') {
before(async function () {
- await servers[1].configCommand.updateCustomSubConfig({
+ await servers[1].config.updateCustomSubConfig({
newConfig: {
transcoding: {
hls: { enabled: true },
webtorrent: { enabled: true },
resolutions: {
'0p': false,
+ '144p': false,
'240p': false,
'360p': false,
'480p': false,
this.timeout(60_000)
const attributes = { name: 'audio_with_preview', previewfile: 'preview.jpg', fixture: 'sample.ogg' }
- await servers[1].videosCommand.upload({ attributes, mode })
+ await servers[1].videos.upload({ attributes, mode })
await waitJobs(servers)
for (const server of servers) {
- const { data } = await server.videosCommand.list()
+ const { data } = await server.videos.list()
const video = data.find(v => v.name === 'audio_with_preview')
- const videoDetails = await server.videosCommand.get({ id: video.id })
+ const videoDetails = await server.videos.get({ id: video.id })
expect(videoDetails.files).to.have.lengthOf(1)
- await makeGetRequest({ url: server.url, path: videoDetails.thumbnailPath, statusCodeExpected: HttpStatusCode.OK_200 })
- await makeGetRequest({ url: server.url, path: videoDetails.previewPath, statusCodeExpected: HttpStatusCode.OK_200 })
+ await makeGetRequest({ url: server.url, path: videoDetails.thumbnailPath, expectedStatus: HttpStatusCode.OK_200 })
+ await makeGetRequest({ url: server.url, path: videoDetails.previewPath, expectedStatus: HttpStatusCode.OK_200 })
const magnetUri = videoDetails.files[0].magnetUri
expect(magnetUri).to.contain('.mp4')
this.timeout(60_000)
const attributes = { name: 'audio_without_preview', fixture: 'sample.ogg' }
- await servers[1].videosCommand.upload({ attributes, mode })
+ await servers[1].videos.upload({ attributes, mode })
await waitJobs(servers)
for (const server of servers) {
- const { data } = await server.videosCommand.list()
+ const { data } = await server.videos.list()
const video = data.find(v => v.name === 'audio_without_preview')
- const videoDetails = await server.videosCommand.get({ id: video.id })
+ const videoDetails = await server.videos.get({ id: video.id })
expect(videoDetails.files).to.have.lengthOf(1)
- await makeGetRequest({ url: server.url, path: videoDetails.thumbnailPath, statusCodeExpected: HttpStatusCode.OK_200 })
- await makeGetRequest({ url: server.url, path: videoDetails.previewPath, statusCodeExpected: HttpStatusCode.OK_200 })
+ await makeGetRequest({ url: server.url, path: videoDetails.thumbnailPath, expectedStatus: HttpStatusCode.OK_200 })
+ await makeGetRequest({ url: server.url, path: videoDetails.previewPath, expectedStatus: HttpStatusCode.OK_200 })
const magnetUri = videoDetails.files[0].magnetUri
expect(magnetUri).to.contain('.mp4')
it('Should upload an audio file and create an audio version only', async function () {
this.timeout(60_000)
- await servers[1].configCommand.updateCustomSubConfig({
+ await servers[1].config.updateCustomSubConfig({
newConfig: {
transcoding: {
hls: { enabled: true },
webtorrent: { enabled: true },
resolutions: {
'0p': true,
+ '144p': false,
'240p': false,
'360p': false
}
})
const attributes = { name: 'audio_with_preview', previewfile: 'preview.jpg', fixture: 'sample.ogg' }
- const { id } = await servers[1].videosCommand.upload({ attributes, mode })
+ const { id } = await servers[1].videos.upload({ attributes, mode })
await waitJobs(servers)
for (const server of servers) {
- const videoDetails = await server.videosCommand.get({ id })
+ const videoDetails = await server.videos.get({ id })
for (const files of [ videoDetails.files, videoDetails.streamingPlaylists[0].files ]) {
expect(files).to.have.lengthOf(2)
description: 'my super 30fps description for server 2',
fixture: '60fps_720p_small.mp4'
}
- await servers[1].videosCommand.upload({ attributes })
+ await servers[1].videos.upload({ attributes })
await waitJobs(servers)
for (const server of servers) {
- const { data } = await server.videosCommand.list()
+ const { data } = await server.videos.list()
const video = data.find(v => v.name === attributes.name)
- const videoDetails = await server.videosCommand.get({ id: video.id })
+ 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' ]) {
- const path = servers[1].serversCommand.buildDirectory(join('videos', video.uuid + '-' + resolution + '.mp4'))
+ 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)
expect(fps).to.be.below(31)
}
- const path = servers[1].serversCommand.buildDirectory(join('videos', video.uuid + '-720.mp4'))
+ const file = videoDetails.files.find(f => f.resolution.id === 720)
+ const path = servers[1].servers.buildWebTorrentFilePath(file.fileUrl)
const fps = await getVideoFileFPS(path)
expect(fps).to.be.above(58).and.below(62)
fixture: tempFixturePath
}
- await servers[1].videosCommand.upload({ attributes })
+ await servers[1].videos.upload({ attributes })
await waitJobs(servers)
for (const server of servers) {
- const { data } = await server.videosCommand.list()
+ const { data } = await server.videos.list()
- const video = data.find(v => v.name === attributes.name)
+ const { id } = data.find(v => v.name === attributes.name)
+ const video = await server.videos.get({ id })
{
- const path = servers[1].serversCommand.buildDirectory(join('videos', video.uuid + '-240.mp4'))
+ const file = video.files.find(f => f.resolution.id === 240)
+ const path = servers[1].servers.buildWebTorrentFilePath(file.fileUrl)
const fps = await getVideoFileFPS(path)
expect(fps).to.be.equal(25)
}
{
- const path = servers[1].serversCommand.buildDirectory(join('videos', video.uuid + '-720.mp4'))
+ const file = video.files.find(f => f.resolution.id === 720)
+ const path = servers[1].servers.buildWebTorrentFilePath(file.fileUrl)
const fps = await getVideoFileFPS(path)
expect(fps).to.be.equal(59)
}
})
describe('Bitrate control', function () {
+
it('Should respect maximum bitrate values', async function () {
this.timeout(160_000)
- let tempFixturePath: string
-
- {
- tempFixturePath = await generateHighBitrateVideo()
-
- const bitrate = await getVideoFileBitrate(tempFixturePath)
- expect(bitrate).to.be.above(getMaxBitrate(VideoResolution.H_1080P, 25, VIDEO_TRANSCODING_FPS))
- }
+ const tempFixturePath = await generateHighBitrateVideo()
const attributes = {
name: 'high bitrate video',
fixture: tempFixturePath
}
- await servers[1].videosCommand.upload({ attributes })
+ await servers[1].videos.upload({ attributes })
await waitJobs(servers)
for (const server of servers) {
- const { data } = await server.videosCommand.list()
+ const { data } = await server.videos.list()
- const video = data.find(v => v.name === attributes.name)
+ const { id } = data.find(v => v.name === attributes.name)
+ const video = await server.videos.get({ id })
- for (const resolution of [ '240', '360', '480', '720', '1080' ]) {
- const path = servers[1].serversCommand.buildDirectory(join('videos', video.uuid + '-' + resolution + '.mp4'))
+ for (const resolution of [ 240, 360, 480, 720, 1080 ]) {
+ 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 resolution2 = await getVideoFileResolution(path)
+ const dataResolution = await getVideoFileResolution(path)
- expect(resolution2.videoFileResolution.toString()).to.equal(resolution)
- expect(bitrate).to.be.below(getMaxBitrate(resolution2.videoFileResolution, fps, VIDEO_TRANSCODING_FPS))
+ expect(resolution).to.equal(resolution)
+
+ const maxBitrate = getMaxBitrate({ ...dataResolution, fps })
+ expect(bitrate).to.be.below(maxBitrate)
}
}
})
- 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,
hls: { enabled: true }
}
}
- await servers[1].configCommand.updateCustomSubConfig({ newConfig })
+ await servers[1].config.updateCustomSubConfig({ newConfig })
const attributes = {
name: 'low bitrate',
fixture: 'low-bitrate.mp4'
}
- const { uuid } = await servers[1].videosCommand.upload({ attributes })
+ const { id } = await servers[1].videos.upload({ attributes })
await waitJobs(servers)
+ const video = await servers[1].videos.get({ id })
+
const resolutions = [ 240, 360, 480, 720, 1080 ]
for (const r of resolutions) {
- const path = `videos/${uuid}-${r}.mp4`
- const size = await servers[1].serversCommand.getServerFileSize(path)
- expect(size, `${path} not below ${60_000}`).to.be.below(60_000)
+ const file = video.files.find(f => f.resolution.id === r)
+
+ const path = servers[1].servers.buildWebTorrentFilePath(file.fileUrl)
+ const bitrate = await getVideoFileBitrate(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)
}
})
})
it('Should provide valid ffprobe data', async function () {
this.timeout(160_000)
- const videoUUID = (await servers[1].videosCommand.quickUpload({ name: 'ffprobe data' })).uuid
+ const videoUUID = (await servers[1].videos.quickUpload({ name: 'ffprobe data' })).uuid
await waitJobs(servers)
{
- const path = servers[1].serversCommand.buildDirectory(join('videos', videoUUID + '-240.mp4'))
+ 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)
// expected format properties
}
for (const server of servers) {
- const videoDetails = await server.videosCommand.get({ id: videoUUID })
+ const videoDetails = await server.videos.get({ id: videoUUID })
const videoFiles = videoDetails.files
.concat(videoDetails.streamingPlaylists[0].files)
- expect(videoFiles).to.have.lengthOf(8)
+ expect(videoFiles).to.have.lengthOf(10)
for (const file of videoFiles) {
expect(file.metadata).to.be.undefined
expect(file.metadataUrl).to.contain(servers[1].url)
expect(file.metadataUrl).to.contain(videoUUID)
- const metadata = await server.videosCommand.getFileMetadata({ url: file.metadataUrl })
+ const metadata = await server.videos.getFileMetadata({ url: file.metadataUrl })
expect(metadata).to.have.nested.property('format.size')
}
}
describe('Transcoding job queue', function () {
it('Should have the appropriate priorities for transcoding jobs', async function () {
- const body = await servers[1].jobsCommand.getJobsList({
+ 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))) {
projects / github / Chocobozzz / PeerTube.git / blobdiff