added channel 2

database.json

@@ -1,6 +1,6 @@
 {
   "version": 1,
-  "startAtShotId": "8580722a-3b39-4a9e-a025-df34b797bddd",
+  "startAtShotId": "ae832251-8cab-4177-b92c-1ae215421cdc",
   "sequences": [
     {
       "sequenceId": "0489dbc6-791c-4cb8-97f6-ada01092fa91",

scripts/{audio.sh → audio1.sh}

@@ -1,30 +1,30 @@
 #!/bin/bash
 
-echo "Starting the audio collection stream.."
+echo "Starting the audio collection stream for channel 1.."
 current_count=0
 
 while true; do
-    new_count=$(ls $WEBTV_AUDIO_STORAGE_PATH*.mp3 2> /dev/null | wc -l)
+    new_count=$(ls $WEBTV_AUDIO_STORAGE_PATH_CHANNEL_1*.mp3 2> /dev/null | wc -l)
 
     if [ $new_count -ne $current_count ]; then
-        echo "there are $new_count audio files"
+        echo "there are $new_count audio files for channel 1"
 
-        echo "Updating audio playlists..."
+        echo "Updating audio playlists for channel 1..."
         current_count=$new_count
-        files=($WEBTV_AUDIO_STORAGE_PATH*.mp3)
+        files=($WEBTV_AUDIO_STORAGE_PATH_CHANNEL_1*.mp3)
         
         # Re-create the audio playlists
-        echo "ffconcat version 1.0" > audio_list_a.txt
-        echo "ffconcat version 1.0" > audio_list_b.txt
+        echo "ffconcat version 1.0" > channel_1_audio_list_a.txt
+        echo "ffconcat version 1.0" > channel_1_audio_list_b.txt
         for (( i=0; i<${#files[@]}; i++ )); do
             if (( i%2 == 0 )); then
-                echo "file '${files[$i]}'" >> audio_list_a.txt
+                echo "file '${files[$i]}'" >> channel_1_audio_list_a.txt
             else
-                echo "file '${files[$i]}'" >> audio_list_b.txt
+                echo "file '${files[$i]}'" >> channel_1_audio_list_b.txt
             fi
         done
-        echo "file 'audio_list_b.txt'" >> audio_list_a.txt
-        echo "file 'audio_list_a.txt'" >> audio_list_b.txt
+        echo "file 'channel_1_audio_list_b.txt'" >> channel_1_audio_list_a.txt
+        echo "file 'channel_1_audio_list_a.txt'" >> channel_1_audio_list_b.txt
     fi
 
     sleep 1

scripts/audio2.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+echo "Starting the audio collection stream for channel 2.."
+current_count=0
+
+while true; do
+    new_count=$(ls $WEBTV_AUDIO_STORAGE_PATH_CHANNEL_2*.mp3 2> /dev/null | wc -l)
+
+    if [ $new_count -ne $current_count ]; then
+        echo "there are $new_count audio files for channel 2"
+
+        echo "Updating audio playlists for channel 2..."
+        current_count=$new_count
+        files=($WEBTV_AUDIO_STORAGE_PATH_CHANNEL_2*.mp3)
+        
+        # Re-create the audio playlists
+        echo "ffconcat version 1.0" > channel_2_audio_list_a.txt
+        echo "ffconcat version 1.0" > channel_2_audio_list_b.txt
+        for (( i=0; i<${#files[@]}; i++ )); do
+            if (( i%2 == 0 )); then
+                echo "file '${files[$i]}'" >> channel_2_audio_list_a.txt
+            else
+                echo "file '${files[$i]}'" >> channel_2_audio_list_b.txt
+            fi
+        done
+        echo "file 'channel_2_audio_list_b.txt'" >> channel_2_audio_list_a.txt
+        echo "file 'channel_2_audio_list_a.txt'" >> channel_2_audio_list_b.txt
+    fi
+
+    sleep 1
+done

scripts/init.sh

@@ -1,21 +1,38 @@
 #!/bin/bash
 
-echo "creating the storage folders.."
-mkdir -p $WEBTV_VIDEO_STORAGE_PATH
-mkdir -p $WEBTV_VIDEO_STORAGE_PATH_NEXT
-mkdir -p $WEBTV_AUDIO_STORAGE_PATH
+# ------------- CHANNEL 1 --------------
+echo "creating the storage folders for channel 1.."
+mkdir -p $WEBTV_VIDEO_STORAGE_PATH_CHANNEL_1
+mkdir -p $WEBTV_AUDIO_STORAGE_PATH_CHANNEL_1
 
-echo "creating the playlists.." 
-echo "ffconcat version 1.0" > list_a.txt
-echo "ffconcat version 1.0" > list_b.txt
-echo "ffconcat version 1.0" > audio_list_a.txt
-echo "ffconcat version 1.0" > audio_list_b.txt
+echo "creating the playlists for channel 1.." 
+echo "ffconcat version 1.0" > channel_1_video_list_a.txt
+echo "ffconcat version 1.0" > channel_1_video_list_b.txt
+echo "ffconcat version 1.0" > channel_1_audio_list_a.txt
+echo "ffconcat version 1.0" > channel_1_audio_list_b.txt
 
-echo "file 'list_b.txt'" >> list_a.txt
-echo "file 'list_a.txt'" >> list_b.txt
-echo "file 'audio_list_b.txt'" >> audio_list_a.txt
-echo "file 'audio_list_a.txt'" >> audio_list_b.txt
+echo "file 'channel_1_video_list_b.txt'" >> channel_1_video_list_a.txt
+echo "file 'channel_1_video_list_a.txt'" >> channel_1_video_list_b.txt
+echo "file 'channel_1_audio_list_b.txt'" >> channel_1_audio_list_a.txt
+echo "file 'channel_1_audio_list_a.txt'" >> channel_1_audio_list_b.txt
 
-echo "create the named pipes.."
-mkfifo video.pipe
-mkfifo audio.pipe
+# ------------- CHANNEL 2 --------------
+echo "creating the storage folders for channel 2.."
+mkdir -p $WEBTV_VIDEO_STORAGE_PATH_CHANNEL_2
+mkdir -p $WEBTV_AUDIO_STORAGE_PATH_CHANNEL_2
+
+echo "creating the playlists for channel 2.." 
+echo "ffconcat version 1.0" > channel_2_video_list_a.txt
+echo "ffconcat version 1.0" > channel_2_video_list_b.txt
+echo "ffconcat version 1.0" > channel_2_audio_list_a.txt
+echo "ffconcat version 1.0" > channel_2_audio_list_b.txt
+
+echo "file 'channel_2_video_list_b.txt'" >> channel_2_video_list_a.txt
+echo "file 'channel_2_video_list_a.txt'" >> channel_2_video_list_b.txt
+echo "file 'channel_2_audio_list_b.txt'" >> channel_2_audio_list_a.txt
+echo "file 'channel_2_audio_list_a.txt'" >> channel_2_audio_list_b.txt
+
+# maybe we will try that again in the future
+# echo "create the named pipes.."
+# mkfifo video.pipe
+# mkfifo audio.pipe

scripts/stream.sh

@@ -1,24 +0,0 @@
-#!/bin/bash
-
-COUNT=0
-
-echo "Starting final stream loop.."
-while true; do
-    # if ((COUNT % 60 == 0)); then
-    #     echo "--- video list_a.txt ---"
-    #     cat list_a.txt
-  
-    #     #echo "--- audio_list_a.txt ---"
-    #     #cat audio_list_a.txt
-    # fi
-
-    #sleep 1
-    
-    # ((COUNT++))
-
-    # echo "Trying to create the final stream.."
-    ffmpeg -y -nostdin -re -f concat -safe 0 -i "list_a.txt" -loglevel error -c:v libx264 -preset veryfast -tune zerolatency -c:a aac -ar 44100 -f flv rtmp://localhost/live/webtv
-    # ffmpeg -y -nostdin -re -f concat -safe 0 -i "list_a.txt" -i "audio_list_a.txt" -loglevel error -c:v libx264 -preset veryfast -tune zerolatency -c:a aac -ar 44100 -f flv rtmp://localhost/live/webtv
-    
-    # echo "Final stream got interrupted, will try again in 1 sec"
-done

scripts/stream1.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+COUNT=0
+
+echo "Starting FFMPEG live stream for channel 1"
+while true; do
+    # if ((COUNT % 60 == 0)); then
+    #     echo "--- video channel_1_video_list_a.txt ---"
+    #     cat channel_1_video_list_a.txt
+  
+    #     #echo "--- channel_1_audio_list_a.txt ---"
+    #     #cat channel_1_audio_list_a.txt
+    # fi
+
+    #sleep 1
+    
+    # ((COUNT++))
+
+    # echo "Trying to create the final stream fo channel 1.."
+    ffmpeg -y -nostdin -re -f concat -safe 0 -i "channel_1_video_list_a.txt" -loglevel error -c:v libx264 -preset veryfast -tune zerolatency -c:a aac -ar 44100 -f flv rtmp://localhost/live/webtv
+    # ffmpeg -y -nostdin -re -f concat -safe 0 -i "channel_1_video_list_a.txt" -i "channel_1_audio_list_a.txt" -loglevel error -c:v libx264 -preset veryfast -tune zerolatency -c:a aac -ar 44100 -f flv rtmp://localhost/live/webtv
+    
+    # echo "Live stream for channel 1 got interrupted, will try again in 1 sec"
+done

scripts/stream2.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+COUNT=0
+
+echo "Starting FFMPEG live stream for channel 2"
+while true; do
+    # if ((COUNT % 60 == 0)); then
+    #     echo "--- video channel_2_video_list_a.txt ---"
+    #     cat channel_2_video_list_a.txt
+  
+    #     #echo "--- channel_2_audio_list_a.txt ---"
+    #     #cat channel_2_audio_list_a.txt
+    # fi
+
+    #sleep 1
+    
+    # ((COUNT++))
+
+    # echo "Trying to create the final stream for channel 2.."
+    ffmpeg -y -nostdin -re -f concat -safe 0 -i "channel_2_video_list_a.txt" -loglevel error -c:v libx264 -preset veryfast -tune zerolatency -c:a aac -ar 44100 -f flv rtmp://localhost/live/webtv2
+    # ffmpeg -y -nostdin -re -f concat -safe 0 -i "channel_2_video_list_a.txt" -i "channel_2_audio_list_a.txt" -loglevel error -c:v libx264 -preset veryfast -tune zerolatency -c:a aac -ar 44100 -f flv rtmp://localhost/live/webtv
+    
+    # echo "Live stream for channel 2 got interrupted, will try again in 1 sec"
+done

scripts/{video.sh → video1.sh}

@@ -1,32 +1,32 @@
 #!/bin/bash
 
-echo "Starting the video collection stream.."
-echo "listing files in $WEBTV_VIDEO_STORAGE_PATH*.mp4"
+echo "Starting the video collection stream for channel 1.."
+echo "listing files in $WEBTV_VIDEO_STORAGE_PATH_CHANNEL_1*.mp4"
 current_count=0
 
 while true; do
-    new_count=$(ls $WEBTV_VIDEO_STORAGE_PATH*.mp4 2> /dev/null | wc -l)
+    new_count=$(ls $WEBTV_VIDEO_STORAGE_PATH_CHANNEL_1*.mp4 2> /dev/null | wc -l)
 
     if [ $new_count -ne $current_count ]; then
-        echo "there are $new_count videos files"
+        echo "there are $new_count videos files for channel 1"
 
-        echo "Updating playlists..."
+        echo "Updating playlists for channel 1.."
         current_count=$new_count
-        files=($WEBTV_VIDEO_STORAGE_PATH*.mp4)
+        files=($WEBTV_VIDEO_STORAGE_PATH_CHANNEL_1*.mp4)
         
         # Re-create playlists
-        echo "ffconcat version 1.0" > list_a.txt
-        echo "ffconcat version 1.0" > list_b.txt
+        echo "ffconcat version 1.0" > channel_1_video_list_a.txt
+        echo "ffconcat version 1.0" > channel_1_video_list_b.txt
         for (( i=0; i<${#files[@]}; i++ )); do
             echo "file '${files[$i]}'"
             if (( i%2 == 0 )); then
-                echo "file '${files[$i]}'" >> list_a.txt
+                echo "file '${files[$i]}'" >> channel_1_video_list_a.txt
             else
-                echo "file '${files[$i]}'" >> list_b.txt
+                echo "file '${files[$i]}'" >> channel_1_video_list_b.txt
             fi
         done
-        echo "file './list_b.txt'" >> list_a.txt
-        echo "file './list_a.txt'" >> list_b.txt
+        echo "file './channel_1_video_list_b.txt'" >> channel_1_video_list_a.txt
+        echo "file './channel_1_video_list_a.txt'" >> channel_1_video_list_b.txt
     fi
 
     sleep 1

scripts/video2.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+
+echo "Starting the video collection stream for channel 2.."
+echo "listing files in $WEBTV_VIDEO_STORAGE_PATH_CHANNEL_2*.mp4"
+current_count=0
+
+while true; do
+    new_count=$(ls $WEBTV_VIDEO_STORAGE_PATH_CHANNEL_2*.mp4 2> /dev/null | wc -l)
+
+    if [ $new_count -ne $current_count ]; then
+        echo "there are $new_count videos files for channel 2"
+
+        echo "Updating playlists for channel 2.."
+        current_count=$new_count
+        files=($WEBTV_VIDEO_STORAGE_PATH_CHANNEL_2*.mp4)
+        
+        # Re-create playlists
+        echo "ffconcat version 1.0" > channel_2_video_list_a.txt
+        echo "ffconcat version 1.0" > channel_2_video_list_b.txt
+        for (( i=0; i<${#files[@]}; i++ )); do
+            echo "file '${files[$i]}'"
+            if (( i%2 == 0 )); then
+                echo "file '${files[$i]}'" >> channel_2_video_list_a.txt
+            else
+                echo "file '${files[$i]}'" >> channel_2_video_list_b.txt
+            fi
+        done
+        echo "file './channel_2_video_list_b.txt'" >> channel_2_video_list_a.txt
+        echo "file './channel_2_video_list_a.txt'" >> channel_2_video_list_b.txt
+    fi
+
+    sleep 1
+done

start.sh

@@ -11,15 +11,18 @@ node ./media-server.js &
 sleep 1
 
 # background process that creates an audio stream from audio files
-# bash scripts/audio.sh &
+# bash scripts/audio1.sh &
+# bash scripts/audio2.sh &
 
 # background process that creates a video stream from video files
-bash scripts/video.sh &
+bash scripts/video1.sh &
+bash scripts/video2.sh &
 
 sleep 1
 
 # background process that sends data to the media server
-bash scripts/stream.sh &
+bash scripts/stream1.sh &
+bash scripts/stream2.sh &
 
 sleep 1