up

.gitignore

@@ -8,3 +8,12 @@ models/
 sandbox/
 audio.pipe
 video.pipe
+channel_1_audio_list_a.txt
+channel_1_audio_list_b.txt
+channel_1_video_list_a.txt
+channel_1_video_list_b.txt
+
+channel_2_audio_list_a.txt
+channel_2_audio_list_b.txt
+channel_2_video_list_a.txt
+channel_2_video_list_b.txt

database.json

@@ -1,6 +1,6 @@
 {
   "version": 1,
-  "startAtShotId": "3b7fb664-f50a-4e2d-b63b-e1fedb22e501",
+  "startAtShotId": "04f48cad-9561-47ce-b975-f692ca10db27",
   "sequences": [
     {
       "sequenceId": "3b7fb664-f50a-4e2d-b63b-e1fedb22e501",

scripts/audio1.sh

@@ -4,24 +4,21 @@ echo "Starting the audio collection stream for channel 1.."
 current_count=0
 
 while true; do
-    new_count=$(ls $WEBTV_AUDIO_STORAGE_PATH_CHANNEL_1*.mp3 2> /dev/null | wc -l)
+    new_count=$(ls $WEBTV_AUDIO_STORAGE_PATH_CHANNEL_1*.m4a 2> /dev/null | wc -l)
 
     if [ $new_count -ne $current_count ]; then
         echo "there are $new_count audio files for channel 1"
 
         echo "Updating audio playlists for channel 1..."
         current_count=$new_count
-        files=($WEBTV_AUDIO_STORAGE_PATH_CHANNEL_1*.mp3)
+        files=($WEBTV_AUDIO_STORAGE_PATH_CHANNEL_1*.m4a)
         
         # Re-create the audio playlists
         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]}'" >> channel_1_audio_list_a.txt
-            else
-                echo "file '${files[$i]}'" >> channel_1_audio_list_b.txt
-            fi
+            echo "file '${files[$i]}'" >> channel_1_audio_list_a.txt
+            echo "file '${files[$i]}'" >> channel_1_audio_list_b.txt
         done
         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

scripts/audio2.sh

@@ -4,24 +4,21 @@ 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)
+    new_count=$(ls $WEBTV_AUDIO_STORAGE_PATH_CHANNEL_2*.m4a 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)
+        files=($WEBTV_AUDIO_STORAGE_PATH_CHANNEL_2*.m4a)
         
         # 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
+            echo "file '${files[$i]}'" >> channel_2_audio_list_a.txt
+            echo "file '${files[$i]}'" >> channel_2_audio_list_b.txt
         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

scripts/init.sh

@@ -8,15 +8,8 @@ mkdir -p $WEBTV_AUDIO_STORAGE_PATH_CHANNEL_1
 bash downloadmusic.sh
 
 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 '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 "ffconcat version 1.0" > channel_1_video.txt
+echo "ffconcat version 1.0" > channel_1_audio.txt
 
 # ------------- CHANNEL 2 --------------
 echo "creating the storage folders for channel 2.."
@@ -24,17 +17,5 @@ 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
+echo "ffconcat version 1.0" > channel_2_video.txt
+echo "ffconcat version 1.0" > channel_2_video.txt

scripts/stream1.sh

@@ -4,21 +4,5 @@ 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"
+    ffmpeg -y -nostdin -re -f concat -safe 0 -i channel_1_video.txt -loglevel error -c:v libx264 -preset veryfast -tune zerolatency -c:a aac -ar 44100 -f flv rtmp://localhost/live/webtv
 done

scripts/stream2.sh

@@ -4,21 +4,5 @@ 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/webtv2
-    
-    # echo "Live stream for channel 2 got interrupted, will try again in 1 sec"
+    ffmpeg -y -nostdin -re -f concat -safe 0 -i channel_2_video.txt -loglevel error -c:v libx264 -preset veryfast -tune zerolatency -c:a aac -ar 44100 -f flv rtmp://localhost/live/webtv2
 done

scripts/video1.sh

@@ -14,19 +14,10 @@ while true; do
         current_count=$new_count
         files=($WEBTV_VIDEO_STORAGE_PATH_CHANNEL_1*.mp4)
         
-        # Re-create playlists
-        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_video.txt
         for (( i=0; i<${#files[@]}; i++ )); do
-            # echo "file '${files[$i]}'"
-            if (( i%2 == 0 )); then
-                echo "file '${files[$i]}'" >> channel_1_video_list_a.txt
-            else
-                echo "file '${files[$i]}'" >> channel_1_video_list_b.txt
-            fi
+            echo "file '${files[$i]}'" >> channel_1_video.txt
         done
-        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

@@ -10,23 +10,14 @@ while true; do
     if [ $new_count -ne $current_count ]; then
         echo "there are $new_count videos files for channel 2"
 
-        echo "Updating playlists for channel 2.."
+        echo "Updating playliss 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
+
+        echo "ffconcat version 1.0" > channel_2_video.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
+            echo "file '${files[$i]}'" >> channel_2_video.txt
         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