Skip to content

Commit

Permalink
Merge pull request #107 from ThomasVon2021/video
Browse files Browse the repository at this point in the history
support mjpeg and webrtc in pi version
  • Loading branch information
ThomasVon2021 committed Dec 3, 2023
2 parents bce7cdc + cd8f091 commit d4419d3
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ blikvm_log/
# Ignore binary
*.tar.gz
release/
kvmd-main
4 changes: 2 additions & 2 deletions build.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ def main():
file_tar_name = ""
if gArgs.platform == "pi":
cmd_make += "make RPI=1 SSD1306=1"
cmd_pack += "cp package/kvmd-web/binary/pi/* release/ && cp package/ustreamer/binary/pi/* release/ && "
cmd_pack += "cp package/ustreamer/binary/pi/* release/ && "
file_tar_name = "release.tar.gz"
elif gArgs.platform == "h616":
cmd_make += "make H616=1 ST7789=1"
cmd_pack += "cp package/kvmd-web/binary/h616/* release/ && cp package/ustreamer/binary/h616/* release/ && "
cmd_pack += "cp package/ustreamer/binary/h616/* release/ && "
file_tar_name = "release-h616-v4.tar.gz"
else:
print("input error platform")
Expand Down
Binary file removed package/kvmd-web/binary/h616/kvm-link
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion package/ustreamer/kvmd-video.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ echo "Board type: $board_type"
if [[ "$board_type" == "$v2_hat" ]] || [[ "$board_type" == "$v3_pcie" ]]; then
v4l2-ctl --set-edid=file=/usr/bin/blikvm/edid.txt --fix-edid-checksums
v4l2-ctl --set-dv-bt-timings query
/usr/bin/blikvm/ustreamer.bin --device=/dev/video0 --persistent --dv-timings --format=uyvy --encoder=omx --workers=3 --quality=80 --desired-fps=30 --drop-same-frames=30 --last-as-blank=0 --h264-sink=demo::ustreamer::h264
/usr/bin/blikvm/ustreamer.bin --device=/dev/video0 --host=0.0.0.0 --port=8008 --persistent --dv-timings --format=uyvy --encoder=omx --workers=3 --quality=80 --desired-fps=30 --drop-same-frames=30 --last-as-blank=0 --h264-sink=demo::ustreamer::h264
elif [[ "$board_type" == "$v4_h616" ]]; then
# init device var
jpeg_supported_device=""
Expand Down
4 changes: 2 additions & 2 deletions src/config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": "Develop-1.3.2",
"version_int": 132,
"version": "Develop-1.3.3",
"version_int": 133,
"md5value": "",
"switch_handle":{
"switch_enable": 0,
Expand Down

0 comments on commit d4419d3

Please sign in to comment.