Modify Video URLs to short URLs and add more videos
Change-Id: I041d800a59152c600971f78f3566d42a5a3fa3e6
diff --git a/mcord/mcord-cdn-local/Chart.yaml b/mcord/mcord-cdn-local/Chart.yaml
index e49a4bc..f906888 100644
--- a/mcord/mcord-cdn-local/Chart.yaml
+++ b/mcord/mcord-cdn-local/Chart.yaml
@@ -18,4 +18,4 @@
appVersion: "1.0"
description: A Helm chart for MCORD CDN Services in Local Edge
name: mcord-cdn-local
-version: 0.1.1
+version: 0.1.3
diff --git a/mcord/mcord-cdn-local/templates/cm.yaml b/mcord/mcord-cdn-local/templates/cm.yaml
index cd91d48..332e5cc 100644
--- a/mcord/mcord-cdn-local/templates/cm.yaml
+++ b/mcord/mcord-cdn-local/templates/cm.yaml
@@ -158,13 +158,13 @@
rtmp {
server {
listen 1935;
- application pullfromwowza {
+ application r {
live on;
pull rtmp://{{ .Values.remote_ip }}:1935/live;
}
- application pullfromlocal {
+ application l {
live on;
play /opt/cdn/movies;
}
}
- }
\ No newline at end of file
+ }
diff --git a/mcord/mcord-cdn-local/values.yaml b/mcord/mcord-cdn-local/values.yaml
index 09a5354..84c74fd 100644
--- a/mcord/mcord-cdn-local/values.yaml
+++ b/mcord/mcord-cdn-local/values.yaml
@@ -24,7 +24,7 @@
nginx:
images:
- nginx_image: "woojoong/nginx:onf-video"
+ nginx_image: "woojoong/nginx:onf-video-v2"
ports:
rtmp_orig: 1935
rtmp_np: 31935
diff --git a/mcord/mcord-cdn-remote/Chart.yaml b/mcord/mcord-cdn-remote/Chart.yaml
index 72e0ba1..5cc4f33 100644
--- a/mcord/mcord-cdn-remote/Chart.yaml
+++ b/mcord/mcord-cdn-remote/Chart.yaml
@@ -18,4 +18,4 @@
appVersion: "1.0"
description: A Helm chart for MCORD CDN Services in Remote cloud
name: mcord-cdn-remote
-version: 0.1.2
+version: 0.1.3
diff --git a/mcord/mcord-cdn-remote/templates/remote-vlc.yaml b/mcord/mcord-cdn-remote/templates/remote-vlc.yaml
index 62b9a5e..508f5a6 100644
--- a/mcord/mcord-cdn-remote/templates/remote-vlc.yaml
+++ b/mcord/mcord-cdn-remote/templates/remote-vlc.yaml
@@ -67,7 +67,7 @@
command: [ "bash", "-xc"]
args:
- sed -i 's/geteuid/getppid/' /usr/bin/vlc;
- cvlc larva_360p.mp4 --sout "#transcode{vcodec=h264,acodec=mpga,ab=128,channels=2,samplerate=44100}:rtp{dst=0.0.0.0,port={{ .Values.remote_vlc.ports.vlc }},mux=ts,sap,name=Test}" --sout-keep --loop --ttl 10 --mtu 1200;
+ cvlc {{ .Values.remote_vlc.video_quality }}.mp4 --sout "#transcode{vcodec=h264,acodec=mpga,ab=128,channels=2,samplerate=44100}:rtp{dst=0.0.0.0,port={{ .Values.remote_vlc.ports.vlc }},mux=ts,sap,name=Test}" --sout-keep --loop --ttl 10 --mtu 1200;
resources:
limits:
cpu: {{ .Values.remote_vlc.resources.cpu }}
diff --git a/mcord/mcord-cdn-remote/values.yaml b/mcord/mcord-cdn-remote/values.yaml
index 94fdf4c..9084b5c 100644
--- a/mcord/mcord-cdn-remote/values.yaml
+++ b/mcord/mcord-cdn-remote/values.yaml
@@ -29,9 +29,10 @@
replicas: 1
remote_vlc:
+ video_quality: 360
images:
init: "ngick8stesting/c3po-mmeinit"
- remote_vlc_image: "woojoong/mwc-cdn:remote"
+ remote_vlc_image: "woojoong/mwc-cdn:remote-v2"
ports:
vlc: 8089
http: 50001