nginx streamer for hls and dash work now

2 files changed, 24 insertions, 24 deletions

diff --git a/templates/default/kubernetes/nginx-streamer-cm.yml.j2 b/templates/default/kubernetes/nginx-streamer-cm.yml.j2
index 4171305..2ee77c6 100644
--- a/templates/default/kubernetes/nginx-streamer-cm.yml.j2
+++ b/templates/default/kubernetes/nginx-streamer-cm.yml.j2
@@ -1,3 +1,6 @@
+%% set flumotion_port = desc.streams[worker.flags.stream].port
+%% set nginx_port = desc.streams[worker.flags.stream]['nginx-port']
+%% set hostname = worker.flags['stream-hostname-'+worker.flags.stream]
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -35,8 +38,8 @@ data:
       access_log /dev/null;
 
       server {
-        listen 8000 default_server;
-        listen [::]:8000 default_server;
+        listen {{ nginx_port }} default_server;
+        listen [::]:{{ nginx_port }} default_server;
         server_name _;
 
         root /srv/www;
@@ -57,21 +60,6 @@ data:
       server {
         listen localhost:1935;
 
-        respawn on;
-
-        exec_static ffmpeg -i http://flumotion-worker-{{ worker.name }}:8000/av-orig-flash-mini.flv
-              -acodec copy -vcodec copy -vbsf h264_mp4toannexb -f flv rtmp://localhost/hls/av-orig-mini
-              -acodec copy -vcodec copy -vbsf h264_mp4toannexb -f flv rtmp://localhost/dash/av-orig-mini;
-        exec_static ffmpeg -i http://flumotion-worker-{{ worker.name }}:8000/av-orig-flash-low.flv
-              -acodec copy -vcodec copy -vbsf h264_mp4toannexb -f flv rtmp://localhost/hls/av-orig-low
-              -acodec copy -vcodec copy -vbsf h264_mp4toannexb -f flv rtmp://localhost/dash/av-orig-low;
-        exec_static ffmpeg -i http://flumotion-worker-{{ worker.name }}:8000/av-orig-flash-medium.flv
-              -acodec copy -vcodec copy -vbsf h264_mp4toannexb -f flv rtmp://localhost/hls/av-orig-medium
-              -acodec copy -vcodec copy -vbsf h264_mp4toannexb -f flv rtmp://localhost/dash/av-orig-medium;
-        exec_static ffmpeg -i http://flumotion-worker-{{ worker.name }}:8000/av-orig-flash-high.flv
-              -acodec copy -vcodec copy -vbsf h264_mp4toannexb -f flv rtmp://localhost/hls/av-orig-high
-              -acodec copy -vcodec copy -vbsf h264_mp4toannexb -f flv rtmp://localhost/dash/av-orig-high;
-
         application hls {
           live on;
 
@@ -84,12 +72,15 @@ data:
           hls_fragment_naming timestamp;
           hls_fragment_slicing aligned;
           hls_type live;
-          hls_base_url http://localhost:8000/hls/;
-
-          hls_variant -mini    BANDWIDTH=350000;
-          hls_variant -low     BANDWIDTH=700000;
-          hls_variant -medium  BANDWIDTH=1200000;
-          hls_variant -high    BANDWIDTH=2000000;
+          hls_base_url http://{{ hostname }}:{{ nginx_port }}/hls/;
+
+%% for mux in desc.streams[worker.flags.stream]['nginx-muxes']
+%%   for profile in desc.muxes[mux].formats.flash
+%%     set abitrate = desc.globals.profiles[profile].audio
+%%     set vbitrate = desc.globals.bitrates[desc.globals.formats.flash.video][desc.globals.profiles[profile].video]
+          hls_variant -{{ profile }} BANDWIDTH={{ (abitrate + vbitrate) * 1000 }};
+%%   endfor
+%% endfor
         }
 
         application dash {
@@ -102,5 +93,14 @@ data:
           dash_nested on;
           dash_cleanup on;
         }
+
+        respawn on;
+%% for mux in desc.streams[worker.flags.stream]['nginx-muxes']
+%%   for profile in desc.muxes[mux].formats.flash
+        exec_static ffmpeg -i http://flumotion-worker-{{ worker.name }}:{{ flumotion_port }}/{{ mux }}-flash-{{ profile }}.flv
+              -acodec copy -vcodec copy -vbsf h264_mp4toannexb -f flv rtmp://localhost/hls/{{ mux }}-{{ profile }}
+              -acodec copy -vcodec copy -vbsf h264_mp4toannexb -f flv rtmp://localhost/dash/{{ mux }}-{{ profile }};
+%%   endfor
+%% endfor
       }
     }
diff --git a/templates/default/kubernetes/nginx-streamer-svc.yml.j2 b/templates/default/kubernetes/nginx-streamer-svc.yml.j2
index a6a9f0d..b6bcfe5 100644
--- a/templates/default/kubernetes/nginx-streamer-svc.yml.j2
+++ b/templates/default/kubernetes/nginx-streamer-svc.yml.j2
@@ -13,4 +13,4 @@ spec:
     type: streamer
     worker: {{ worker.name }}
   ports:
-  - port: 8000
+  - port: {{ desc.streams[worker.flags.stream]['nginx-port'] }}