merging

2 files changed, 11 insertions, 2 deletions

diff --git a/src/server/DashUploadUtils.ts b/src/server/DashUploadUtils.ts
index d9b38c014..ff6b2381c 100644
--- a/src/server/DashUploadUtils.ts
+++ b/src/server/DashUploadUtils.ts
@@ -16,6 +16,7 @@ import { resolvedServerUrl } from "./server_Initialization";
 import { AcceptableMedia, Upload } from './SharedMediaTypes';
 import request = require('request-promise');
 const parse = require('pdf-parse');
+const ffmpeg = require("fluent-ffmpeg");
 const requestImageSize = require("../client/util/request-image-size");
 
 export enum SizeSuffix {
@@ -62,7 +63,7 @@ export namespace DashUploadUtils {
 
         const category = types[0];
         let format = `.${types[1]}`;
-        console.log(green(`Processing upload of file (${name}) with upload type (${type}) in category (${category}).`));
+        console.log(green(`Processing upload of file (${name}) and format (${format}) with upload type (${type}) in category (${category}).`));
 
         switch (category) {
             case "image":
@@ -71,6 +72,14 @@ export namespace DashUploadUtils {
                     return { source: file, result };
                 }
             case "video":
+                if (format.includes("x-matroska")) {
+                    await new Promise(res => ffmpeg(file.path)
+                        .videoCodec("copy") // this will copy the data instead of reencode it
+                        .save(file.path.replace(".mkv", ".mp4"))
+                        .on('end', res));
+                    file.path = file.path.replace(".mkv", ".mp4");
+                    format = ".mp4";
+                }
                 if (videoFormats.includes(format)) {
                     return MoveParsedFile(file, Directory.videos);
                 }
diff --git a/src/server/SharedMediaTypes.ts b/src/server/SharedMediaTypes.ts
index f1fe582e5..fdc65188f 100644
--- a/src/server/SharedMediaTypes.ts
+++ b/src/server/SharedMediaTypes.ts
@@ -8,7 +8,7 @@ export namespace AcceptableMedia {
     export const webps = [".webp"];
     export const tiffs = [".tiff"];
     export const imageFormats = [...pngs, ...jpgs, ...gifs, ...webps, ...tiffs];
-    export const videoFormats = [".mov", ".mp4", ".quicktime"];
+    export const videoFormats = [".mov", ".mp4", ".quicktime", ".mkv", ".x-matroska;codecs=avc1"];
     export const applicationFormats = [".pdf"];
     export const audioFormats = [".wav", ".mp3", ".mpeg", ".flac", ".au", ".aiff", ".m4a", ".webm"];
 }