Skip to content

Commit cc1cc5c

Browse files
committed
Use stream-snap-mqtt from v4l2-mpp
1 parent e424deb commit cc1cc5c

File tree

4 files changed

+11
-15
lines changed

4 files changed

+11
-15
lines changed

.github/workflows/build.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ jobs:
1414
steps:
1515
- name: Checkout
1616
uses: actions/checkout@v3
17+
with:
18+
fetch-depth: 0
19+
submodules: recursive
1720

1821
- name: Load values vars.mk
1922
run: cat vars.mk >> "$GITHUB_ENV"

overlays/camera-new/root/etc/init.d/S99v4l2-mpp-mipi

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ CMD_CAPTURE_ARGS="--device /dev/video11 --format nv12 --jpeg-quality 7 --jpeg-so
88
CMD_HTTP=/usr/local/bin/stream-http.py
99
CMD_HTTP_ARGS="--jpeg-sock /tmp/capture-mipi-jpeg.sock --mjpeg-sock /tmp/capture-mipi-mjpeg.sock --h264-sock /tmp/capture-mipi-h264.sock --bind 127.0.0.1"
1010

11-
CMD_MQTT=/usr/local/bin/stream-mqtt.py
12-
CMD_MQTT_ARGS="--jpeg-sock /tmp/capture-mipi-jpeg.sock --publish-dir /home/lava/printer_data/camera"
11+
CMD_SNAP_MQTT=/usr/local/bin/stream-snap-mqtt.py
12+
CMD_SNAP_MQTT_ARGS="--jpeg-sock /tmp/capture-mipi-jpeg.sock --publish-dir /home/lava/printer_data/camera"
1313

1414
start() {
1515
if [ ! -e /dev/video11 ]; then
@@ -25,14 +25,14 @@ start() {
2525
start-stop-daemon -S -b -q -m -p /var/run/stream-mipi-http.pid -c lava -x /usr/bin/python3 -- $CMD_HTTP $CMD_HTTP_ARGS
2626
echo "OK"
2727

28-
printf "Starting stream-mqtt: "
29-
start-stop-daemon -S -b -q -m -p /var/run/stream-mipi-mqtt.pid -c lava -x /usr/bin/python3 -- $CMD_MQTT $CMD_MQTT_ARGS
28+
printf "Starting stream-snap-mqtt: "
29+
start-stop-daemon -S -b -q -m -p /var/run/stream-mipi-snap-mqtt.pid -c lava -x /usr/bin/python3 -- $CMD_SNAP_MQTT $CMD_SNAP_MQTT_ARGS
3030
echo "OK"
3131
}
3232

3333
stop() {
34-
printf "Stopping stream-mqtt: "
35-
start-stop-daemon -K -q -p /var/run/stream-mipi-mqtt.pid
34+
printf "Stopping stream-snap-mqtt: "
35+
start-stop-daemon -K -q -p /var/run/stream-mipi-snap-mqtt.pid
3636
echo "OK"
3737

3838
printf "Stopping stream-http: "

overlays/camera-new/root/etc/init.d/S99v4l2-mpp-usb

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,9 @@ start() {
2121
printf "Starting stream-http: "
2222
start-stop-daemon -S -b -q -m -p /var/run/stream-usb-http.pid -c lava -x /usr/bin/python3 -- $CMD_HTTP $CMD_HTTP_ARGS
2323
echo "OK"
24-
25-
printf "Starting stream-mqtt: "
26-
start-stop-daemon -S -b -q -m -p /var/run/stream-usb-mqtt.pid -c lava -x /usr/bin/python3 -- $CMD_MQTT $CMD_MQTT_ARGS
27-
echo "OK"
2824
}
2925

3026
stop() {
31-
printf "Stopping stream-mqtt: "
32-
start-stop-daemon -K -q -p /var/run/stream-usb-mqtt.pid
33-
echo "OK"
34-
3527
printf "Stopping stream-http: "
3628
start-stop-daemon -K -q -p /var/run/stream-usb-http.pid
3729
echo "OK"

overlays/camera-new/scripts/01-v4l2-mpp.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ set -eo pipefail
1212
TARGET_DIR="$ROOT_DIR/tmp/v4l2-mpp"
1313

1414
if [[ ! -d "$TARGET_DIR" ]]; then
15-
git clone https://github.com/paxx12/v4l2-mpp.git "$TARGET_DIR"
15+
git clone https://github.com/paxx12/v4l2-mpp.git "$TARGET_DIR" --recursive
16+
git -C "$TARGET_DIR" checkout 3ab6a4b1933496f52ff883301de1b34371881538
1617
fi
1718

1819
echo ">> Compiling MPP library..."

0 commit comments

Comments
 (0)