Skip to content
Snippets Groups Projects
Commit 318fd6db authored by uhensler's avatar uhensler
Browse files

OO-4793: Accept m3u8 format for URL import

parent 99afe74e
No related branches found
No related tags found
No related merge requests found
...@@ -39,6 +39,7 @@ public enum VideoFormat { ...@@ -39,6 +39,7 @@ public enum VideoFormat {
* Local mp4 encoded with h264 * Local mp4 encoded with h264
*/ */
mp4("video/mp4"), mp4("video/mp4"),
m3u8("application/x-mpegURL"),
youtube("video/youtube"), youtube("video/youtube"),
vimeo("video/vimeo"), vimeo("video/vimeo"),
panopto("video/mp4"); panopto("video/mp4");
...@@ -89,6 +90,8 @@ public enum VideoFormat { ...@@ -89,6 +90,8 @@ public enum VideoFormat {
return VideoFormat.panopto; return VideoFormat.panopto;
} else if(url.endsWith(".mp4")) { } else if(url.endsWith(".mp4")) {
return VideoFormat.mp4; return VideoFormat.mp4;
} else if(url.endsWith(".m3u8")) {
return VideoFormat.m3u8;
} }
} catch (MalformedURLException e) { } catch (MalformedURLException e) {
log.warn("Cannot read url: " + url, e); log.warn("Cannot read url: " + url, e);
......
...@@ -199,7 +199,7 @@ cmd.finish=Finish Wizard ...@@ -199,7 +199,7 @@ cmd.finish=Finish Wizard
cmd.forward=Next cmd.forward=Next
cmd.import.ressource=Import cmd.import.ressource=Import
cmd.import.ressource.desc=Choose a learning resource to import\:<ul><li>OpenOlat formats\: course, resource folder, glossary, wiki, podcast, blog, portfolio template</li><li>Videos\: MP4</li><li>Standard formats\: IMS Content Packaging, IMS QTI 2.1 assessment, SCORM 1.2</li><li>Files\: any</li></ul> cmd.import.ressource.desc=Choose a learning resource to import\:<ul><li>OpenOlat formats\: course, resource folder, glossary, wiki, podcast, blog, portfolio template</li><li>Videos\: MP4</li><li>Standard formats\: IMS Content Packaging, IMS QTI 2.1 assessment, SCORM 1.2</li><li>Files\: any</li></ul>
cmd.import.ressource.url.desc=Enter an URL to import\:<ul><li>Videos\: MP4, Youtube, Vimeo, Panopto</li><li>Blog or Podcast</li></ul> cmd.import.ressource.url.desc=Enter an URL to import\:<ul><li>Videos\: MP4, m3u8, Youtube, Vimeo, Panopto</li><li>Blog or Podcast</li></ul>
cmd.import.url.ressource=Import URL cmd.import.url.ressource=Import URL
comments=Comments comments=Comments
confirmation.no.toolHelp=Cancel action. confirmation.no.toolHelp=Cancel action.
......
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