From b2977eecb8eb5d599df0c6a7ab99a437a6a969c7 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 3 Aug 2018 17:00:19 +0200 Subject: [PATCH] Fix fps federation --- .../app/+my-account/my-account.component.ts | 2 +- client/src/app/core/server/server.service.ts | 2 +- .../videos/+video-edit/video-add.component.ts | 2 +- .../+video-edit/video-import.component.ts | 3 +- server/controllers/api/config.ts | 2 +- server/helpers/activitypub.ts | 1 + .../custom-validators/activitypub/videos.ts | 3 +- .../lib/activitypub/process/process-update.ts | 2 +- server/lib/activitypub/videos.ts | 3 +- server/models/video/video.ts | 3 +- server/tests/api/videos/video-transcoder.ts | 164 ++++++++++-------- .../activitypub/objects/common-objects.ts | 2 + shared/models/server/server-config.model.ts | 3 +- shared/models/videos/video-import.model.ts | 2 +- 14 files changed, 104 insertions(+), 90 deletions(-) diff --git a/client/src/app/+my-account/my-account.component.ts b/client/src/app/+my-account/my-account.component.ts index a8f5f8f31..6e29cdd83 100644 --- a/client/src/app/+my-account/my-account.component.ts +++ b/client/src/app/+my-account/my-account.component.ts @@ -12,6 +12,6 @@ export class MyAccountComponent { ) {} isVideoImportEnabled () { - return this.serverService.getConfig().import.video.http.enabled + return this.serverService.getConfig().import.videos.http.enabled } } diff --git a/client/src/app/core/server/server.service.ts b/client/src/app/core/server/server.service.ts index e2254b7b5..ab317f0aa 100644 --- a/client/src/app/core/server/server.service.ts +++ b/client/src/app/core/server/server.service.ts @@ -70,7 +70,7 @@ export class ServerService { videoQuota: -1 }, import: { - video: { + videos: { http: { enabled: false } diff --git a/client/src/app/videos/+video-edit/video-add.component.ts b/client/src/app/videos/+video-edit/video-add.component.ts index d38a53db9..69b364ddd 100644 --- a/client/src/app/videos/+video-edit/video-add.component.ts +++ b/client/src/app/videos/+video-edit/video-add.component.ts @@ -33,6 +33,6 @@ export class VideoAddComponent implements CanComponentDeactivate { } isVideoImportEnabled () { - return this.serverService.getConfig().import.video.http.enabled + return this.serverService.getConfig().import.videos.http.enabled } } diff --git a/client/src/app/videos/+video-edit/video-import.component.ts b/client/src/app/videos/+video-edit/video-import.component.ts index b1e8e0205..5f14efd54 100644 --- a/client/src/app/videos/+video-edit/video-import.component.ts +++ b/client/src/app/videos/+video-edit/video-import.component.ts @@ -145,8 +145,7 @@ export class VideoImportComponent extends FormReactive implements OnInit, CanCom this.loadingBar.complete() this.notificationsService.success(this.i18n('Success'), this.i18n('Video to import updated.')) - // TODO: route to imports list - // this.router.navigate([ '/videos/watch', this.video.uuid ]) + this.router.navigate([ '/my-account', 'video-imports' ]) }, err => { diff --git a/server/controllers/api/config.ts b/server/controllers/api/config.ts index acbeab70b..950a1498e 100644 --- a/server/controllers/api/config.ts +++ b/server/controllers/api/config.ts @@ -66,7 +66,7 @@ async function getConfig (req: express.Request, res: express.Response, next: exp enabledResolutions }, import: { - video: { + videos: { http: { enabled: CONFIG.IMPORT.VIDEOS.HTTP.ENABLED } diff --git a/server/helpers/activitypub.ts b/server/helpers/activitypub.ts index d710f5c97..a9de11fb0 100644 --- a/server/helpers/activitypub.ts +++ b/server/helpers/activitypub.ts @@ -24,6 +24,7 @@ function activityPubContextify (data: T) { views: 'http://schema.org/Number', stats: 'http://schema.org/Number', size: 'http://schema.org/Number', + fps: 'http://schema.org/Number', commentsEnabled: 'http://schema.org/Boolean', waitTranscoding: 'http://schema.org/Boolean', support: 'http://schema.org/Text' diff --git a/server/helpers/custom-validators/activitypub/videos.ts b/server/helpers/custom-validators/activitypub/videos.ts index c6a350236..b8075f3c7 100644 --- a/server/helpers/custom-validators/activitypub/videos.ts +++ b/server/helpers/custom-validators/activitypub/videos.ts @@ -153,7 +153,8 @@ function isRemoteVideoUrlValid (url: any) { ACTIVITY_PUB.URL_MIME_TYPES.VIDEO.indexOf(url.mimeType) !== -1 && isActivityPubUrlValid(url.href) && validator.isInt(url.width + '', { min: 0 }) && - validator.isInt(url.size + '', { min: 0 }) + validator.isInt(url.size + '', { min: 0 }) && + (!url.fps || validator.isInt(url.fps + '', { min: 0 })) ) || ( ACTIVITY_PUB.URL_MIME_TYPES.TORRENT.indexOf(url.mimeType) !== -1 && diff --git a/server/lib/activitypub/process/process-update.ts b/server/lib/activitypub/process/process-update.ts index 62791ff1b..82b661a03 100644 --- a/server/lib/activitypub/process/process-update.ts +++ b/server/lib/activitypub/process/process-update.ts @@ -108,7 +108,7 @@ async function processUpdateVideo (actor: ActorModel, activity: ActivityUpdate) await Promise.all(videoFileDestroyTasks) const videoFileAttributes = videoFileActivityUrlToDBAttributes(videoInstance, videoObject) - const tasks = videoFileAttributes.map(f => VideoFileModel.create(f)) + const tasks = videoFileAttributes.map(f => VideoFileModel.create(f, sequelizeOptions)) await Promise.all(tasks) // Update Tags diff --git a/server/lib/activitypub/videos.ts b/server/lib/activitypub/videos.ts index b3fbf88d0..e2f46bd02 100644 --- a/server/lib/activitypub/videos.ts +++ b/server/lib/activitypub/videos.ts @@ -162,7 +162,8 @@ function videoFileActivityUrlToDBAttributes (videoCreated: VideoModel, videoObje infoHash: parsed.infoHash, resolution: fileUrl.width, size: fileUrl.size, - videoId: videoCreated.id + videoId: videoCreated.id, + fps: fileUrl.fps } as VideoFileModel attributes.push(attribute) } diff --git a/server/models/video/video.ts b/server/models/video/video.ts index 67711b102..39fe21007 100644 --- a/server/models/video/video.ts +++ b/server/models/video/video.ts @@ -1355,7 +1355,8 @@ export class VideoModel extends Model { mimeType: VIDEO_EXT_MIMETYPE[file.extname], href: this.getVideoFileUrl(file, baseUrlHttp), width: file.resolution, - size: file.size + size: file.size, + fps: file.fps }) url.push({ diff --git a/server/tests/api/videos/video-transcoder.ts b/server/tests/api/videos/video-transcoder.ts index 4a39ee3e3..0f83d4d57 100644 --- a/server/tests/api/videos/video-transcoder.ts +++ b/server/tests/api/videos/video-transcoder.ts @@ -35,6 +35,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 +51,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 +81,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 +111,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(ffmpeg, 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 +143,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(ffmpeg, path) + expect(probe).to.not.have.property('audioStream') + } }) it('Should leave the audio untouched, but properly transcode the video', async function () { @@ -158,22 +168,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) - 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) + 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) + } } }) @@ -189,38 +201,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') + 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) + } + + const path = join(root(), 'test2', 'videos', video.uuid + '-720.mp4') const fps = await getVideoFileFPS(path) - expect(fps).to.be.below(31) + expect(fps).to.be.above(58).and.below(62) } - - const path = join(root(), 'test2', 'videos', video.uuid + '-720.mp4') - const fps = await getVideoFileFPS(path) - - expect(fps).to.be.above(58).and.below(62) }) it('Should wait 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 = { diff --git a/shared/models/activitypub/objects/common-objects.ts b/shared/models/activitypub/objects/common-objects.ts index 3127d0565..5b2b3adae 100644 --- a/shared/models/activitypub/objects/common-objects.ts +++ b/shared/models/activitypub/objects/common-objects.ts @@ -22,7 +22,9 @@ export interface ActivityUrlObject { mimeType: 'video/mp4' | 'video/webm' | 'application/x-bittorrent' | 'application/x-bittorrent;x-scheme-handler/magnet' href: string width: number + size?: number + fps?: number } export interface ActivityPubAttributedTo { diff --git a/shared/models/server/server-config.model.ts b/shared/models/server/server-config.model.ts index 38e1941d8..2cafedbbc 100644 --- a/shared/models/server/server-config.model.ts +++ b/shared/models/server/server-config.model.ts @@ -1,5 +1,4 @@ import { NSFWPolicyType } from '../videos/nsfw-policy.type' -import { CONFIG } from '../../../server/initializers' export interface ServerConfig { serverVersion: string @@ -25,7 +24,7 @@ export interface ServerConfig { } import: { - video: { + videos: { http: { enabled: boolean } diff --git a/shared/models/videos/video-import.model.ts b/shared/models/videos/video-import.model.ts index c8dea0246..a5c582c67 100644 --- a/shared/models/videos/video-import.model.ts +++ b/shared/models/videos/video-import.model.ts @@ -1,6 +1,6 @@ import { Video } from './video.model' import { VideoConstant } from './video-constant.model' -import { VideoImportState } from '../../index' +import { VideoImportState } from './video-import-state.enum' export interface VideoImport { id: number