diff --git a/README.md b/README.md index 8d41ef1..7469ee9 100644 --- a/README.md +++ b/README.md @@ -351,6 +351,33 @@ 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! + +``` +GO2RTC_SERVER_ENABLED="true" +GO2RTC_HI_RES_ENABLED="true" +GO2RTC_HI_RES_ENABLE_AUDIO="true" +GO2RTC_LOW_RES_ENABLED="true" +GO2RTC_LOW_RES_ENABLE_AUDIO="true" +``` + +Supports: +WebRTC +HLS +RTMP +RTSP +and more + +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` + +go2rtc WebUI is located at `http://:1984` + +--- + ### mp4_write: ``` @@ -585,6 +612,8 @@ Feature supported on: ## Latest Updates +* 07-11-23: Support 30fps. Add new go2rtc server support for rtsp/hls/webrtc/etc. Make video parameters, bitrate, rcmode, and fps independent of rtsp server settings. fixed various init scripts. Recommend to start from a fresh install. +* 06-28-23: Add basic auth to web server portal, clarify v2/panv1 setup instructions, http/1.1 RFC7230 compliance * 09-27-22: Add self_hosted iCamera patch by @kohrar, fix config backup script, add ntp client on boot. * 08-07-22: Updated init.d scripts. Added syslog save feature. Fixed orientation issue on T31 devices in webcam mode. Added crontab support. * 07-25-22: Add dnsmasq local dns option in configuration to prevent dns flooding on local networks. Added web server capability for configuration and car control. diff --git a/SD_ROOT/wz_mini/etc/wz_mini.conf.dist b/SD_ROOT/wz_mini/etc/wz_mini.conf.dist index e476851..a6b98ec 100644 --- a/SD_ROOT/wz_mini/etc/wz_mini.conf.dist +++ b/SD_ROOT/wz_mini/etc/wz_mini.conf.dist @@ -36,7 +36,7 @@ ENABLE_NFSv4="false" ENABLE_RTL8189FS_DRIVER="true" ENABLE_ATBM603X_DRIVER="true" -NTP_SERVER= +NTP_SERVER="" ##### NETWORK INTERFACE BONDING ##### BONDING_ENABLED="false" @@ -58,20 +58,28 @@ RTSP_PORT="8554" RTSP_HI_RES_ENABLED="false" RTSP_HI_RES_ENABLE_AUDIO="false" -RTSP_HI_RES_FPS="" -RTSP_HI_RES_MAX_BITRATE="" -RTSP_HI_RES_TARGET_BITRATE="" -RTSP_HI_RES_ENC_PARAMETER="" RTSP_LOW_RES_ENABLED="false" RTSP_LOW_RES_ENABLE_AUDIO="false" -RTSP_LOW_RES_FPS="" -RTSP_LOW_RES_MAX_BITRATE="" -RTSP_LOW_RES_TARGET_BITRATE="" -RTSP_LOW_RES_ENC_PARAMETER="" RTSP_AUTH_DISABLE="false" +VIDEO_0_MAX_BITRATE="" +VIDEO_0_TARGET_BITRATE="" +VIDEO_0_ENC_PARAMETER="" +VIDEO_0_FPS="" + +VIDEO_1_MAX_BITRATE="" +VIDEO_1_TARGET_BITRATE="" +VIDEO_1_ENC_PARAMETER="" +VIDEO_1_FPS="" + +GO2RTC_SERVER_ENABLED="false" +GO2RTC_HI_RES_ENABLED="false" +GO2RTC_HI_RES_ENABLE_AUDIO="false" +GO2RTC_LOW_RES_ENABLED="false" +GO2RTC_LOW_RES_ENABLE_AUDIO="false" + #####RTMP STREAMING##### #### REQUIRES RTSP #### ### AND RTSP AUDIO ### @@ -109,6 +117,9 @@ ENABLE_SYSLOG_SAVE="false" ####WEB#### WEB_SERVER_ENABLED="false" +WEB_SERVER_AUTH="true" +WEB_SERVER_LOGIN="admin" +WEB_SERVER_PASSWORD="" #####SCRIPTING##### CUSTOM_SCRIPT_PATH="" diff --git a/SD_ROOT/wz_mini/usr/bin/app.ver b/SD_ROOT/wz_mini/usr/bin/app.ver index 3c9032b..ccd425f 100644 --- a/SD_ROOT/wz_mini/usr/bin/app.ver +++ b/SD_ROOT/wz_mini/usr/bin/app.ver @@ -1 +1 @@ -Wed Jun 28 08:06:57 PM PDT 2023 +Tue Jul 11 07:01:49 PM PDT 2023 diff --git a/SD_ROOT/wz_mini/wz_mini.conf b/SD_ROOT/wz_mini/wz_mini.conf index 7135d1c..a6b98ec 100644 --- a/SD_ROOT/wz_mini/wz_mini.conf +++ b/SD_ROOT/wz_mini/wz_mini.conf @@ -36,7 +36,7 @@ ENABLE_NFSv4="false" ENABLE_RTL8189FS_DRIVER="true" ENABLE_ATBM603X_DRIVER="true" -NTP_SERVER= +NTP_SERVER="" ##### NETWORK INTERFACE BONDING ##### BONDING_ENABLED="false" diff --git a/file.chk b/file.chk index 48610b9..c047180 100644 --- a/file.chk +++ b/file.chk @@ -42,17 +42,19 @@ d7707e386ca9c56722d018858ff043b6 SD_ROOT/wz_mini/etc/network.d/S16rtmp b0dbe6f42a6c5cf95c8556edfccfdf06 SD_ROOT/wz_mini/etc/network.d/S09dnsmasq b77697b15e4d6e32e6e2c8c07cbceee2 SD_ROOT/wz_mini/etc/network.d/S04wireguard 8951687f507171ad88e79ad29aba4388 SD_ROOT/wz_mini/etc/network.d/S12remoteaccessory -2d5c18ba2e49847e724b2e40709c68a6 SD_ROOT/wz_mini/etc/network.d/S15v4l2rtspserver +88cd61106fa526f82a812b02aea23ddc SD_ROOT/wz_mini/etc/network.d/S15v4l2rtspserver 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 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 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 -1b4037ffff5b86b31939ef20f2ec2a2c SD_ROOT/wz_mini/etc/init.d/S10kmod +77c2d414598fd8e7ec97341f42091ec1 SD_ROOT/wz_mini/etc/init.d/S10kmod 0e868d15fb8b09915975bab48f5a78f2 SD_ROOT/wz_mini/etc/init.d/S06car 32ddf32074637eff70a6323242cb10d7 SD_ROOT/wz_mini/etc/init.d/S18ntp 0ed5e2bce4fa5774cef30dfa276db3a8 SD_ROOT/wz_mini/etc/init.d/S30patchicamera @@ -63,7 +65,7 @@ f87cc24ebff2766fad6d52ebcbf19a0e SD_ROOT/wz_mini/etc/init.d/S11configbackup 0113d8e9beb7d393c61959889193ba0e SD_ROOT/wz_mini/etc/init.d/S01bind 74f398e735e66f91bb5ff1ea42c3760d SD_ROOT/wz_mini/etc/init.d/S03busybox a27d4a0dd6582ae51db92c35cf396ac3 SD_ROOT/wz_mini/etc/init.d/wz_init.sh -97a80881dc10548cd2b2206914baa677 SD_ROOT/wz_mini/etc/init.d/S15fwupdate +240c1c4d4fd07ec977a8fe9f7b5d7734 SD_ROOT/wz_mini/etc/init.d/S15fwupdate 93ac3cc23a532f73921244aa61b62362 SD_ROOT/wz_mini/etc/init.d/S16factorycheck c457995a14d408c18bf03c6b0d613b58 SD_ROOT/wz_mini/etc/init.d/S04model df3911f5443239982e184af022a15815 SD_ROOT/wz_mini/etc/init.d/S14terminfo @@ -73,13 +75,13 @@ ce899168f0a576809238b338dec6a666 SD_ROOT/wz_mini/etc/init.d/S02tmpfs e3034eac02d8eda9902ca9cf89f0a586 SD_ROOT/wz_mini/etc/inittab 840aa9c26726201f7cffbf001bee193a SD_ROOT/wz_mini/etc/uvc_jxf22.config d41d8cd98f00b204e9800998ecf8427e SD_ROOT/wz_mini/etc/rc.local.d/.gitignore -646b276762495f93691eaf7565a9ddcb SD_ROOT/wz_mini/etc/wz_mini.conf.dist +239ce7671549beb3faf8591bad649840 SD_ROOT/wz_mini/etc/wz_mini.conf.dist 4291fb00ec609b5b007ff9b3048e9248 SD_ROOT/wz_mini/etc/hosts 7b8db8382548ae23eaab8c53f77b305a SD_ROOT/wz_mini/etc/rc.common 8b5e58acfcbb20034dc4873a08b45fd9 SD_ROOT/wz_mini/etc/profile 574a0198606cf3a2255843cd1ed7860a SD_ROOT/wz_mini/etc/cron/root 2c2df1b9cb603f9c31c46162d6ac307f SD_ROOT/wz_mini/etc/alsa/alsa.conf -482483f68e5f41e0c3792b2e77fc1028 SD_ROOT/wz_mini/etc/rc.d/S18fps +00184c9b4016f437adcae60bae5b62ae SD_ROOT/wz_mini/etc/rc.d/S18fps 80650d58c240c642295448a72a49ad45 SD_ROOT/wz_mini/etc/rc.d/K01network ca8d8d8a60b3dc255133151ba33e0eb3 SD_ROOT/wz_mini/etc/rc.d/S17motor 03ca145794cedfe4748692dd6341839e SD_ROOT/wz_mini/etc/rc.d/S10firmware @@ -92,6 +94,7 @@ de825dae173ec43983d6ffa1a293060e SD_ROOT/wz_mini/etc/rc.d/S06networkalt 282e4e0ce3be2740403466bea0c380d9 SD_ROOT/wz_mini/etc/rc.d/S20cron c64a9651df819401b04708736c29cf30 SD_ROOT/wz_mini/etc/rc.d/S13mp4write 28ddd36f07b39500630eccd16d9938aa SD_ROOT/wz_mini/etc/rc.d/S05rndis +615e208b286b5551d406f98c6a487d64 SD_ROOT/wz_mini/etc/rc.d/S19video 8cd393bb2cda585061961dba143ae2bd SD_ROOT/wz_mini/etc/rc.d/S01swap 17ab0c2db34671e4dcc05cc4e6b440ee SD_ROOT/wz_mini/etc/rc.d/K15logging 55dfb3a95dec09663df5ae9da8e7a602 SD_ROOT/wz_mini/etc/rc.d/S21syslog @@ -117,6 +120,7 @@ ec906872794379af570869ebfd49bb23 SD_ROOT/wz_mini/bin/tcpdump db5c63af3c763fc6eb76f6e1b5c96794 SD_ROOT/wz_mini/bin/file 3feb341fca58bc705c3ed5705d4eb716 SD_ROOT/wz_mini/bin/factorycheck 8ae897298d743faae8ef27303550e42d SD_ROOT/wz_mini/bin/cmd +0548710340e1d0f6e2be0afa4890fcdd SD_ROOT/wz_mini/bin/go2rtc_linux_mipsel a9a6bf805cbcfdd6698fe5efd65f91bb SD_ROOT/wz_mini/bin/nano 36cbfe7b96d4240a6b138dd3695ccefd SD_ROOT/wz_mini/bin/strings 1458f09775917db388f807f7ac01bb65 SD_ROOT/wz_mini/bin/socat @@ -169,6 +173,7 @@ eaf86f91cb1b15b2191a8845ae88e3c8 SD_ROOT/wz_mini/usr/share/audio/init_v2.wav 02fed0e4b2382d839f630ce0477aba26 SD_ROOT/wz_mini/usr/share/audio/init.wav 5754f767c1334df202983aed2a20a050 SD_ROOT/wz_mini/usr/share/audio/binbin_v3.wav 6e01838f67f7e6e51a6891e1c411318a SD_ROOT/wz_mini/usr/share/audio/honk.wav +185e1ad831f19039e51d3637aa078f32 SD_ROOT/wz_mini/usr/bin/imp_monitor.sh 71b26aa98e14c4a1f5798b3e3a2d9bab SD_ROOT/wz_mini/usr/bin/restart_wlan0.sh ac9f3a5d097d25d5d972c3d2ad288df9 SD_ROOT/wz_mini/usr/bin/ucamera_v2 1080fd8fab00be80a333e004c6a5bd9c SD_ROOT/wz_mini/usr/bin/iCamera @@ -179,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 -d38a13473046e28f770d6276ff353ea8 SD_ROOT/wz_mini/usr/bin/app.ver +ba031bf379e2fccd609b20999ec14db1 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 @@ -329,7 +334,7 @@ c6a2e765996b4a8bfe351757785fb989 SD_ROOT/wz_mini/lib/modules/3.10.14__isvp_swan 46791b695c5acd7d813f2a7198790a8a SD_ROOT/wz_mini/lib/libcallback_t20.so bd383994491e4bdca81788c168feb2eb SD_ROOT/wz_mini/lib/libasound.so.2 f6f0d5a9ebd916de6bdb9695067809ae SD_ROOT/wz_mini/lib/libaudioProcess.so -dc9dfb201707e363a2a207f44bfe8ca6 SD_ROOT/wz_mini/wz_mini.conf +239ce7671549beb3faf8591bad649840 SD_ROOT/wz_mini/wz_mini.conf d41d8cd98f00b204e9800998ecf8427e SD_ROOT/wz_mini/tmp/.gitignore 283fca97d62c1c199eb2b04877998879 v2_install/compile_image.sh 53db8da5b90bc9b219dbb1d58e934bda v2_install/fw_tool.sh