From f0b319fa342094d4bba4e93c5eafd0585d3ae89f Mon Sep 17 00:00:00 2001
From: Makarand Milind Hinge <mmh2212002@gmail.com>
Date: Thu, 5 Dec 2024 10:25:48 +0530
Subject: [PATCH 1/2] bug-fix: Video processing issue fix

---
 .../app/controllers/VideoController.java      |  2 +-
 .../app/services/impl/VideoServiceImpl.java   | 85 ++++++-------------
 2 files changed, 29 insertions(+), 58 deletions(-)

diff --git a/spring-stream-backend/src/main/java/com/stream/app/controllers/VideoController.java b/spring-stream-backend/src/main/java/com/stream/app/controllers/VideoController.java
index af60c00..1d3b8bf 100644
--- a/spring-stream-backend/src/main/java/com/stream/app/controllers/VideoController.java
+++ b/spring-stream-backend/src/main/java/com/stream/app/controllers/VideoController.java
@@ -27,7 +27,7 @@
 
 @RestController
 @RequestMapping("/api/v1/videos")
-@CrossOrigin("http://localhost:5173 ")
+@CrossOrigin("http://localhost:5173")
 public class VideoController {
 
 
diff --git a/spring-stream-backend/src/main/java/com/stream/app/services/impl/VideoServiceImpl.java b/spring-stream-backend/src/main/java/com/stream/app/services/impl/VideoServiceImpl.java
index ec8d855..c6b52e9 100644
--- a/spring-stream-backend/src/main/java/com/stream/app/services/impl/VideoServiceImpl.java
+++ b/spring-stream-backend/src/main/java/com/stream/app/services/impl/VideoServiceImpl.java
@@ -18,6 +18,7 @@
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 import java.util.List;
+import java.io.*;
 
 @Service
 public class VideoServiceImpl implements VideoService {
@@ -126,70 +127,40 @@ public List<Video> getAll() {
         return videoRepository.findAll();
     }
 
-    @Override
-    public String processVideo(String videoId) {
+@Override
+public String processVideo(String videoId) {
+    Video video = this.get(videoId);
+    String filePath = video.getFilePath();
 
-        Video video = this.get(videoId);
-        String filePath = video.getFilePath();
+    // Path where to store data:
+    Path videoPath = Paths.get(filePath);
 
-        //path where to store data:
-        Path videoPath = Paths.get(filePath);
+    try {
+        // ffmpeg command
+        Path outputPath = Paths.get(HSL_DIR, videoId);
+        Files.createDirectories(outputPath);
 
+        String ffmpegCmd = "ffmpeg -i \"" + videoPath.toString() + "\" -c:v libx264 -c:a aac -strict -2 -f hls -hls_time 10 -hls_list_size 0 -hls_segment_filename \"" + outputPath.toString() + "\\segment_%03d.ts\" \"" + outputPath.toString() + "\\master.m3u8\"";
 
-//        String output360p = HSL_DIR + videoId + "/360p/";
-//        String output720p = HSL_DIR + videoId + "/720p/";
-//        String output1080p = HSL_DIR + videoId + "/1080p/";
+        System.out.println("Running ffmpeg command: " + ffmpegCmd);
 
-        try {
-//            Files.createDirectories(Paths.get(output360p));
-//            Files.createDirectories(Paths.get(output720p));
-//            Files.createDirectories(Paths.get(output1080p));
-
-            // ffmpeg command
-            Path outputPath = Paths.get(HSL_DIR, videoId);
-
-            Files.createDirectories(outputPath);
-
-
-            String ffmpegCmd = String.format(
-                    "ffmpeg -i \"%s\" -c:v libx264 -c:a aac -strict -2 -f hls -hls_time 10 -hls_list_size 0 -hls_segment_filename \"%s/segment_%%3d.ts\"  \"%s/master.m3u8\" ",
-                    videoPath, outputPath, outputPath
-            );
-
-//            StringBuilder ffmpegCmd = new StringBuilder();
-//            ffmpegCmd.append("ffmpeg  -i ")
-//                    .append(videoPath.toString())
-//                    .append(" -c:v libx264 -c:a aac")
-//                    .append(" ")
-//                    .append("-map 0:v -map 0:a -s:v:0 640x360 -b:v:0 800k ")
-//                    .append("-map 0:v -map 0:a -s:v:1 1280x720 -b:v:1 2800k ")
-//                    .append("-map 0:v -map 0:a -s:v:2 1920x1080 -b:v:2 5000k ")
-//                    .append("-var_stream_map \"v:0,a:0 v:1,a:0 v:2,a:0\" ")
-//                    .append("-master_pl_name ").append(HSL_DIR).append(videoId).append("/master.m3u8 ")
-//                    .append("-f hls -hls_time 10 -hls_list_size 0 ")
-//                    .append("-hls_segment_filename \"").append(HSL_DIR).append(videoId).append("/v%v/fileSequence%d.ts\" ")
-//                    .append("\"").append(HSL_DIR).append(videoId).append("/v%v/prog_index.m3u8\"");
-
-
-            System.out.println(ffmpegCmd);
-            //file this command
-            ProcessBuilder processBuilder = new ProcessBuilder("/bin/bash", "-c", ffmpegCmd);
-            processBuilder.inheritIO();
-            Process process = processBuilder.start();
-            int exit = process.waitFor();
-            if (exit != 0) {
-                throw new RuntimeException("video processing failed!!");
-            }
-
-            return videoId;
-
-
-        } catch (IOException ex) {
-            throw new RuntimeException("Video processing fail!!");
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
+        // Run the command on Windows using cmd.exe
+        ProcessBuilder processBuilder = new ProcessBuilder("cmd.exe", "/c", ffmpegCmd);
+        processBuilder.inheritIO();
+        Process process = processBuilder.start();
+        int exitCode = process.waitFor();
+
+        if (exitCode != 0) {
+            throw new RuntimeException("Video processing failed!");
         }
 
+        return videoId;
 
+    } catch (IOException ex) {
+        throw new RuntimeException("Video processing failed due to IOException!", ex);
+    } catch (InterruptedException ex) {
+        throw new RuntimeException("Video processing was interrupted!", ex);
     }
 }
+
+}

From 463776f7dfef6967c3e3c96387fcfc3e2551c09d Mon Sep 17 00:00:00 2001
From: Makarand Milind Hinge <mmh2212002@gmail.com>
Date: Thu, 5 Dec 2024 10:35:10 +0530
Subject: [PATCH 2/2] bug-fix:Testing successful

---
 .../src/main/resources/application.properties |  4 ++--
 .../SpringStreamBackendApplicationTests.java  | 24 -------------------
 2 files changed, 2 insertions(+), 26 deletions(-)
 delete mode 100644 spring-stream-backend/src/test/java/com/stream/app/SpringStreamBackendApplicationTests.java

diff --git a/spring-stream-backend/src/main/resources/application.properties b/spring-stream-backend/src/main/resources/application.properties
index 50960d2..5a997b2 100644
--- a/spring-stream-backend/src/main/resources/application.properties
+++ b/spring-stream-backend/src/main/resources/application.properties
@@ -5,9 +5,9 @@ spring.application.name=spring-stream-backend
 
 
 # MySQL connection
-spring.datasource.url=jdbc:mysql://localhost:3306/learn
+spring.datasource.url=jdbc:mysql://localhost:3306/stream
 spring.datasource.username=root
-spring.datasource.password=root1234
+spring.datasource.password=Makarand@2002
 
 
 # JPA properties
diff --git a/spring-stream-backend/src/test/java/com/stream/app/SpringStreamBackendApplicationTests.java b/spring-stream-backend/src/test/java/com/stream/app/SpringStreamBackendApplicationTests.java
deleted file mode 100644
index 92a24ba..0000000
--- a/spring-stream-backend/src/test/java/com/stream/app/SpringStreamBackendApplicationTests.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.stream.app;
-
-import com.stream.app.services.VideoService;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class SpringStreamBackendApplicationTests {
-
-	@Autowired
-	VideoService videoService;
-
-	@Test
-	void contextLoads() {
-
-//		videoService.processVideo("499253fc-78aa-48e1-9d20-06130f550568",null);
-
-	}
-
-}
-
-//ffmpeg -i videos/852421-hd_1920_1080_30fps.mp4 -map 0:v -map 0:a -s:v:0 640x360 -b:v:0 800k -map 0:v -map 0:a -s:v:1 1280x720 -b:v:1 2800k -map 0:v -map 0:a -s:v:2 1920x1080 -b:v:2 5000k -var_stream_map "v:0,a:0 v:1,a:0 v:2,a:0" -master_pl_name videos_hsl/083f066b-0546-4c84-b569-88894b30b61c/master.m3u8 -f hls -hls_time 10 -hls_list_size 0 -hls_segment_filename "videos_hsl/083f066b-0546-4c84-b569-88894b30b61c/v%v/fileSequence%d.ts" "videos_hsl/083f066b-0546-4c84-b569-88894b30b61c/v%v/prog_index.m3u8"
-