switch to custom tinyplay

Makefile

@@ -3,11 +3,15 @@ all: jni/*
 
 install: all
 	install -d ipk/airunit/data/opt/etc/preload.d/
-	install libs/armeabi-v7a/lib*.so ipk/airunit/data/opt/etc/preload.d/
+	install -d ipk/glasses/data/opt/etc/preload.d/
+	install libs/armeabi-v7a/liblive_audio_v2_au.so ipk/airunit/data/opt/etc/preload.d/
+	install libs/armeabi-v7a/libtinyalsa.so ipk/glasses/data/opt/etc/preload.d/
+	install libs/armeabi-v7a/tinyplay_udp ipk/glasses/data/opt/bin/
 
 ipk: all
 	$(MAKE) -C ipk clean
 	$(MAKE) install	
+	chmod +x ipk/glasses/data/opt/bin/tinyplay_udp
 	$(MAKE) -C ipk
 	mv ipk/airunit/*.ipk ./
 	mv ipk/glasses/*.ipk ./
@@ -17,4 +21,6 @@ clean:
 	rm -f *.ipk
 	rm -rf libs
 	rm -rf obj
-	rm ipk/airunit/data/opt/etc/preload.d/liblive_audio_v2_au.so
+	rm ipk/airunit/data/opt/etc/preload.d/liblive_audio_v2_au.so
+	rm ipk/glasses/data/opt/etc/preload.d/libtinyalsa.so
+	rm ipk/glasses/data/opt/bin/tinyplay_udp

ipk/airunit/control/control

@@ -1,5 +1,5 @@
 Package: live-audio-v2-airside
-Version: 0.0.4
+Version: 0.0.5
 Maintainer: funnel
 Description: Live audio V2 airside.
 Homepage: https://github.com/funneld/djifpv_live_audio_V2

ipk/airunit/data/opt/bin/live_audio_v2_airside.sh

@@ -5,7 +5,8 @@ if grep -q "WM150" /system/etc/dji.json; then
 		echo "SD card found. Live audio will start only while recording."
 	else
 		echo "No SD card found. Start tinycap."
-		LD_PRELOAD="/opt/etc/preload.d/liblive_audio_v2_au.so" tinycap /dev/null -r 48000 -b 16
+		sleep 3
+		LD_PRELOAD="/opt/etc/preload.d/liblive_audio_v2_au.so" tinycap /dev/null -r 48000 -b 16 > /dev/null 2>&1
 	fi
 else
 	echo "Airunit not compatible. Exit."

ipk/glasses/control/control

@@ -1,7 +1,7 @@
 Package: live-audio-v2-glasses
-Version: 0.0.2
+Version: 0.0.3
 Maintainer: funnel
 Description: Live audio V2.
 Homepage: https://github.com/funneld/djifpv_live_audio_V2
 Architecture: pigeon-glasses
-Depends: dinit, ffmpeg
+Depends: dinit

ipk/glasses/data/opt/bin/live_audio_v2_glasses.sh

@@ -1,4 +1,4 @@
 #!/system/bin/sh
 
-mkfifo /tmp/audiopipe
-ffmpeg -y -probesize 32 -fflags nobuffer -flags low_delay -err_detect aggressive -fflags discardcorrupt -f u16le -ar 48000 -ac 2 -i udp://localhost:45151 -f u16le /tmp/audiopipe | tinyplay /tmp/audiopipe -i raw -d 0 -r 48000 -b 16 -c 2
+sleep 5
+LD_PRELOAD="/opt/etc/preload.d/libtinyalsa.so" /opt/bin/tinyplay_udp > /dev/null 2>&1

jni/Android.mk

@@ -1,12 +1,24 @@
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
-
-LOCAL_CFLAGS += -fPIC -std=c99
+LOCAL_CFLAGS += -fPIC -std=c99 -O3
 LOCAL_LDFLAGS += -fPIC 
 LOCAL_LDLIBS := -llog
-
 LOCAL_MODULE    := live_audio_v2_au 
 LOCAL_SRC_FILES := live_audio_v2_au.c
+include $(BUILD_SHARED_LIBRARY)
 
+include $(CLEAR_VARS)
+LOCAL_CFLAGS += -fPIC -std=c99 -O3
+LOCAL_LDFLAGS += -fPIC
+LOCAL_SRC_FILES:= tinyalsa/mixer.c tinyalsa/pcm.c
+LOCAL_MODULE := libtinyalsa
 include $(BUILD_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_CFLAGS += -fPIC -std=c99 -O3
+LOCAL_LDFLAGS += -fPIC
+LOCAL_SRC_FILES:= tinyplay_udp.c
+LOCAL_MODULE := tinyplay_udp
+LOCAL_SHARED_LIBRARIES:= libtinyalsa
+include $(BUILD_EXECUTABLE)