Merge branch 'rtsp_over_http'

* rtsp_over_http:
  RTSP over HTTP対応

Author: mnakada

configs/overlay_rootfs/scripts/lighttpd.sh

@@ -21,7 +21,7 @@ fi
 
 if [ "$1" = "restart" ]; then
   kill `pidof lighttpd` > /dev/null 2>&1
-  while netstat -ltn 2> /dev/null | grep :80 > /dev/null; do
+  while netstat -ltn 2> /dev/null | grep ':80 ' > /dev/null; do
     sleep 0.5
   done
   /usr/sbin/lighttpd -f /etc/lighttpd/lighttpd.conf

configs/overlay_rootfs/scripts/rtspserver.sh

@@ -14,10 +14,10 @@ if [ "$1" = "on" -o "$RTSPSERVER" = "on" ]; then
   /scripts/cmd video on > /dev/null
   /scripts/cmd audio on > /dev/null
   if ! pidof v4l2rtspserver > /dev/null ; then
-    while netstat -ltn 2> /dev/null | grep :8554; do
+    while netstat -ltn 2> /dev/null | egrep ":(8554|8080)"; do
       sleep 0.5
     done
-    /usr/bin/v4l2rtspserver -C 1 -a S16_LE -l 0 /dev/video1,hw:Loopback,0 >> /tmp/log/rtspserver.log 2>&1 &
+    /usr/bin/v4l2rtspserver -p 8080 -C 1 -a S16_LE -l 0 /dev/video1,hw:Loopback,0 >> /tmp/log/rtspserver.log 2>&1 &
   fi
   if [ "$RTSP_AUDIO" != "on" ] ; then
     /scripts/cmd audio off > /dev/null

web/source/vue/Setting.vue

@@ -281,10 +281,18 @@
       </ElTooltip>
       <ElRow v-if="config.RTSPSERVER === 'on'">
         <ElCol :offset="2" :span="7">
-          <h4>URL</h4>
+          <h4>RTSP(UDP)</h4>
         </ElCol>
         <ElCol :span="10">
-          <ElInput type="text" readonly v-model="RTSP_URL" />
+          <ElInput type="text" readonly v-model="RTSP_UDP" />
+        </ElCol>
+      </ElRow>
+      <ElRow v-if="config.RTSPSERVER === 'on'">
+        <ElCol :offset="2" :span="7">
+          <h4>RTSP(over HTTP)</h4>
+        </ElCol>
+        <ElCol :span="10">
+          <ElInput type="text" readonly v-model="RTSP_OVER_HTTP" />
         </ElCol>
       </ElRow>
 
@@ -580,7 +588,8 @@
     },
     data() {
       return {
-        RTSP_URL: '',
+        RTSP_UDP: '',
+        RTSP_OVER_HTTP: '',
         config: {
           appver: '', // ATOMCam app_ver (/atom/config/app.ver)
           ATOMHACKVER: '', // AtomHack Ver (/etc/atomhack.ver)
@@ -739,7 +748,8 @@
         this.reboot.dayOfWeekSelect = days.map(d => this.weekDays[(d + 6) % 7]);
       }
 
-      this.RTSP_URL = `rtsp://${window.location.host}:8554/unicast`;
+      this.RTSP_UDP = `rtsp://${window.location.host}:8554/unicast`;
+      this.RTSP_OVER_HTTP = `rtsp://${window.location.host}:8080/unicast`;
 
       setInterval(async () => {
         const res = await axios.get('./cgi-bin/cmd.cgi?name=time').catch(err => {