Skip to content
Snippets Groups Projects
Commit 3de5ae39 authored by fkiefer's avatar fkiefer
Browse files

OO-2483 enable ".m4v" type videos

parent 3073d341
No related branches found
No related tags found
No related merge requests found
...@@ -137,9 +137,9 @@ public class VideoAdminTranscodingController extends FormBasicController { ...@@ -137,9 +137,9 @@ public class VideoAdminTranscodingController extends FormBasicController {
for (OLATResource videoResource : nativeResolutions.keySet()) { for (OLATResource videoResource : nativeResolutions.keySet()) {
if (nativeResolutions.get(videoResource) >= fixresolution[i]) counter++; if (nativeResolutions.get(videoResource) >= fixresolution[i]) counter++;
} }
int Scount = successCount.get(fixresolution[i]) != null ? successCount.get(fixresolution[i]) : 0; int success = successCount.get(fixresolution[i]) != null ? successCount.get(fixresolution[i]) : 0;
int Fcount = failCount.get(fixresolution[i]) != null ? failCount.get(fixresolution[i]) : 0; int fails = failCount.get(fixresolution[i]) != null ? failCount.get(fixresolution[i]) : 0;
TranscodingRow transcodingRow = new TranscodingRow(fixresolution[i], Scount, Fcount, counter, mayTranscode(fixresolution[i])); TranscodingRow transcodingRow = new TranscodingRow(fixresolution[i], success, fails, counter, mayTranscode(fixresolution[i]));
resolutions.add(transcodingRow); resolutions.add(transcodingRow);
} }
if (resolutions != null){ if (resolutions != null){
......
...@@ -125,7 +125,7 @@ public class VideoHandler extends FileHandler { ...@@ -125,7 +125,7 @@ public class VideoHandler extends FileHandler {
long filesize = importFile.getSize(); long filesize = importFile.getSize();
VideoManager videoManager = CoreSpringFactory.getImpl(VideoManager.class); 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 // 2a) import video from raw mp4 master video file
videoManager.importFromMasterFile(repoEntry, importFile); videoManager.importFromMasterFile(repoEntry, importFile);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment