- Major Overhaul in progress

AkshathSai · Jul 29, 2024 · f4b06fa · f4b06fa
1 parent fd6d45e
commit f4b06fa
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/src/main/java/com/akshathsaipittala/streamspace/www/StreamController.java b/src/main/java/com/akshathsaipittala/streamspace/www/StreamController.java
@@ -1,6 +1,9 @@
 package com.akshathsaipittala.streamspace.www;
 
+import com.akshathsaipittala.streamspace.library.VideoRepository;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -13,11 +16,25 @@
 @Slf4j
 @Controller
 @RequestMapping("/stream")
+@RequiredArgsConstructor
 public class StreamController {
 
+    final VideoRepository videoRepository;
+
     @GetMapping("/video/{movieCode}")
     public String getVideoPlayer(@PathVariable("movieCode") String movieCode, Model model) {
         model.addAttribute("movieCode", movieCode);
+        var video = videoRepository.findById(URLDecoder.decode(movieCode, StandardCharsets.UTF_8));
+        var contentMimeType = MediaType.APPLICATION_OCTET_STREAM_VALUE;
+
+        // Workaround to get MKV Videos playing on Chromium browsers
+        if (video.get().getContentMimeType().equals("video/x-matroska")) {
+            contentMimeType = "video/webm";
+        } else if (video.get().getContentMimeType().equals("video/mp4")) {
+            contentMimeType = "video/mp4";
+        }
+
+        model.addAttribute("contentMimeType", contentMimeType);
         return "player :: videoPlayer";
     }
 

diff --git a/src/main/resources/templates/player.html b/src/main/resources/templates/player.html
@@ -2,9 +2,9 @@
 
     <div class="fade-me-in">
         <!--<p class="display-6 text-muted">Now Playing</p>-->
-        <video class="img-fluid shadow-lg" controls preload="auto">
-            <source th:src="@{'/videos/' + ${movieCode} + '/content'}">
-            <source th:src="@{'/videos/' + ${movieCode}}" type="video/webm">
+        <video class="img-fluid shadow-lg" controls>
+            <source th:src="@{'/videos/' + ${movieCode} + '/content'}" th:type="${contentMimeType}">
+            <source th:src="@{'/videos/' + ${movieCode}}" th:type="${contentMimeType}">
         </video>
     </div>