Change how we handle resolution

It was an enum before, now we just use video height

4 files changed, 83 insertions, 4 deletions

diff --git a/server/helpers/custom-validators/videos.ts b/server/helpers/custom-validators/videos.ts
index 2eb021ae7..a31aca019 100644
--- a/server/helpers/custom-validators/videos.ts
+++ b/server/helpers/custom-validators/videos.ts
@@ -8,8 +8,7 @@ import {
   VIDEO_CATEGORIES,
   VIDEO_LICENCES,
   VIDEO_LANGUAGES,
-  VIDEO_RATE_TYPES,
-  VIDEO_FILE_RESOLUTIONS
+  VIDEO_RATE_TYPES
 } from '../../initializers'
 import { isUserUsernameValid } from './users'
 import { isArray, exists } from './misc'
@@ -128,7 +127,7 @@ function isVideoFileSizeValid (value: string) {
 }
 
 function isVideoFileResolutionValid (value: string) {
-  return VIDEO_FILE_RESOLUTIONS[value] !== undefined
+  return exists(value) && validator.isInt(value + '')
 }
 
 function isVideoFileExtnameValid (value: string) {
diff --git a/server/helpers/ffmpeg-utils.ts b/server/helpers/ffmpeg-utils.ts
new file mode 100644
index 000000000..c35125ec1
--- /dev/null
+++ b/server/helpers/ffmpeg-utils.ts
@@ -0,0 +1,79 @@
+import * as Promise from 'bluebird'
+import * as ffmpeg from 'fluent-ffmpeg'
+
+import { CONFIG } from '../initializers'
+import { VideoResolution } from '../../shared/models/videos/video-resolution.enum'
+
+function getVideoFileHeight (path: string) {
+  return new Promise<number>((res, rej) => {
+    ffmpeg.ffprobe(path, (err, metadata) => {
+      if (err) return rej(err)
+
+      const videoStream = metadata.streams.find(s => s.codec_type === 'video')
+      return res(videoStream.height)
+    })
+  })
+}
+
+function getDurationFromVideoFile (path: string) {
+  return new Promise<number>((res, rej) => {
+    ffmpeg.ffprobe(path, (err, metadata) => {
+      if (err) return rej(err)
+
+      return res(Math.floor(metadata.format.duration))
+    })
+  })
+}
+
+function generateImageFromVideoFile (fromPath: string, folder: string, imageName: string, size?: string) {
+  const options = {
+    filename: imageName,
+    count: 1,
+    folder
+  }
+
+  if (size !== undefined) {
+    options['size'] = size
+  }
+
+  return new Promise<string>((res, rej) => {
+    ffmpeg(fromPath)
+      .on('error', rej)
+      .on('end', () => res(imageName))
+      .thumbnail(options)
+  })
+}
+
+type TranscodeOptions = {
+  inputPath: string
+  outputPath: string
+  resolution?: VideoResolution
+}
+
+function transcode (options: TranscodeOptions) {
+  return new Promise<void>((res, rej) => {
+    let command = ffmpeg(options.inputPath)
+                    .output(options.outputPath)
+                    .videoCodec('libx264')
+                    .outputOption('-threads ' + CONFIG.TRANSCODING.THREADS)
+                    .outputOption('-movflags faststart')
+
+    if (options.resolution !== undefined) {
+      const size = `${options.resolution}x?` // '720x?' for example
+      command = command.size(size)
+    }
+
+    command.on('error', rej)
+           .on('end', res)
+           .run()
+  })
+}
+
+// ---------------------------------------------------------------------------
+
+export {
+  getVideoFileHeight,
+  getDurationFromVideoFile,
+  generateImageFromVideoFile,
+  transcode
+}
diff --git a/server/helpers/index.ts b/server/helpers/index.ts
index 78215fe10..846bd796f 100644
--- a/server/helpers/index.ts
+++ b/server/helpers/index.ts
@@ -1,6 +1,7 @@
 export * from './core-utils'
 export * from './logger'
 export * from './custom-validators'
+export * from './ffmpeg-utils'
 export * from './database-utils'
 export * from './peertube-crypto'
 export * from './requests'
diff --git a/server/helpers/utils.ts b/server/helpers/utils.ts
index b74442ab0..3317dddc3 100644
--- a/server/helpers/utils.ts
+++ b/server/helpers/utils.ts
@@ -61,7 +61,7 @@ function computeResolutionsToTranscode (videoFileHeight: number) {
   ]
 
   for (const resolution of resolutions) {
-    if (configResolutions[resolution.toString()] === true && videoFileHeight >= resolution) {
+    if (configResolutions[resolution.toString()] === true && videoFileHeight > resolution) {
       resolutionsEnabled.push(resolution)
     }
   }