common.sh

@@ -28,10 +28,6 @@ SetupHistory () {
 	echo "${HISTORY_SETUP}" | sqlite3 "${HISTORY}"
 }
 
-WipeHistory () {
-	rm -f "${HISTORY}"
-}
-
 SetupPlayback () {
 	echo "${PLAYBACK_SETUP}" | sqlite3 "${PLAYBACK}"
 }
@@ -40,15 +36,6 @@ WipePlayback () {
 	rm -f "${PLAYBACK}"
 }
 
-GetRandom () {
-	QUERY="SELECT video FROM playback ORDER BY RANDOM() LIMIT 1;"
-	sqlite3 "${HISTORY}" "${QUERY}"
-}
-
-UpdateHistory () {
-	QUERY="INSERT INTO"
-}
-
 PDB () {
 	sqlite3 "${PLAYBACK}" "${1}"
 }
@@ -56,4 +43,3 @@ PDB () {
 HDB () {
 	sqlite3 "${HISTORY}" "${1}"
 }
-

encode.sh

@@ -11,34 +11,21 @@ if [ ${count} == 0 ]; then
 	exit 1
 fi
 
-SCALE="-filter_complex scale=${WIDTH}:${HEIGHT}:force_original_aspect_ratio=decrease,pad=${WIDTH}:${HEIGHT}:(ow-iw)/2:(oh-ih)/2"
+SCALE="scale=${WIDTH}:${HEIGHT}:force_original_aspect_ratio=decrease,pad=${WIDTH}:${HEIGHT}:(ow-iw)/2:(oh-ih)/2"
-HWENCODE="-hwaccel auto"
-SILENT="-loglevel quiet -stats"
-
-if [[ "${BUG}" != "" ]]; then
-	SCALE="-i ${BUG} -filter_complex [0]scale=${WIDTH}:${HEIGHT}:force_original_aspect_ratio=decrease,pad=${WIDTH}:${HEIGHT}:(ow-iw)/2:(oh-ih)/2,overlay=x=0:y=0[out] -map [out]"
-fi
 
 Encode () {
 	name=$(basename "${1}")
 	nameNoExt=${name%.*}
 	now=$(date '+%s')
-	output="${VIDEOS}/${nameNoExt}_${now}.mkv"
+	output="${VIDEOS}/${nameNoExt}_${now}.flv"
-	#echo $output
+	if [ -f "${VIDEOS}/${nameNoExt}"*".flv" ]; then
-	if [ -f "${VIDEOS}/${nameNoExt}"*".mkv" ]; then
 		echo "File ${name} already exists"
 		return
 	fi
 	echo "Encoding ${name}..."
-	if [[ "${name}" == *".jpg" ]] || [[ "${name}" == *".jpeg" ]] || [[ "${name}" == *".png" ]]; then
+	ffmpeg -i "${1}" -c:v libx264 -tune zerolatency -pix_fmt yuv420p -vf "${SCALE}" \
-	ffmpeg -nostdin -loop 1 -t 30 -i "${1}" ${SCALE} -c:v libx264 -tune zerolatency -pix_fmt yuv420p -r 30 -t 30  \
+		-c:a aac -b:a 190k -ac 2 -ar 44100 \
-		-an ${SILENT} \
+		-f flv "${output}"
-		 "${output}"
-	else
-		ffmpeg -nostdin ${HWENCODE} -i "${1}" ${SCALE} -c:v libx264 -tune zerolatency -pix_fmt yuv420p \
-			-c:a aac -b:a 190k -ac 2 -ar 44100 \
-			-f flv ${SILENT} "${output}"
-	fi
 }
 
 fileList=$(mktemp)

nginx-rtmp.conf

@@ -1,21 +0,0 @@
-
-rtmp {
-  server {
-    listen 1935;
-
-    application live {
-      # Enable livestreaming
-      live on;
-
-      # Disable recording
-      record off;
-
-      # Allow only this machine to play back the stream
-      allow play 127.0.0.1;
-      deny play all;
-
-      # Start omxplayer and play the stream out over HDMI
-      #exec /home/pi/stream.sh $name;
-    }
-  }
-}

playlist.sh

@@ -1,22 +0,0 @@
-#!/bin/bash
-
-set -e
-
-source ./common.sh
-
-fileList=$(mktemp)
-shuffleList=$(mktemp)
-
-ls -1 "${VIDEOS}/" > "${fileList}"
-rm -rf playlist.txt
-
-count=10
-for i in $(seq $count); do
-	cat "${fileList}" | shuf > "${shuffleList}"
-	while read videoIn; do
-		echo "file '${VIDEOS}/${videoIn}'" >> playlist.txt
-	done < "${shuffleList}"
-done
-
-rm -f "${fileList}"
-rm -f "${shuffleList}"

setup_raspi.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-################################################
-#
-# Works with 2020-02-13-raspbian-buster-lite.zip
-#
-################################################
-
-sudo apt update -y
-sudo apt upgrade -y
-sudo apt install -y git curl omxplayer nginx libnginx-mod-rtmp
-sudo apt autoremove
-
-sudo cat ./nginx-rtmp.conf >> /etc/nginx/nginx.conf

stream.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -e
-
-source ./common.sh
-
-ffmpeg -re -f concat -safe 0 -stream_loop -1 -i playlist.txt -c copy -f flv "${DESTINATION}"

tv.sh

@@ -26,6 +26,7 @@ AllFiles () {
 	echo "${fileList}"
 }
 
+
 SetupHistory
 WipePlayback
 SetupPlayback
@@ -36,16 +37,11 @@ while true; do
 	files=$(AllFiles)
 	fileCount=$(cat "${files}" | wc -l)
 	playbackCount=$(PDB "SELECT COUNT(*) FROM playback")
+
 	if [ ${fileCount} -eq 0 ]; then
 		echo "No files to play :("
 		break
 	fi
-	if [ ${playbackCount} -eq 0 ]; then
-		WipeHistory
-		SetupHistory
-		continue
-	fi
-
 	break
 done