i18n-labelText labelText="Allow additional extensions"
>
<ng-container ngProjectAs="description">
- <span i18n>Allows users to upload .mkv, .mov, .avi, .wmv, .flv, .f4v, .3g2, .3gp, .mts, m2ts, .mxf, or .nut videos.</span>
+ <span i18n>Allows users to upload .mkv, .mov, .avi, .wmv, .flv, .f4v, .3g2, .3gp, .mts, .m2ts, .mxf, or .nut videos.</span>
</ng-container>
</my-peertube-checkbox>
</div>
<ng-template pTemplate="body" let-expanded="expanded" let-videoImport>
<tr>
- <td class="expand-cell">
- <span *ngIf="videoImport.error" class="expander" [pRowToggler]="videoImport" i18n-ngbTooltip ngbTooltip="See the error">
+ <td class="expand-cell c-hand" [pRowToggler]="videoImport" i18n-ngbTooltip ngbTooltip="See the error" placement="top-left" container="body">
+ <span *ngIf="videoImport.error" class="expander">
<i [ngClass]="expanded ? 'glyphicon glyphicon-menu-down' : 'glyphicon glyphicon-menu-right'"></i>
</span>
</td>
</td>
<td>
- <span class="badge" [ngClass]="getVideoImportStateClass(videoImport.state)">
+ <span class="badge" [ngClass]="getVideoImportStateClass(videoImport.state.id)">
{{ videoImport.state.label }}
</span>
</td>
import { objectConverter } from '../../helpers/core-utils'
import { isSignupAllowed, isSignupAllowedForCurrentIP } from '../../helpers/signup'
import { getServerCommit } from '../../helpers/utils'
+import { getEnabledResolutions } from '../../lib/video-transcoding'
import { CONFIG, isEmailEnabled, reloadConfig } from '../../initializers/config'
import { CONSTRAINTS_FIELDS, DEFAULT_THEME_NAME, PEERTUBE_VERSION } from '../../initializers/constants'
import { ClientHtml } from '../../lib/client-html'
}))
}
-function getEnabledResolutions (type: 'vod' | 'live') {
- const transcoding = type === 'vod'
- ? CONFIG.TRANSCODING
- : CONFIG.LIVE.TRANSCODING
-
- return Object.keys(transcoding.RESOLUTIONS)
- .filter(key => transcoding.ENABLED && transcoding.RESOLUTIONS[key] === true)
- .map(r => parseInt(r, 10))
-}
-
function getRegisteredPlugins () {
return PluginManager.Instance.getRegisteredPlugins()
.map(p => ({
export {
configRouter,
- getEnabledResolutions,
getRegisteredPlugins,
getRegisteredThemes
}
} catch (err) {
logger.info('Cannot fetch information from import for URL %s.', targetUrl, { err })
- return res.status(HttpStatusCode.BAD_REQUEST_400).json({
- error: 'Cannot fetch remote information of this URL.'
- }).end()
+ return res.status(HttpStatusCode.BAD_REQUEST_400)
+ .json({
+ error: 'Cannot fetch remote information of this URL.'
+ })
}
const video = buildVideo(res.locals.videoChannel.id, body, youtubeDLInfo)
videoImportId: videoImport.id,
generateThumbnail: !thumbnailModel,
generatePreview: !previewModel,
- fileExt: youtubeDLInfo.fileExt
- ? `.${youtubeDLInfo.fileExt}`
- : '.mp4'
+ fileExt: `.${youtubeDLInfo.ext || 'mp4'}`,
+ mergeExt: youtubeDLInfo.mergeExt ? `.${youtubeDLInfo.mergeExt}` : ''
}
await JobQueue.Instance.createJobWithPromise({ type: 'video-import', payload })
import { HttpNodeinfoDiasporaSoftwareNsSchema20 } from '../../shared/models/nodeinfo'
import { join } from 'path'
import { root } from '../helpers/core-utils'
+import { getEnabledResolutions } from '../lib/video-transcoding'
import { CONFIG, isEmailEnabled } from '../initializers/config'
import { getPreview, getVideoCaption } from './lazy-static'
import { VideoStreamingPlaylistType } from '@shared/models/videos/video-streaming-playlist.type'
import { MVideoFile, MVideoFullLight } from '@server/types/models'
import { getTorrentFilePath, getVideoFilePath } from '@server/lib/video-paths'
import { getThemeOrDefault } from '../lib/plugins/theme-utils'
-import { getEnabledResolutions, getRegisteredPlugins, getRegisteredThemes } from '@server/controllers/api/config'
+import { getRegisteredPlugins, getRegisteredThemes } from '@server/controllers/api/config'
import { HttpStatusCode } from '@shared/core-utils/miscs/http-error-codes'
import { serveIndexHTML } from '@server/lib/client-html'
import { CONSTRAINTS_FIELDS, VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES } from '../initializers/constants'
import { logger } from './logger'
import { generateVideoImportTmpPath } from './utils'
+import { getEnabledResolutions } from '../lib/video-transcoding'
import { join } from 'path'
import { peertubeTruncate, root } from './core-utils'
import { ensureDir, remove, writeFile } from 'fs-extra'
import { createWriteStream } from 'fs'
import { CONFIG } from '@server/initializers/config'
import { HttpStatusCode } from '../../shared/core-utils/miscs/http-error-codes'
+import { VideoResolution } from '../../shared/models/videos'
export type YoutubeDLInfo = {
name?: string
nsfw?: boolean
tags?: string[]
thumbnailUrl?: string
- fileExt?: string
+ ext?: string
+ mergeExt?: string
originallyPublishedAt?: Date
}
}
args = wrapWithProxyOptions(args)
+ args = [ '-f', getYoutubeDLVideoFormat() ].concat(args)
safeGetYoutubeDL()
.then(youtubeDL => {
youtubeDL.getInfo(url, args, processOptions, (err, info) => {
if (err) return rej(err)
if (info.is_live === true) return rej(new Error('Cannot download a live streaming.'))
+ if (info.format_id?.includes('+')) {
+ // this is a merge format and its extension will be appended
+ if (info.ext === 'mp4') {
+ info.mergeExt = 'mp4'
+ } else {
+ info.mergeExt = 'mkv'
+ }
+ }
const obj = buildVideoInfo(normalizeObject(info))
if (obj.name && obj.name.length < CONSTRAINTS_FIELDS.VIDEOS.NAME.min) obj.name += ' video'
})
}
-function downloadYoutubeDLVideo (url: string, extension: string, timeout: number) {
+function getYoutubeDLVideoFormat () {
+ /**
+ * list of format selectors in order or preference
+ * see https://github.com/ytdl-org/youtube-dl#format-selection
+ *
+ * case #1 asks for a mp4 using h264 (avc1) and the exact resolution in the hope
+ * of being able to do a "quick-transcode"
+ * case #2 is the first fallback. No "quick-transcode" means we can get anything else (like vp9)
+ * case #3 is the resolution-degraded equivalent of #1, and already a pretty safe fallback
+ *
+ * in any case we avoid AV1, see https://github.com/Chocobozzz/PeerTube/issues/3499
+ **/
+ const enabledResolutions = getEnabledResolutions('vod')
+ const resolution = enabledResolutions.length === 0
+ ? VideoResolution.H_720P
+ : Math.max(...enabledResolutions)
+
+ return [
+ `bestvideo[vcodec^=avc1][height=${resolution}]+bestaudio[ext=m4a]`, // case #1
+ `bestvideo[vcodec!*=av01][vcodec!*=vp9.2][height=${resolution}]+bestaudio`, // case #2
+ `bestvideo[vcodec^=avc1][height<=${resolution}]+bestaudio[ext=m4a]`, // case #3
+ `bestvideo[vcodec!*=av01][vcodec!*=vp9.2]+bestaudio`,
+ 'best[vcodec!*=av01][vcodec!*=vp9.2]' // case fallback
+ ].join('/')
+}
+
+function downloadYoutubeDLVideo (url: string, extension: string, timeout: number, mergeExtension?: string) {
const path = generateVideoImportTmpPath(url, extension)
+ const finalPath = mergeExtension ? path.replace(new RegExp(`${extension}$`), mergeExtension) : path
let timer
- logger.info('Importing youtubeDL video %s to %s', url, path)
+ logger.info('Importing youtubeDL video %s to %s', url, finalPath)
- let options = [ '-f', 'bestvideo[ext=mp4]+bestaudio[ext=m4a]/best', '-o', path ]
+ let options = [ '-f', getYoutubeDLVideoFormat(), '-o', path ]
options = wrapWithProxyOptions(options)
if (process.env.FFMPEG_PATH) {
return rej(err)
}
- return res(path)
+ return res(finalPath)
})
timer = setTimeout(() => {
export {
updateYoutubeDLBinary,
+ getYoutubeDLVideoFormat,
downloadYoutubeDLVideo,
getYoutubeDLSubs,
getYoutubeDLInfo,
tags: getTags(obj.tags),
thumbnailUrl: obj.thumbnail || undefined,
originallyPublishedAt: buildOriginallyPublishedAt(obj),
- fileExt: obj.ext
+ ext: obj.ext,
+ mergeExt: obj.mergeExt
}
}
generatePreview: payload.generatePreview
}
- return processFile(() => downloadYoutubeDLVideo(videoImport.targetUrl, payload.fileExt, VIDEO_IMPORT_TIMEOUT), videoImport, options)
+ return processFile(
+ () => downloadYoutubeDLVideo(videoImport.targetUrl, payload.fileExt, VIDEO_IMPORT_TIMEOUT, payload.mergeExt),
+ videoImport,
+ options
+ )
}
async function getVideoImportOrDie (videoImportId: number) {
})
}
+function getEnabledResolutions (type: 'vod' | 'live') {
+ const transcoding = type === 'vod'
+ ? CONFIG.TRANSCODING
+ : CONFIG.LIVE.TRANSCODING
+
+ return Object.keys(transcoding.RESOLUTIONS)
+ .filter(key => transcoding.ENABLED && transcoding.RESOLUTIONS[key] === true)
+ .map(r => parseInt(r, 10))
+}
+
// ---------------------------------------------------------------------------
export {
generateHlsPlaylistFromTS,
optimizeOriginalVideofile,
transcodeNewResolution,
- mergeAudioVideofile
+ mergeAudioVideofile,
+ getEnabledResolutions
}
// ---------------------------------------------------------------------------
if (areValidationErrors(req, res)) return cleanUpReqFiles(req)
- if (req.body.targetUrl && CONFIG.IMPORT.VIDEOS.HTTP.ENABLED !== true) {
+ if (CONFIG.IMPORT.VIDEOS.HTTP.ENABLED !== true && req.body.targetUrl) {
cleanUpReqFiles(req)
return res.status(HttpStatusCode.CONFLICT_409)
.json({ error: 'HTTP import is not enabled on this instance.' })
listVideoCaptions,
ServerInfo,
setAccessTokensToServers,
- testCaptionFile
+ testCaptionFile,
+ updateCustomSubConfig
} from '../../../../shared/extra-utils'
import { areHttpImportTestsDisabled, testImage } from '../../../../shared/extra-utils/miscs/miscs'
import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
-import { getMagnetURI, getMyVideoImports, getYoutubeVideoUrl, importVideo } from '../../../../shared/extra-utils/videos/video-imports'
-import { VideoCaption, VideoDetails, VideoImport, VideoPrivacy } from '../../../../shared/models/videos'
+import {
+ getMagnetURI,
+ getMyVideoImports,
+ getYoutubeHDRVideoUrl,
+ getYoutubeVideoUrl,
+ importVideo
+} from '../../../../shared/extra-utils/videos/video-imports'
+import { VideoCaption, VideoDetails, VideoImport, VideoPrivacy, VideoResolution } from '../../../../shared/models/videos'
const expect = chai.expect
}
before(async function () {
- this.timeout(30000)
+ this.timeout(30_000)
// Run servers
servers = await flushAndRunMultipleServers(2)
})
it('Should import videos on server 1', async function () {
- this.timeout(60000)
+ this.timeout(60_000)
const baseAttributes = {
channelId: channelIdServer1,
})
it('Should have the video listed on the two instances', async function () {
- this.timeout(120000)
+ this.timeout(120_000)
await waitJobs(servers)
})
it('Should import a video on server 2 with some fields', async function () {
- this.timeout(60000)
+ this.timeout(60_000)
const attributes = {
targetUrl: getYoutubeVideoUrl(),
})
it('Should have the videos listed on the two instances', async function () {
- this.timeout(120000)
+ this.timeout(120_000)
await waitJobs(servers)
})
it('Should import a video that will be transcoded', async function () {
- this.timeout(120000)
+ this.timeout(120_000)
const attributes = {
name: 'transcoded video',
}
})
+ it('Should import no HDR version on a HDR video', async function () {
+ this.timeout(120_000)
+
+ const config = {
+ transcoding: {
+ enabled: true,
+ resolutions: {
+ '240p': false,
+ '360p': false,
+ '480p': false,
+ '720p': false,
+ '1080p': true, // the resulting resolution shouldn't be higher than this, and not vp9.2/av01
+ '1440p': false,
+ '2160p': false
+ },
+ webtorrent: { enabled: true },
+ hls: { enabled: false }
+ },
+ import: {
+ videos: {
+ http: {
+ enabled: true
+ },
+ torrent: {
+ enabled: true
+ }
+ }
+ }
+ }
+ await updateCustomSubConfig(servers[0].url, servers[0].accessToken, config)
+
+ const attributes = {
+ name: 'hdr video',
+ targetUrl: getYoutubeHDRVideoUrl(),
+ channelId: channelIdServer1,
+ privacy: VideoPrivacy.PUBLIC
+ }
+ const res1 = await importVideo(servers[0].url, servers[0].accessToken, attributes)
+ const videoUUID = res1.body.video.uuid
+
+ await waitJobs(servers)
+
+ // test resolution
+ const res2 = await getVideo(servers[0].url, videoUUID)
+ const video: VideoDetails = res2.body
+ expect(video.name).to.equal('hdr video')
+ const maxResolution = Math.max.apply(Math, video.files.map(function (o) { return o.resolution.id }))
+ expect(maxResolution, 'expected max resolution not met').to.equals(VideoResolution.H_1080P)
+ })
+
after(async function () {
await cleanupTests(servers)
})
let servers: ServerInfo[] = []
before(async function () {
- this.timeout(30000)
+ this.timeout(30_000)
// Run servers
servers = await flushAndRunMultipleServers(2)
})
it('Should not transcode video on server 1', async function () {
- this.timeout(60000)
+ this.timeout(60_000)
const videoAttributes = {
name: 'my super name for server 1',
})
it('Should transcode video on server 2', async function () {
- this.timeout(120000)
+ this.timeout(120_000)
const videoAttributes = {
name: 'my super name for server 2',
})
it('Should transcode high bit rate mp3 to proper bit rate', async function () {
- this.timeout(60000)
+ this.timeout(60_000)
const videoAttributes = {
name: 'mp3_256k',
})
it('Should transcode video with no audio and have no audio itself', async function () {
- this.timeout(60000)
+ this.timeout(60_000)
const videoAttributes = {
name: 'no_audio',
})
it('Should leave the audio untouched, but properly transcode the video', async function () {
- this.timeout(60000)
+ this.timeout(60_000)
const videoAttributes = {
name: 'untouched_audio',
})
it('Should transcode a 60 FPS video', async function () {
- this.timeout(60000)
+ this.timeout(60_000)
const videoAttributes = {
name: 'my super 30fps name for server 2',
})
it('Should wait for transcoding before publishing the video', async function () {
- this.timeout(160000)
+ this.timeout(160_000)
{
// Upload the video, but wait transcoding
})
it('Should respect maximum bitrate values', async function () {
- this.timeout(160000)
+ this.timeout(160_000)
let tempFixturePath: string
})
it('Should accept and transcode additional extensions', async function () {
- this.timeout(300000)
+ this.timeout(300_000)
let tempFixturePath: string
})
it('Should correctly detect if quick transcode is possible', async function () {
- this.timeout(10000)
+ this.timeout(10_000)
expect(await canDoQuickTranscode(buildAbsoluteFixturePath('video_short.mp4'))).to.be.true
expect(await canDoQuickTranscode(buildAbsoluteFixturePath('video_short.webm'))).to.be.false
})
it('Should merge an audio file with the preview file', async function () {
- this.timeout(60000)
+ this.timeout(60_000)
const videoAttributesArg = { name: 'audio_with_preview', previewfile: 'preview.jpg', fixture: 'sample.ogg' }
await uploadVideo(servers[1].url, servers[1].accessToken, videoAttributesArg)
})
it('Should upload an audio file and choose a default background image', async function () {
- this.timeout(60000)
+ this.timeout(60_000)
const videoAttributesArg = { name: 'audio_without_preview', fixture: 'sample.ogg' }
await uploadVideo(servers[1].url, servers[1].accessToken, videoAttributesArg)
})
it('Should downscale to the closest divisor standard framerate', async function () {
- this.timeout(200000)
+ this.timeout(200_000)
let tempFixturePath: string
})
it('Should not transcode to an higher bitrate than the original file', async function () {
- this.timeout(160000)
+ this.timeout(160_000)
const config = {
transcoding: {
const resolutions = [ 240, 360, 480, 720, 1080 ]
for (const r of resolutions) {
- expect(await getServerFileSize(servers[1], `videos/${videoUUID}-${r}.mp4`)).to.be.below(60000)
+ expect(await getServerFileSize(servers[1], `videos/${videoUUID}-${r}.mp4`)).to.be.below(60_000)
}
})
it('Should provide valid ffprobe data', async function () {
- this.timeout(160000)
+ this.timeout(160_000)
const videoUUID = (await uploadVideoAndGetId({ server: servers[1], videoName: 'ffprobe data' })).uuid
await waitJobs(servers)
})
it('Should transcode a 4k video', async function () {
- this.timeout(200000)
+ this.timeout(200_000)
const videoAttributes = {
name: '4k video',
import { accessSync, constants } from 'fs'
import { remove } from 'fs-extra'
import { sha256 } from '../helpers/core-utils'
-import { buildOriginallyPublishedAt, safeGetYoutubeDL } from '../helpers/youtube-dl'
+import { buildOriginallyPublishedAt, getYoutubeDLVideoFormat, safeGetYoutubeDL } from '../helpers/youtube-dl'
import { buildCommonVideoOptions, buildVideoAttributesFromCommander, getLogger, getServerCredentials } from './cli'
type UserInfo = {
log.info('Downloading video "%s"...', videoInfo.title)
- const options = [ '-f', 'bestvideo[ext=mp4]+bestaudio[ext=m4a]/best', ...command.args, '-o', path ]
+ const options = [ '-f', getYoutubeDLVideoFormat(), ...command.args, '-o', path ]
try {
const youtubeDL = await safeGetYoutubeDL()
youtubeDL.exec(videoInfo.url, options, processOptions, async (err, output) => {
*
* Indicates that the request could not be processed because of conflict in the request,
* such as an edit conflict between multiple simultaneous updates.
+ *
+ * @see HttpStatusCode.UNPROCESSABLE_ENTITY_422 to denote a disabled feature
*/
CONFLICT_409 = 409,
* Official Documentation @ https://tools.ietf.org/html/rfc2518#section-10.3
*
* The request was well-formed but was unable to be followed due to semantic errors.
+ * The server understands the content type of the request entity (hence a 415 (Unsupported Media Type) status code is inappropriate),
+ * and the syntax of the request entity is correct (thus a 400 (Bad Request) status code is inappropriate) but was unable to process
+ * the contained instructions. For example, this error condition may occur if an JSON request body contains well-formed (i.e.,
+ * syntactically correct), but semantically erroneous, JSON instructions.
+ *
+ * Can also be used to denote disabled features (akin to disabled syntax).
*
* @see HttpStatusCode.UNSUPPORTED_MEDIA_TYPE_415 if the `Content-Type` was not supported.
* @see HttpStatusCode.BAD_REQUEST_400 if the request was not parsable (broken JSON, XML)
import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes'
function getYoutubeVideoUrl () {
- return 'http://www.youtube.com/watch?v=msX3jv1XdvM'
+ return 'https://www.youtube.com/watch?v=msX3jv1XdvM'
+}
+
+function getYoutubeHDRVideoUrl () {
+ /**
+ * The video is used to check format-selection correctness wrt. HDR,
+ * which brings its own set of oddities outside of a MediaSource.
+ * FIXME: refactor once HDR is supported at playback
+ *
+ * The video needs to have the following format_ids:
+ * (which you can check by using `youtube-dl <url> -F`):
+ * - 303 (1080p webm vp9)
+ * - 299 (1080p mp4 avc1)
+ * - 335 (1080p webm vp9.2 HDR)
+ *
+ * 15 jan. 2021: TEST VIDEO NOT CURRENTLY PROVIDING
+ * - 400 (1080p mp4 av01)
+ * - 315 (2160p webm vp9 HDR)
+ * - 337 (2160p webm vp9.2 HDR)
+ * - 401 (2160p mp4 av01 HDR)
+ */
+ return 'https://www.youtube.com/watch?v=MSJ25EqI19c'
}
function getMagnetURI () {
export {
getBadVideoUrl,
getYoutubeVideoUrl,
+ getYoutubeHDRVideoUrl,
importVideo,
getMagnetURI,
getMyVideoImports,
generatePreview: boolean
fileExt?: string
+ mergeExt?: string
}
export type VideoImportTorrentPayload = {
type: VideoImportTorrentPayloadType
projects / github / Chocobozzz / PeerTube.git / commitdiff
