Merge branch 'OpenIPC:master' into master

README.md

@@ -31,6 +31,8 @@ OpenIPC Wiki
 - [Wireless settings](en/wireless-settings.md)
 - [System features](en/system-features.md)
 - [Majestic streamer](en/majestic-streamer.md)
+- [Majestic example config](en/majestic-config.md)
+- [Majestic usage research](en/majestic-research.md)
 - [Web interface](en/web-interface.md)
 - [Upgrade firmware](en/sysupgrade.md)
 - [Image quality tuning](en/image-quality-tuning.md)

en/faq.md

@@ -27,6 +27,7 @@ and then look it up in the [FCC ID database](https://fccid.io/).
 - MQTT (telemetry) support
 - WiFi support
 - lame (mp3) and libwebsockets support
+- experimental WebRTC support (only recent Hisi/Goke)
 
 
 ### How to strip U-Boot Image wrapper header from a binary image

en/fpv-gs-ubuntu.md

@@ -15,17 +15,7 @@ Video version: - [OpenIPC - Prepare GroundStation: Ubuntu + QGroundControl](http
 sudo apt update
 ```
 ```
-sudo apt install dkms git python3-all-dev net-tools virtualenv fakeroot debhelper python3-twisted
- libpcap-dev python3-pyroute2 python3-future python3-configparser python3-all libsodium-dev
-```
-
-### Libsodium
-```
-git clone https://github.com/jedisct1/libsodium --branch stable
-cd libsodium
-./configure
-make && make check
-sudo make install
+sudo apt install dkms git python3-all-dev net-tools virtualenv fakeroot debhelper python3-twisted libpcap-dev python3-pyroute2 python3-future python3-all libsodium-dev
 ```
 
 ### Wifi card driver
@@ -62,7 +52,7 @@ systemctl start wifibroadcast@gs
 
 ### Qground control manual
 
-- https://docs.qgroundcontrol.com/master/en/getting_started/download_and_install.html
+- https://docs.qgroundcontrol.com/master/en/qgc-user-guide/getting_started/download_and_install.html
 
 ### Get last logs from service
 ```

en/fpv-openipc-aio-mario.md

@@ -80,7 +80,7 @@ then open ssh to connect AIO address:192.168.1.10
 user:root password:12345
 
 
-### Upgrade furmware
+### Upgrade firmware
 
 Update firmware possible via SD card or just use win scp drug the rootfs and kernel files to /tmp
 
@@ -90,6 +90,10 @@ sysupgrade -n -z --kernel=/tmp/uImage.ssc338q --rootfs=/tmp/rootfs.squashfs.ssc3
 
 You can [download](https://github.com/OpenIPC/wiki/blob/master/en/fpv-openipc-aio-ultrasight.md#software) firmware via the link that is used for online updates.
 
+You can also read the current discussions and suggestions here:
+
+- https://t.me/c/1809358416/98818/103632
+- https://t.me/c/1809358416/98818/108052
 
 Or just use the configurator - https://github.com/OpenIPC/configurator
 

en/majestic-config.md

@@ -1,3 +1,8 @@
+# OpenIPC Wiki
+[Table of Content](../README.md)
+
+Majestic example config
+-----------------------
 ```
 system:
   webPort: 80
@@ -17,6 +22,9 @@ isp:
   #iqProfile: <path/to/file>
   #lowDelay: false
   #awbMode: auto
+  #memMode: reduction
+  #slowShutter: disabled
+  #dis: false
 
 image:
   mirror: false
@@ -34,7 +42,7 @@ video0:
   fps: 20
   bitrate: 4096
   rcMode: vbr
-  gopSize: 1
+  gopSize: 1.0
   #gopMode: normal
   #crop: 0x0x960x540
   #sliceUnits: 4
@@ -51,12 +59,8 @@ jpeg:
   enabled: true
   qfactor: 50
   fps: 5
-  #size: 1920x1080
-
-#mjpeg:
-  #size: 1280x720
-  #fps: 5
-  #bitrate: 1024
+  #size: 160x120
+  rtsp: false
 
 osd:
   enabled: false
@@ -81,7 +85,7 @@ rtsp:
   port: 554
 
 nightMode:
-  enabled: false
+  lightMonitor: true
   #irCutPin1: 1
   #irCutPin2: 2
   irCutSingleInvert: false
@@ -90,8 +94,8 @@ nightMode:
   #overrideDrc: 300
   #minThreshold: 2000
   #maxThreshold: 5000
-  #irSensorPin: 62
-  irSensorPinInvert: false
+  #lightSensorPin: 62
+  lightSensorPinInvert: false
   #dncDelay: 30
 
 motionDetect:

en/majestic-research.md

@@ -0,0 +1,28 @@
+# OpenIPC Wiki
+[Table of Content](../README.md
+
+Majestic Usage Research
+-----------------------
+
+### RTMP services
+
+- [go2rtc](https://github.com/AlexxIT/go2rtc)
+- [libnginx-mod-rtmp](https://github.com/arut/nginx-rtmp-module)
+- [MediaMTX](https://github.com/bluenviron/mediamtx)
+- [OvenMediaEngine](https://github.com/AirenSoft/OvenMediaEngine)
+- [HappyTime Media Server](https://www.happytimesoft.com/products/media-server/index.html)
+- [OSS SRS](https://ossrs.io/)
+- [Wowza](https://www.wowza.com/)
+
+### Testing
+
+```
+SRS:
+docker run --rm -it -p 1935:1935 -p 1985:1985 -p 8080:8080 ossrs/srs:6 objs/srs -c conf/docker.conf
+
+Outgoing (with H265 codec):
+rtmp://192.168.1.85/openipc/live
+
+FFMpeg:
+ffplay rtmp://192.168.1.85/openipc/live
+```

en/package-vtun.md

@@ -141,3 +141,19 @@ E60BFB000001 {
 }
 #
 ```
+
+### Alternative
+
+```
+#!/bin/sh -x
+
+curl -L -o vtun_3.0.4.orig.tar.gz http://archive.ubuntu.com/ubuntu/pool/universe/v/vtun/vtun_3.0.4.orig.tar.gz
+tar xvfz vtun_3.0.4.orig.tar.gz
+curl -L -o vtun_3.0.4-2build1.debian.tar.xz http://archive.ubuntu.com/ubuntu/pool/universe/v/vtun/vtun_3.0.4-2build1.debian.tar.xz
+tar xvfJ vtun_3.0.4-2build1.debian.tar.xz
+cd vtun-3.0.4
+cat ../debian/patches/*.patch | patch -p 1
+./configure --build=x86_64-linux-gnu --disable-lzo --disable-zlib --disable-ssl --prefix=''
+make && strip vtund && cp vtund ../ && cd -
+rm -rf vtun_3.0.4.orig.tar.gz vtun_3.0.4-2build1.debian.tar.xz debian vtun-3.0.4
+```