From 446a20cd3996ee4ae563531e7c016e1289527843 Mon Sep 17 00:00:00 2001
From: Lukas Schulz <lukas.schulz@simiworld.de>
Date: Mon, 27 Jul 2020 15:44:56 +0200
Subject: [PATCH] Optimized and fixed idiocy

---
 streaming-server.conf | 73 ++++++++++++++++++++++++++-----------------
 1 file changed, 45 insertions(+), 28 deletions(-)

diff --git a/streaming-server.conf b/streaming-server.conf
index 223b346..1b5a23b 100644
--- a/streaming-server.conf
+++ b/streaming-server.conf
@@ -9,6 +9,7 @@ events {
 }
 
 rtmp {
+	hls_playlist_length 30m;
 	server {
 		listen 1935;
 		chunk_size 4000;
@@ -25,44 +26,50 @@ rtmp {
 			#deny publish all;
 
 			exec ffmpeg -re -i rtmp://localhost:1935/$app/$name -vcodec flv -acodec copy -s 1920x1080
-                        -f flv rtmp://localhost:1935/1080p/${name}
-			-vcodec h264_nvenc -s 1920x1080 -vprofile baseline -acodec copy -f flv rtmp://localhost:1935/hls/1080p
-			-f flv rtmp://localhost:1935/dash/1080p;
-
-			exec ffmpeg -re -i rtmp://localhost:1935/$app/$name -vcodec flv -acodec copy -s 1280x720
-                        -f flv rtmp://localhost:1935/720p/${name}
-			-vcodec h264_nvenc -s 1280x720 -vprofile baseline -acodec copy -f flv rtmp://localhost:1935/hls/720p
-			-f flv rtmp://localhost:1935/dash/720p;
-
-			exec ffmpeg -re -i rtmp://localhost:1935/$app/$name -vcodec flv -acodec copy -s 848x480
-                        -f flv rtmp://localhost:1935/480p/${name}
-			-vcodec h264_nvenc -s 848x480 -vprofile baseline -acodec copy -f flv rtmp://localhost:1935/hls/480p
-			-f flv rtmp://localhost:1935/dash/480p;
+			-vcodec h264_nvenc -s 1920x1080 -vprofile baseline -acodec copy -f flv rtmp://localhost:1935/hls/$name_1080p
+                        -vcodec h264_nvenc -s 1280x720 -vprofile baseline -acodec copy -f flv rtmp://localhost:1935/hls/$name_720p
+                        -vcodec h264_nvenc -s 848x480 -vprofile baseline -acodec copy -f flv rtmp://localhost:1935/hls/$name_480p
+			;
 
+#			exec ffmpeg -re -i rtmp://localhost:1935/$app/$name -vcodec flv -acodec copy -s 1280x720
+#                        -f flv rtmp://localhost:1935/720p/${name}
+#			-vcodec h264_nvenc -s 1280x720 -vprofile baseline -acodec copy -f flv rtmp://localhost:1935/hls/720p
+#			-f flv rtmp://localhost:1935/dash/720p;
+#
+#			exec ffmpeg -re -i rtmp://localhost:1935/$app/$name -vcodec flv -acodec copy -s 848x480
+#                        -f flv rtmp://localhost:1935/480p/${name}
+#			-vcodec h264_nvenc -s 848x480 -vprofile baseline -acodec copy -f flv rtmp://localhost:1935/hls/480p
+#			-f flv rtmp://localhost:1935/dash/480p;
+#
         #                exec ffmpeg -re -i rtmp://localhost:1935/$app/$name -vcodec flv -acodec copy -s 32x32
         #                -f flv rtmp://localhost:1935/small/${name};
 		}
 
-		application 1080p {
-			live on;
-		}
-
-		application 720p {
-			live on;
-		}
-
-		application 480p {
-			live on;
-		}
-
-		application small {
-			live on;
-		}
+#		application 1080p {
+#			live on;
+#		}
+#
+#		application 720p {
+#			live on;
+#		}
+#
+#		application 480p {
+#			live on;
+#		}
+#
+#		application small {
+#			live on;
+#		}
 
 		application hls {
 			live on;
 			hls on;
 			hls_path /tmp/hls;
+		        hls_nested on;
+
+            		hls_variant _480p RESOLUTION=848x480;
+            		hls_variant _720p RESOLUTION=1280x720;
+            		hls_variant _1080p  RESOLUTION=1920x1080;
 		}
 
 		application dash {
@@ -77,6 +84,7 @@ http {
     server {
 
         listen      8080;
+	listen [::]:8080;
 
         # This URL provides RTMP statistics in XML
         location /stat {
@@ -104,10 +112,19 @@ http {
             add_header Cache-Control no-cache;
         }
 
+	location /hls/main.m3u8 {
+		root /var/www/;
+	}
+
         location /dash {
             # Serve DASH fragments
             root /tmp;
             add_header Cache-Control no-cache;
         }
+
+	location / {
+	    # Serve static html files
+	    root /var/www/html;
+	}
     }
 }
\ No newline at end of file