import 'mocha'
import * as chai from 'chai'
import { omit } from 'lodash'
-import { getMaxBitrate, getMinLimitBitrate } 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,
makeGetRequest,
PeerTubeServer,
setAccessTokensToServers,
waitJobs,
webtorrentAdd
} from '@shared/server-commands'
-import { HttpStatusCode, VideoState } from '@shared/models'
-import {
- canDoQuickTranscode,
- getAudioStream,
- getMetadataFromFile,
- getVideoFileBitrate,
- getVideoFileFPS,
- getVideoFileResolution
-} from '../../../helpers/ffprobe-utils'
const expect = chai.expect
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
}
})
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)
const file = video.files.find(f => f.resolution.id === r)
const path = servers[1].servers.buildWebTorrentFilePath(file.fileUrl)
- const bitrate = await getVideoFileBitrate(path)
+ const bitrate = await getVideoStreamBitrate(path)
const inputBitrate = 60_000
const limit = getMinLimitBitrate({ fps: 10, ratio: 1, resolution: r })
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)
+ const videoFiles = getAllFiles(videoDetails)
expect(videoFiles).to.have.lengthOf(10)
for (const file of videoFiles) {