diff --git a/.config b/.config index 66ba78d..1ed3372 100644 --- a/.config +++ b/.config @@ -1 +1 @@ -hailort_version=4.12.0 +hailort_version=4.12.1 diff --git a/README.rst b/README.rst index 1e863c1..4066bd8 100644 --- a/README.rst +++ b/README.rst @@ -58,7 +58,7 @@ Prerequisites .. note:: - This version is compatible with HailoRT v4.12.0. + This version is compatible with HailoRT v4.12.1. Installation @@ -382,6 +382,12 @@ Our VMS reference application demonstrates the use of 5 networks over multiple s Changelog ---------- +**v3.23.1 (February 2023)** + +* Updated to HailoRT 4.12.1 +* Fixed a documentation mistake in `Writing your own Python postprocess `_ + + **v3.23.0 (December 2022)** * New Apps: diff --git a/apps/gstreamer/general/multistream_detection/multi_stream_detection.sh b/apps/gstreamer/general/multistream_detection/multi_stream_detection.sh index 81c2dd8..2f91960 100755 --- a/apps/gstreamer/general/multistream_detection/multi_stream_detection.sh +++ b/apps/gstreamer/general/multistream_detection/multi_stream_detection.sh @@ -19,7 +19,6 @@ function init_variables() { compositor_locations="sink_0::xpos=0 sink_0::ypos=0 sink_1::xpos=640 sink_1::ypos=0 sink_2::xpos=1280 sink_2::ypos=0 sink_3::xpos=1920 sink_3::ypos=0 sink_4::xpos=0 sink_4::ypos=640 sink_5::xpos=640 sink_5::ypos=640 sink_6::xpos=1280 sink_6::ypos=640 sink_7::xpos=1920 sink_7::ypos=640 sink_8::xpos=0 sink_8::ypos=1280 sink_9::xpos=640 sink_9::ypos=1280 sink_10::xpos=1280 sink_10::ypos=1280 sink_11::xpos=1920 sink_11::ypos=1280 sink_12::xpos=0 sink_12::ypos=1920 sink_13::xpos=640 sink_13::ypos=1920 sink_14::xpos=1280 sink_14::ypos=1920 sink_15::xpos=1920 sink_15::ypos=1920" print_gst_launch_only=false video_sink_element=$([ "$XV_SUPPORTED" = "true" ] && echo "xvimagesink" || echo "ximagesink") - video_sink="fpsdisplaysink video-sink=$video_sink_element text-overlay=false" json_config_path=$DEFAULT_JSON_CONFIG_PATH } @@ -32,7 +31,6 @@ function print_usage() { echo " --set-live-source LIVE_SOURCE Use the live source given (example: /dev/video2). this flag is optional. if it's in use, num_of_sources is limited to 4." echo " --num-of-sources NUM Setting number of sources to given input (default value is 12, maximum value is 16)" echo " --print-gst-launch Print the ready gst-launch command without running it" - echo " --tcp-address If specified, set the sink be a TCP (expected format is 'host:port')" exit 0 } @@ -64,14 +62,6 @@ function parse_args() { shift echo "Setting number of sources to $1" num_of_src=$1 - elif [ "$1" = "--tcp-address" ]; then - tcp_host=$(echo $2 | awk -F':' '{print $1}') - tcp_port=$(echo $2 | awk -F':' '{print $2}') - bitrate=$(python3 "$TAPPAS_WORKSPACE/scripts/misc/get_max_bitrate.py" -v "$RESOURCES_DIR/detection0.mp4") - video_sink="queue name=queue_before_sink leaky=no max-size-buffers=30 max-size-bytes=0 max-size-time=0 ! \ - x264enc speed-preset=ultrafast bitrate=$bitrate ! \ - queue max-size-bytes=0 max-size-time=0 ! matroskamux ! tcpclientsink host=$tcp_host port=$tcp_port" - shift else echo "Received invalid argument: $1. See expected arguments below:" print_usage @@ -124,8 +114,8 @@ function main() { streamiddemux name=sid compositor name=comp start-time-selection=0 $compositor_locations ! \ queue name=hailo_video_q_0 leaky=no max-size-buffers=30 max-size-bytes=0 max-size-time=0 ! \ videoconvert ! queue name=hailo_display_q_0 leaky=no max-size-buffers=30 max-size-bytes=0 max-size-time=0 ! \ - $video_sink name=hailo_display sync=false ${additonal_parameters} \ - $sources" + fpsdisplaysink video-sink=$video_sink_element name=hailo_display sync=false text-overlay=false \ + $sources ${additonal_parameters}" echo ${pipeline} if [ "$print_gst_launch_only" = true ]; then diff --git a/core/hailo/meson.build b/core/hailo/meson.build index 79b319c..8707f3d 100644 --- a/core/hailo/meson.build +++ b/core/hailo/meson.build @@ -1,7 +1,7 @@ # Project Declaration project('gst-hailo-tools', 'c', 'cpp', - version : '3.23.0', + version : '3.23.1', default_options : [ 'warning_level=1', 'buildtype=debugoptimized', 'c_std=c11', 'cpp_std=c++17'] diff --git a/docs/write_your_own_application/write-your-own-python-postprocess.rst b/docs/write_your_own_application/write-your-own-python-postprocess.rst index 3b0ee18..90236a7 100644 --- a/docs/write_your_own_application/write-your-own-python-postprocess.rst +++ b/docs/write_your_own_application/write-your-own-python-postprocess.rst @@ -108,7 +108,7 @@ You can also add objects to detections: # Now, Adds a face to the person, at the top of the person. (normalized only) face_bbox = hailo.HailoBBox(xmin=0.0, ymin=0.0, width=1, height=0.2) face = hailo.HailoDetection(bbox=face_bbox, label='face', confidence=0.84) - person.add_detection(face) + person.add_object(face) # No need to add the face to the roi because it is already in the person that is in the roi. Next Steps diff --git a/install.sh b/install.sh index ec2a4c5..f4dafd3 100755 --- a/install.sh +++ b/install.sh @@ -62,7 +62,7 @@ function python_venv_create_and_install() { fi # Install pip packages & Call the downloader script - pip3 install --upgrade pip setuptools + pip3 install --upgrade pip 'setuptools<=66.0.0' pip3 install -r $TAPPAS_WORKSPACE/core/requirements/requirements.txt pip3 install -r $TAPPAS_WORKSPACE/core/requirements/gstreamer_requirements.txt pip3 install -r $TAPPAS_WORKSPACE/downloader/requirements.txt