go2rtc: update ffmpeg version, include libopus, enable audio in go2rtc config

README.md

@@ -353,7 +353,6 @@ Huge credit to @mnakada for his libcallback library: [https://github.com/mnakada
 
 ### go2rtc streaming server:
 #### EXPERIMENTAL:
-#### AUDIO DOES NOT WORK YET!
 
 Included go2rtc streaming server by @AlexxIT.  Thank You!
 
@@ -371,6 +370,7 @@ HLS
 RTMP
 RTSP
 and more
+libopus & aac audio
 
 See [https://github.com/AlexxIT/go2rtc](https://github.com/AlexxIT/go2rtc) for details on how to configure.  Config file is located at `/opt/wz_mini/etc/go2rtc.yml`
 

SD_ROOT/wz_mini/etc/go2rtc.yml

@@ -11,8 +11,10 @@ ffmpeg:
 streams:
   1080p:
   - exec:ffmpeg -fflags +genpts+flush_packets+nobuffer+bitexact -flags +low_delay -thread_queue_size 100 -analyzeduration 50 -probesize 50 -pix_fmt yuv420p -r 30 -i /dev/video1  -flags +global_header -movflags +empty_moov+default_base_moof+frag_keyframe -framerate 30 -video_size 1920x1080 -pix_fmt yuv420p -c:v copy -copyts -rtsp_transport tcp -f rtsp {output}
-#  - exec:ffmpeg -hide_banner -f alsa -ac 1 -i default -c:a libopus  -ac:a 2 -c:v copy -f rtsp {output}
+  - exec:ffmpeg -hide_banner -f alsa -ac 1 -i hw:0,0 -c:a libopus -filter:a volume=5 -movflags +empty_moov+default_base_moof+frag_keyframe -muxdelay 0 -muxpreload 0 -ac:a 1 -c:v copy -f rtsp {output}
-
+  - exec:ffmpeg -hide_banner -f alsa -ac 1 -i hw:0,0 -c:a aac -filter:a volume=5 -movflags +empty_moov+default_base_moof+frag_keyframe -muxdelay 0 -muxpreload 0 -ac:a 1 -c:v copy -f rtsp {output}
   360p:
   - exec:ffmpeg -fflags +genpts+flush_packets+nobuffer+bitexact -flags +low_delay -thread_queue_size 100 -analyzeduration 50 -probesize 50 -pix_fmt yuv420p -r 30 -i /dev/video2 -framerate 30 -video_size 640x360 -pix_fmt yuv420p -c:v copy -copyts -rtsp_transport tcp -f rtsp {output}
-#  - exec:ffmpeg -hide_banner -f alsa -ac 1 -i default -c:a libopus  -ac:a 2 -c:v copy -f rtsp {output}
+  - exec:ffmpeg -hide_banner -f alsa -ac 1 -i hw:2,0 -c:a libopus -filter:a volume=5 -movflags +empty_moov+default_base_moof+frag_keyframe -muxdelay 0 -muxpreload 0 -ac:a 1 -c:v copy -f rtsp {output}
+  - exec:ffmpeg -hide_banner -f alsa -ac 1 -i hw:2,0 -c:a aac -filter:a volume=5 -movflags +empty_moov+default_base_moof+frag_keyframe -muxdelay 0 -muxpreload 0 -ac:a 1 -c:v copy -f rtsp {output}
+

SD_ROOT/wz_mini/etc/network.d/S17go2rtc

@@ -89,9 +89,11 @@ case "$1" in
 
 		if [[ "$GO2RTC_LOW_RES_ENABLED" == "true" ]] || [[ "$GO2RTC_HI_RES_ENABLED" == "true" ]]; then
 			echo "delay go2rtc for iCamera"
+
 			#This delay is required. Sometimes, if you start the go2rtc server too soon, live view will break on the app.
 			sleep 5
 
+                        export ALSA_CONFIG_PATH=/opt/wz_mini/etc/alsa/alsa.conf
 			/opt/wz_mini/bin/go2rtc_linux_mipsel -config /opt/wz_mini/etc/go2rtc.yml > $GO2RTC.log 2>&1 &
 
 		fi

SD_ROOT/wz_mini/usr/bin/app.ver

@@ -1 +1 @@
-Tue Jul 11 07:22:39 PM PDT 2023
+Tue Jul 11 11:00:28 PM PDT 2023

file.chk

@@ -47,10 +47,10 @@ d3ac671f88b6d639926b9f5f9a40da6e  SD_ROOT/wz_mini/etc/network.d/S01wlanhw
 d5a84c3d3143938e40a13a2d30f85945  SD_ROOT/wz_mini/etc/network.d/S10httpd
 9969970dc82daa31b41730ee460514b0  SD_ROOT/wz_mini/etc/network.d/S03ipv6
 edebe65d895650235f05291618814ebe  SD_ROOT/wz_mini/etc/network.d/S08hostname
-dbc44226793b49c7c4215da54d94ce27  SD_ROOT/wz_mini/etc/network.d/S17go2rtc
+45a812a7d0863930df6a85da1bf524a8  SD_ROOT/wz_mini/etc/network.d/S17go2rtc
 9f59e3c2c3a4c9b6600eb5385e29720c  SD_ROOT/wz_mini/etc/network.d/S14storemac
 32373fa3531a11c1aad41d12830b9c04  SD_ROOT/wz_mini/etc/dnsmasq.conf
-28445ab9f16c727c3d06e0db88261dd9  SD_ROOT/wz_mini/etc/go2rtc.yml
+74b199bb0ee7987912b98e5cb785cec2  SD_ROOT/wz_mini/etc/go2rtc.yml
 34c6a4c3a941ff2becd9f487826d7692  SD_ROOT/wz_mini/etc/uvc.config
 071acd61334923a9a3e5b799e012697e  SD_ROOT/wz_mini/etc/init.d/S09firstboot
 f87cc24ebff2766fad6d52ebcbf19a0e  SD_ROOT/wz_mini/etc/init.d/S11configbackup
@@ -144,7 +144,7 @@ b3ff7a1d56ccd35b40c3260a4f6e9235  SD_ROOT/wz_mini/bin/dnsmasq
 c23e3da466dc9701bee036ec034583b7  SD_ROOT/wz_mini/bin/rsync
 ff5a2354e4be9cc244f3ac8f304e930a  SD_ROOT/wz_mini/bin/size
 a8970288e72c871bff6a4484f1e733d6  SD_ROOT/wz_mini/bin/readelf
-41b56bb30f02bce5f5e2598073151e16  SD_ROOT/wz_mini/bin/ffmpeg
+5afdeb9ccaecbca45c3e396be9df7fc4  SD_ROOT/wz_mini/bin/ffmpeg
 e37474a12d76cae16336476cba61e8b8  SD_ROOT/wz_mini/bin/neofetch
 7fcc716cda1e024dae1045050a135beb  SD_ROOT/wz_mini/bin/audioplay_t31
 92d7c4d24c957f2dd1b93ce5a6bcd5aa  SD_ROOT/wz_mini/bin/upgrade-run.sh
@@ -184,7 +184,7 @@ b339aee882a5d1c943ad08e4282ec3fd  SD_ROOT/wz_mini/usr/bin/iCamera-dbg
 b10bdd54c56d8d8de2a27336f17285fe  SD_ROOT/wz_mini/usr/bin/patch_icamera.sh
 dafffcc1bd1e721d508400686338ceb8  SD_ROOT/wz_mini/usr/bin/imp_helper.sh
 580b1b6e91e72b4a4fef7b21d8954403  SD_ROOT/wz_mini/usr/bin/getSensorType
-77d4a40329039fa1b64e5a651169d451  SD_ROOT/wz_mini/usr/bin/app.ver
+221c07c0064dd14a974bddf1826f6e6c  SD_ROOT/wz_mini/usr/bin/app.ver
 4c780f0455481d106d47d89f0ae04ed5  SD_ROOT/wz_mini/lib/uClibc.tar
 9afeb088e4cbabbe0b04033b560204d0  SD_ROOT/wz_mini/lib/libimp.so
 4100755cb6cc6e3b76da20c7e3690e16  SD_ROOT/wz_mini/lib/libalog.so