Merge pull request #5 from 5G-MAG/feature/configOptimizations

Additional changes to support all of the available formats. Also incl…

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "flute-ffmpeg/supporting_files"]
+	path = flute-ffmpeg/supporting_files
+	url = https://github.com/5G-MAG/rt-common-shared
+	branch = feature/mbms

flute-ffmpeg/README.md

@@ -75,19 +75,22 @@ configuration looks the following
 
 ````
 general : {
-          multicast_ip = "238.1.1.95";
-          multicast_port = 40085;
+          multicast_ip = "238.1.1.111";
+          multicast_port = 40101;
           mtu = 1500;
           rate_limit = 1200000;
-          watchfolder_path = "/var/www/watchfolder_out";
+          watchfolder_path = "/home/dsi/5G-MAG/simple-express-server/public/watchfolder/hls";
+          path_to_transmit = ""
           stream_type = "hls";
+          transmit_service_announcement = false;
           dash: {
-            number_of_init_segments = 3;
-            resend_init_in_sec = 30;
-            service_announcement = "../files/bootstrap.multipart.dash";
+              number_of_init_segments = 3;
+              resend_init_in_sec = 30;
+              service_announcement = "../files/bootstrap.multipart.dash";
           };
           hls: {
-            service_announcement = "../files/bootstrap.multipart.hls";
+              service_announcement = "../files/bootstrap.multipart.hls";
+              media_playlists_to_ignore_in_multicast = []
           }
           webserver_port: 3010;
 }

flute-ffmpeg/config/default.cfg

@@ -0,0 +1,20 @@
+general : {
+          multicast_ip = "238.1.1.111";
+          multicast_port = 40101;
+          mtu = 1500;
+          rate_limit = 1200000;
+          watchfolder_path = "/home/dsi/5G-MAG/simple-express-server/public/watchfolder/hls";
+          path_to_transmit = "watchfolder/hls/"
+          stream_type = "hls";
+          transmit_service_announcement = false;
+          dash: {
+              number_of_init_segments = 3;
+              resend_init_in_sec = 30;
+              service_announcement = "../supporting_files/mbms/bootstrap_examples/bootstrap.multipart.legacy.dash";
+          };
+          hls: {
+              service_announcement = "../supporting_files/mbms/bootstrap_examples/bootstrap.multipart.legacy.hls";
+              media_playlists_to_ignore_in_multicast = []
+          }
+          webserver_port: 3010;
+}