From 3de5ae39e3d1fb7b37567b65e0a4e693e2ee6413 Mon Sep 17 00:00:00 2001
From: fkiefer <none@none>
Date: Thu, 2 Feb 2017 13:46:34 +0100
Subject: [PATCH] OO-2483 enable ".m4v" type videos
---
.../modules/video/ui/VideoAdminTranscodingController.java | 6 +++---
.../java/org/olat/repository/handlers/VideoHandler.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/olat/modules/video/ui/VideoAdminTranscodingController.java b/src/main/java/org/olat/modules/video/ui/VideoAdminTranscodingController.java
index cc67f036cb7..fb136155b46 100644
--- a/src/main/java/org/olat/modules/video/ui/VideoAdminTranscodingController.java
+++ b/src/main/java/org/olat/modules/video/ui/VideoAdminTranscodingController.java
@@ -137,9 +137,9 @@ public class VideoAdminTranscodingController extends FormBasicController {
for (OLATResource videoResource : nativeResolutions.keySet()) {
if (nativeResolutions.get(videoResource) >= fixresolution[i]) counter++;
}
- int Scount = successCount.get(fixresolution[i]) != null ? successCount.get(fixresolution[i]) : 0;
- int Fcount = failCount.get(fixresolution[i]) != null ? failCount.get(fixresolution[i]) : 0;
- TranscodingRow transcodingRow = new TranscodingRow(fixresolution[i], Scount, Fcount, counter, mayTranscode(fixresolution[i]));
+ int success = successCount.get(fixresolution[i]) != null ? successCount.get(fixresolution[i]) : 0;
+ int fails = failCount.get(fixresolution[i]) != null ? failCount.get(fixresolution[i]) : 0;
+ TranscodingRow transcodingRow = new TranscodingRow(fixresolution[i], success, fails, counter, mayTranscode(fixresolution[i]));
resolutions.add(transcodingRow);
}
if (resolutions != null){
diff --git a/src/main/java/org/olat/repository/handlers/VideoHandler.java b/src/main/java/org/olat/repository/handlers/VideoHandler.java
index 75587262be9..72880b1d36e 100644
--- a/src/main/java/org/olat/repository/handlers/VideoHandler.java
+++ b/src/main/java/org/olat/repository/handlers/VideoHandler.java
@@ -125,7 +125,7 @@ public class VideoHandler extends FileHandler {
long filesize = importFile.getSize();
VideoManager videoManager = CoreSpringFactory.getImpl(VideoManager.class);
- if (fileName.endsWith(".mp4")|| fileName.endsWith(".mov")) {
+ if (fileName.endsWith(".mp4") || fileName.endsWith(".mov") || fileName.endsWith(".m4v")) {
// 2a) import video from raw mp4 master video file
videoManager.importFromMasterFile(repoEntry, importFile);
--
GitLab