From 641d16ece2288bd7652cd6a77205889bf5bc7210 Mon Sep 17 00:00:00 2001 From: Ivan Kud Date: Mon, 10 Jun 2024 18:59:37 +0200 Subject: [PATCH] Update savant rs 0.2.30 and fix minor bugs (#775) * module image types documentation * added docs for auxiliary streams * Closes #766 --- .../13_auxiliary_video_streams.rst | 21 +++++++++++++++++++ docs/source/index.rst | 4 ++-- .../source/savant_101/12_video_processing.rst | 3 ++- .../docker-compose.l4t.yml | 1 - .../docker-compose.x86.yml | 5 ++--- samples/animegan/docker-compose.x86.yml | 3 +-- .../docker-compose.l4t.yml | 1 - .../docker-compose.x86.yml | 5 ++--- .../auxiliary_streams/docker-compose.l4t.yml | 1 - .../auxiliary_streams/docker-compose.x86.yml | 5 ++--- samples/buffer_adapter/docker-compose.l4t.yml | 1 - samples/buffer_adapter/docker-compose.x86.yml | 5 ++--- .../docker-compose.l4t.yml | 3 +-- .../docker-compose.x86.yml | 7 +++---- samples/face_reid/docker-compose.l4t.yml | 1 - samples/face_reid/docker-compose.x86.yml | 7 +++---- .../docker-compose.l4t.yml | 1 - .../docker-compose.x86.yml | 5 ++--- .../docker-compose.l4t.yml | 1 - .../docker-compose.x86.yml | 5 ++--- .../docker-compose-no-keydb.l4t.yml | 2 -- .../docker-compose-no-keydb.x86.yml | 2 -- .../docker-compose.l4t.yml | 2 -- .../docker-compose.x86.yml | 2 -- .../keypoint_detection/docker-compose.l4t.yml | 1 - .../keypoint_detection/docker-compose.x86.yml | 5 ++--- samples/kvs/docker-compose.l4t.yml | 1 - samples/kvs/docker-compose.x86.yml | 1 - .../docker-compose.l4t.yml | 1 - .../docker-compose.x86.yml | 5 ++--- samples/mjpeg_usb_cam/docker-compose.l4t.yml | 1 - samples/mjpeg_usb_cam/docker-compose.x86.yml | 5 ++--- samples/multiple_gige/docker-compose.l4t.yml | 1 - samples/multiple_gige/docker-compose.x86.yml | 3 +-- samples/multiple_rtsp/docker-compose.l4t.yml | 1 - samples/multiple_rtsp/docker-compose.x86.yml | 1 - .../docker-compose.l4t.yml | 1 - .../docker-compose.x86.yml | 5 ++--- .../docker-compose.l4t.yml | 1 - .../docker-compose.x86.yml | 5 ++--- .../docker-compose.l4t.yml | 1 - .../docker-compose.x86.yml | 5 ++--- .../docker-compose.l4t.yml | 1 - .../docker-compose.x86.yml | 1 - .../peoplenet_detector/docker-compose.l4t.yml | 1 - .../peoplenet_detector/docker-compose.x86.yml | 7 ++++--- samples/rtdetr/docker-compose.l4t.yml | 1 - samples/rtdetr/docker-compose.x86.yml | 5 ++--- .../docker-compose.l4t.yml | 1 - .../docker-compose.x86.yml | 3 +-- .../docker-compose.l4t.yml | 1 - .../docker-compose.x86.yml | 3 +-- .../super_resolution/docker-compose.x86.yml | 5 ++--- samples/telemetry/docker-compose.l4t.yml | 1 - samples/telemetry/docker-compose.x86.yml | 5 ++--- samples/template/docker-compose.l4t.yml | 1 - samples/template/docker-compose.x86.yml | 7 +++---- .../docker-compose-no-adapters.l4t.yml | 1 - .../docker-compose-no-adapters.x86.yml | 3 +-- samples/traffic_meter/docker-compose.l4t.yml | 1 - samples/traffic_meter/docker-compose.x86.yml | 5 ++--- samples/yolov8_seg/docker-compose.l4t.yml | 1 - samples/yolov8_seg/docker-compose.x86.yml | 5 ++--- savant/VERSION | 2 +- 64 files changed, 79 insertions(+), 119 deletions(-) create mode 100644 docs/source/advanced_topics/13_auxiliary_video_streams.rst diff --git a/docs/source/advanced_topics/13_auxiliary_video_streams.rst b/docs/source/advanced_topics/13_auxiliary_video_streams.rst new file mode 100644 index 000000000..7201652cc --- /dev/null +++ b/docs/source/advanced_topics/13_auxiliary_video_streams.rst @@ -0,0 +1,21 @@ +Auxiliary Video Streams +----------------------- + +There are situations, when you want to create a video stream which is artificial and does not match to any source video streams. + +Examples of such streams are: + +- Grid streams (e.g. 2x2 grid of videos); +- Video streams with augmentations (e.g. video with a sidebar or dashboard); +- Videos of other resolutions, e.g. you transcode incoming 4k to 1080p, 720p, 480p, etc. +- Super-resolution streams, e.g. you upscale incoming 720p to 1080p. +- Frame interpolation streams, e.g. you create a 60fps video from 30fps video. + +Savant 0.4.1 introduces the concept of auxiliary streams. An auxiliary stream is a stream that is not directly associated with any source stream. It is created by the user in PyFunc and is sent directly to pipeline sink , bypassing downstream pipeline elements. + +The sample showing how to work with auxiliary streams is available in the `examples/auxiliary_streams `__ directory. The sample shows how to convert a video stream to multiple resolutions and send them to the pipeline sink. + +.. note:: + + Auxiliary streams deliver metadata provided by the user. + diff --git a/docs/source/index.rst b/docs/source/index.rst index 3c5cee0c1..54f4facc1 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -1,5 +1,4 @@ -.. Savant documentation master file, - should at least contain the root `toctree` directive. +.. Savant documentation master file, should at least contain the root `toctree` directive. Welcome To Savant Documentation =================================== @@ -198,6 +197,7 @@ Savant supports processing parallelization; it helps to utilize the available re advanced_topics/10_client_sdk advanced_topics/11_memory_representation_function.rst advanced_topics/12_torch_hub.rst + advanced_topics/13_auxiliary_video_streams.rst .. toctree:: :maxdepth: 0 diff --git a/docs/source/savant_101/12_video_processing.rst b/docs/source/savant_101/12_video_processing.rst index 346c26d13..fcd49afb7 100644 --- a/docs/source/savant_101/12_video_processing.rst +++ b/docs/source/savant_101/12_video_processing.rst @@ -456,7 +456,8 @@ PNG Сodec PNG compression level. Range: ``0`` - ``9``. The default value is ``6``. -Example: +Codec Configuration Examples +^^^^^^^^^^^^^^^^^^^^^^^^^^^^ .. code-block:: yaml diff --git a/samples/age_gender_recognition/docker-compose.l4t.yml b/samples/age_gender_recognition/docker-compose.l4t.yml index 1f28fb8fd..a0152e4a9 100644 --- a/samples/age_gender_recognition/docker-compose.l4t.yml +++ b/samples/age_gender_recognition/docker-compose.l4t.yml @@ -1,4 +1,3 @@ -version: "3.3" services: video-loop-source: diff --git a/samples/age_gender_recognition/docker-compose.x86.yml b/samples/age_gender_recognition/docker-compose.x86.yml index 525b89f23..119be738f 100644 --- a/samples/age_gender_recognition/docker-compose.x86.yml +++ b/samples/age_gender_recognition/docker-compose.x86.yml @@ -1,4 +1,3 @@ -version: "3.3" services: video-loop-source: @@ -38,7 +37,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] always-on-sink: image: ghcr.io/insight-platform/savant-adapters-deepstream:latest @@ -64,7 +63,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] volumes: zmq_sockets: diff --git a/samples/animegan/docker-compose.x86.yml b/samples/animegan/docker-compose.x86.yml index 1bfc88657..739a7d0d5 100644 --- a/samples/animegan/docker-compose.x86.yml +++ b/samples/animegan/docker-compose.x86.yml @@ -1,4 +1,3 @@ -version: "3.3" services: source: @@ -37,7 +36,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] video-sink: image: ghcr.io/insight-platform/savant-adapters-gstreamer:latest diff --git a/samples/area_object_counting/docker-compose.l4t.yml b/samples/area_object_counting/docker-compose.l4t.yml index 6b3e5b41d..03107bb50 100644 --- a/samples/area_object_counting/docker-compose.l4t.yml +++ b/samples/area_object_counting/docker-compose.l4t.yml @@ -1,4 +1,3 @@ -version: "3.3" services: video-loop-source: diff --git a/samples/area_object_counting/docker-compose.x86.yml b/samples/area_object_counting/docker-compose.x86.yml index 8a29aafc8..58276f67e 100644 --- a/samples/area_object_counting/docker-compose.x86.yml +++ b/samples/area_object_counting/docker-compose.x86.yml @@ -1,4 +1,3 @@ -version: "3.3" services: video-loop-source: @@ -38,7 +37,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] always-on-sink: image: ghcr.io/insight-platform/savant-adapters-deepstream:latest @@ -63,7 +62,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] volumes: zmq_sockets: diff --git a/samples/auxiliary_streams/docker-compose.l4t.yml b/samples/auxiliary_streams/docker-compose.l4t.yml index ef16071d2..f319d6b6e 100644 --- a/samples/auxiliary_streams/docker-compose.l4t.yml +++ b/samples/auxiliary_streams/docker-compose.l4t.yml @@ -1,4 +1,3 @@ -version: "3.3" services: video-loop-source: diff --git a/samples/auxiliary_streams/docker-compose.x86.yml b/samples/auxiliary_streams/docker-compose.x86.yml index 36ab0f027..b61d56b8b 100644 --- a/samples/auxiliary_streams/docker-compose.x86.yml +++ b/samples/auxiliary_streams/docker-compose.x86.yml @@ -1,4 +1,3 @@ -version: "3.3" services: video-loop-source: @@ -33,7 +32,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] always-on-sink: image: ghcr.io/insight-platform/savant-adapters-deepstream:latest @@ -58,7 +57,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] volumes: zmq_sockets: diff --git a/samples/buffer_adapter/docker-compose.l4t.yml b/samples/buffer_adapter/docker-compose.l4t.yml index fa39e07da..2ceb1662d 100644 --- a/samples/buffer_adapter/docker-compose.l4t.yml +++ b/samples/buffer_adapter/docker-compose.l4t.yml @@ -1,4 +1,3 @@ -version: "3.3" services: video-loop-source: diff --git a/samples/buffer_adapter/docker-compose.x86.yml b/samples/buffer_adapter/docker-compose.x86.yml index d9595e53d..b57c9cf54 100644 --- a/samples/buffer_adapter/docker-compose.x86.yml +++ b/samples/buffer_adapter/docker-compose.x86.yml @@ -1,4 +1,3 @@ -version: "3.3" services: video-loop-source: @@ -59,7 +58,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] always-on-sink: image: ghcr.io/insight-platform/savant-adapters-deepstream:latest @@ -85,7 +84,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] prometheus: image: prom/prometheus:v2.48.0 diff --git a/samples/conditional_video_processing/docker-compose.l4t.yml b/samples/conditional_video_processing/docker-compose.l4t.yml index 7708f977b..c673b3811 100644 --- a/samples/conditional_video_processing/docker-compose.l4t.yml +++ b/samples/conditional_video_processing/docker-compose.l4t.yml @@ -1,4 +1,3 @@ -version: "3.3" services: video-loop-source: @@ -67,7 +66,7 @@ services: ports: - "2379:2379" healthcheck: - test: ["CMD", "/opt/bitnami/scripts/etcd/healthcheck.sh"] + test: [ "CMD", "/opt/bitnami/scripts/etcd/healthcheck.sh" ] interval: 5s timeout: 5s retries: 3 diff --git a/samples/conditional_video_processing/docker-compose.x86.yml b/samples/conditional_video_processing/docker-compose.x86.yml index 1ed348e53..cb03e231e 100644 --- a/samples/conditional_video_processing/docker-compose.x86.yml +++ b/samples/conditional_video_processing/docker-compose.x86.yml @@ -1,4 +1,3 @@ -version: "3.3" services: video-loop-source: @@ -41,7 +40,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] always-on-sink: image: ghcr.io/insight-platform/savant-adapters-deepstream:latest @@ -67,7 +66,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] etcd: container_name: etcd @@ -79,7 +78,7 @@ services: ports: - "2379:2379" healthcheck: - test: ["CMD", "/opt/bitnami/scripts/etcd/healthcheck.sh"] + test: [ "CMD", "/opt/bitnami/scripts/etcd/healthcheck.sh" ] interval: 5s timeout: 5s retries: 3 diff --git a/samples/face_reid/docker-compose.l4t.yml b/samples/face_reid/docker-compose.l4t.yml index ea44ade33..b25e5e9e1 100644 --- a/samples/face_reid/docker-compose.l4t.yml +++ b/samples/face_reid/docker-compose.l4t.yml @@ -1,4 +1,3 @@ -version: "3.3" services: index-builder-client: diff --git a/samples/face_reid/docker-compose.x86.yml b/samples/face_reid/docker-compose.x86.yml index d0c3b5f92..093dae603 100644 --- a/samples/face_reid/docker-compose.x86.yml +++ b/samples/face_reid/docker-compose.x86.yml @@ -1,4 +1,3 @@ -version: "3.3" services: index-builder-client: @@ -39,7 +38,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] profiles: - index @@ -85,7 +84,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] profiles: - demo @@ -113,7 +112,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] profiles: - demo diff --git a/samples/fisheye_line_crossing/docker-compose.l4t.yml b/samples/fisheye_line_crossing/docker-compose.l4t.yml index c7c11aa35..b082e1fd9 100644 --- a/samples/fisheye_line_crossing/docker-compose.l4t.yml +++ b/samples/fisheye_line_crossing/docker-compose.l4t.yml @@ -1,4 +1,3 @@ -version: "3.3" services: video-loop-source: diff --git a/samples/fisheye_line_crossing/docker-compose.x86.yml b/samples/fisheye_line_crossing/docker-compose.x86.yml index 2c7803426..9c7561747 100644 --- a/samples/fisheye_line_crossing/docker-compose.x86.yml +++ b/samples/fisheye_line_crossing/docker-compose.x86.yml @@ -1,4 +1,3 @@ -version: "3.3" services: video-loop-source: @@ -40,7 +39,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] always-on-sink: image: ghcr.io/insight-platform/savant-adapters-deepstream:latest @@ -65,7 +64,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] graphite: image: graphiteapp/graphite-statsd diff --git a/samples/intersection_traffic_meter/docker-compose.l4t.yml b/samples/intersection_traffic_meter/docker-compose.l4t.yml index 54eb71929..334979537 100644 --- a/samples/intersection_traffic_meter/docker-compose.l4t.yml +++ b/samples/intersection_traffic_meter/docker-compose.l4t.yml @@ -1,4 +1,3 @@ -version: "3.3" services: video-loop-source: diff --git a/samples/intersection_traffic_meter/docker-compose.x86.yml b/samples/intersection_traffic_meter/docker-compose.x86.yml index 1326712a1..2bc552792 100644 --- a/samples/intersection_traffic_meter/docker-compose.x86.yml +++ b/samples/intersection_traffic_meter/docker-compose.x86.yml @@ -1,4 +1,3 @@ -version: "3.3" services: video-loop-source: @@ -39,7 +38,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] always-on-sink: image: ghcr.io/insight-platform/savant-adapters-deepstream:latest @@ -64,7 +63,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] graphite: image: graphiteapp/graphite-statsd diff --git a/samples/kafka_redis_adapter/docker-compose-no-keydb.l4t.yml b/samples/kafka_redis_adapter/docker-compose-no-keydb.l4t.yml index 2dc349f6f..b352df71b 100644 --- a/samples/kafka_redis_adapter/docker-compose-no-keydb.l4t.yml +++ b/samples/kafka_redis_adapter/docker-compose-no-keydb.l4t.yml @@ -1,5 +1,3 @@ -version: "3.3" - services: kafka: image: bitnami/kafka:3.5.1 diff --git a/samples/kafka_redis_adapter/docker-compose-no-keydb.x86.yml b/samples/kafka_redis_adapter/docker-compose-no-keydb.x86.yml index a24faa7f0..63fceb872 100644 --- a/samples/kafka_redis_adapter/docker-compose-no-keydb.x86.yml +++ b/samples/kafka_redis_adapter/docker-compose-no-keydb.x86.yml @@ -1,5 +1,3 @@ -version: "3.3" - services: kafka: image: bitnami/kafka:3.5.1 diff --git a/samples/kafka_redis_adapter/docker-compose.l4t.yml b/samples/kafka_redis_adapter/docker-compose.l4t.yml index 675d264cf..a08dc5c52 100644 --- a/samples/kafka_redis_adapter/docker-compose.l4t.yml +++ b/samples/kafka_redis_adapter/docker-compose.l4t.yml @@ -1,5 +1,3 @@ -version: "3.3" - services: kafka: image: bitnami/kafka:3.5.1 diff --git a/samples/kafka_redis_adapter/docker-compose.x86.yml b/samples/kafka_redis_adapter/docker-compose.x86.yml index 3a0b564eb..c02666511 100644 --- a/samples/kafka_redis_adapter/docker-compose.x86.yml +++ b/samples/kafka_redis_adapter/docker-compose.x86.yml @@ -1,5 +1,3 @@ -version: "3.3" - services: kafka: image: bitnami/kafka:3.5.1 diff --git a/samples/keypoint_detection/docker-compose.l4t.yml b/samples/keypoint_detection/docker-compose.l4t.yml index 05e7454f7..239913f74 100644 --- a/samples/keypoint_detection/docker-compose.l4t.yml +++ b/samples/keypoint_detection/docker-compose.l4t.yml @@ -1,4 +1,3 @@ -version: "3.3" services: video-loop-source: diff --git a/samples/keypoint_detection/docker-compose.x86.yml b/samples/keypoint_detection/docker-compose.x86.yml index 3c375790c..15e20a79a 100644 --- a/samples/keypoint_detection/docker-compose.x86.yml +++ b/samples/keypoint_detection/docker-compose.x86.yml @@ -1,4 +1,3 @@ -version: "3.3" services: video-loop-source: @@ -38,7 +37,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] always-on-sink: image: ghcr.io/insight-platform/savant-adapters-deepstream:latest @@ -64,7 +63,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] volumes: zmq_sockets: diff --git a/samples/kvs/docker-compose.l4t.yml b/samples/kvs/docker-compose.l4t.yml index 01c82b796..191fd60c6 100644 --- a/samples/kvs/docker-compose.l4t.yml +++ b/samples/kvs/docker-compose.l4t.yml @@ -1,4 +1,3 @@ -version: "3.3" services: video-loop-source: diff --git a/samples/kvs/docker-compose.x86.yml b/samples/kvs/docker-compose.x86.yml index 7011dacbc..1c764857a 100644 --- a/samples/kvs/docker-compose.x86.yml +++ b/samples/kvs/docker-compose.x86.yml @@ -1,4 +1,3 @@ -version: "3.3" services: video-loop-source: diff --git a/samples/license_plate_recognition/docker-compose.l4t.yml b/samples/license_plate_recognition/docker-compose.l4t.yml index d4b77e685..0329331a0 100644 --- a/samples/license_plate_recognition/docker-compose.l4t.yml +++ b/samples/license_plate_recognition/docker-compose.l4t.yml @@ -1,4 +1,3 @@ -version: "3.3" services: video-loop-source: diff --git a/samples/license_plate_recognition/docker-compose.x86.yml b/samples/license_plate_recognition/docker-compose.x86.yml index 5d1046df4..fde847edb 100644 --- a/samples/license_plate_recognition/docker-compose.x86.yml +++ b/samples/license_plate_recognition/docker-compose.x86.yml @@ -1,4 +1,3 @@ -version: "3.3" services: video-loop-source: @@ -38,7 +37,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] always-on-sink: image: ghcr.io/insight-platform/savant-adapters-deepstream:latest @@ -67,7 +66,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] volumes: zmq_sockets: diff --git a/samples/mjpeg_usb_cam/docker-compose.l4t.yml b/samples/mjpeg_usb_cam/docker-compose.l4t.yml index f57dedca9..e9b5f1ea0 100644 --- a/samples/mjpeg_usb_cam/docker-compose.l4t.yml +++ b/samples/mjpeg_usb_cam/docker-compose.l4t.yml @@ -1,4 +1,3 @@ -version: "3.3" services: usb-cam: diff --git a/samples/mjpeg_usb_cam/docker-compose.x86.yml b/samples/mjpeg_usb_cam/docker-compose.x86.yml index b81a7deab..6c5ac0333 100644 --- a/samples/mjpeg_usb_cam/docker-compose.x86.yml +++ b/samples/mjpeg_usb_cam/docker-compose.x86.yml @@ -1,4 +1,3 @@ -version: "3.3" services: usb-cam: @@ -38,7 +37,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] always-on-sink: image: ghcr.io/insight-platform/savant-adapters-deepstream:latest @@ -68,7 +67,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] volumes: zmq_sockets: diff --git a/samples/multiple_gige/docker-compose.l4t.yml b/samples/multiple_gige/docker-compose.l4t.yml index fa74331f2..fd756d5ca 100644 --- a/samples/multiple_gige/docker-compose.l4t.yml +++ b/samples/multiple_gige/docker-compose.l4t.yml @@ -1,4 +1,3 @@ -version: "3.3" services: gige-camera-raw: diff --git a/samples/multiple_gige/docker-compose.x86.yml b/samples/multiple_gige/docker-compose.x86.yml index 0486964e0..8a4170f7e 100644 --- a/samples/multiple_gige/docker-compose.x86.yml +++ b/samples/multiple_gige/docker-compose.x86.yml @@ -1,4 +1,3 @@ -version: "3.3" services: gige-camera-raw: @@ -64,7 +63,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] volumes: zmq_sockets: diff --git a/samples/multiple_rtsp/docker-compose.l4t.yml b/samples/multiple_rtsp/docker-compose.l4t.yml index 779381b28..3280baf3c 100644 --- a/samples/multiple_rtsp/docker-compose.l4t.yml +++ b/samples/multiple_rtsp/docker-compose.l4t.yml @@ -1,4 +1,3 @@ -version: "3.3" services: rtsp-city-traffic: diff --git a/samples/multiple_rtsp/docker-compose.x86.yml b/samples/multiple_rtsp/docker-compose.x86.yml index dbfd9612a..f86d90839 100644 --- a/samples/multiple_rtsp/docker-compose.x86.yml +++ b/samples/multiple_rtsp/docker-compose.x86.yml @@ -1,4 +1,3 @@ -version: "3.3" services: rtsp-city-traffic: diff --git a/samples/nvidia_car_classification/docker-compose.l4t.yml b/samples/nvidia_car_classification/docker-compose.l4t.yml index df9ae87d4..62c592bc9 100644 --- a/samples/nvidia_car_classification/docker-compose.l4t.yml +++ b/samples/nvidia_car_classification/docker-compose.l4t.yml @@ -1,4 +1,3 @@ -version: "3.3" services: video-loop-source: diff --git a/samples/nvidia_car_classification/docker-compose.x86.yml b/samples/nvidia_car_classification/docker-compose.x86.yml index fd22b0223..784359ef6 100644 --- a/samples/nvidia_car_classification/docker-compose.x86.yml +++ b/samples/nvidia_car_classification/docker-compose.x86.yml @@ -1,4 +1,3 @@ -version: "3.3" services: video-loop-source: @@ -38,7 +37,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] always-on-sink: image: ghcr.io/insight-platform/savant-adapters-deepstream:latest @@ -63,7 +62,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] volumes: zmq_sockets: diff --git a/samples/opencv_cuda_bg_remover_mog2/docker-compose.l4t.yml b/samples/opencv_cuda_bg_remover_mog2/docker-compose.l4t.yml index 7ec4ea3fe..ebde910f4 100644 --- a/samples/opencv_cuda_bg_remover_mog2/docker-compose.l4t.yml +++ b/samples/opencv_cuda_bg_remover_mog2/docker-compose.l4t.yml @@ -1,4 +1,3 @@ -version: "3.3" services: video-loop-source: diff --git a/samples/opencv_cuda_bg_remover_mog2/docker-compose.x86.yml b/samples/opencv_cuda_bg_remover_mog2/docker-compose.x86.yml index eecd0ef79..a7a153f1a 100644 --- a/samples/opencv_cuda_bg_remover_mog2/docker-compose.x86.yml +++ b/samples/opencv_cuda_bg_remover_mog2/docker-compose.x86.yml @@ -1,4 +1,3 @@ -version: "3.3" services: video-loop-source: @@ -35,7 +34,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] always-on-sink: image: ghcr.io/insight-platform/savant-adapters-deepstream:latest @@ -60,7 +59,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] volumes: zmq_sockets: diff --git a/samples/panoptic_driving_perception/docker-compose.l4t.yml b/samples/panoptic_driving_perception/docker-compose.l4t.yml index ef6baf7ad..2352990b1 100644 --- a/samples/panoptic_driving_perception/docker-compose.l4t.yml +++ b/samples/panoptic_driving_perception/docker-compose.l4t.yml @@ -1,4 +1,3 @@ -version: "3.3" services: video-loop-source: diff --git a/samples/panoptic_driving_perception/docker-compose.x86.yml b/samples/panoptic_driving_perception/docker-compose.x86.yml index 2555c7ba4..19f0ad114 100644 --- a/samples/panoptic_driving_perception/docker-compose.x86.yml +++ b/samples/panoptic_driving_perception/docker-compose.x86.yml @@ -1,4 +1,3 @@ -version: "3.3" services: video-loop-source: @@ -40,7 +39,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] always-on-sink: image: ghcr.io/insight-platform/savant-adapters-deepstream:latest @@ -66,7 +65,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] volumes: zmq_sockets: diff --git a/samples/pass_through_processing/docker-compose.l4t.yml b/samples/pass_through_processing/docker-compose.l4t.yml index a0bcec018..3b8ebcfae 100644 --- a/samples/pass_through_processing/docker-compose.l4t.yml +++ b/samples/pass_through_processing/docker-compose.l4t.yml @@ -1,4 +1,3 @@ -version: "3.3" services: video-loop-source: diff --git a/samples/pass_through_processing/docker-compose.x86.yml b/samples/pass_through_processing/docker-compose.x86.yml index 86d80d5c1..b11774e0c 100644 --- a/samples/pass_through_processing/docker-compose.x86.yml +++ b/samples/pass_through_processing/docker-compose.x86.yml @@ -1,4 +1,3 @@ -version: "3.3" services: video-loop-source: diff --git a/samples/peoplenet_detector/docker-compose.l4t.yml b/samples/peoplenet_detector/docker-compose.l4t.yml index 4bf59c979..1ebe7b1a2 100644 --- a/samples/peoplenet_detector/docker-compose.l4t.yml +++ b/samples/peoplenet_detector/docker-compose.l4t.yml @@ -1,4 +1,3 @@ -version: "3.3" services: video-loop-source: diff --git a/samples/peoplenet_detector/docker-compose.x86.yml b/samples/peoplenet_detector/docker-compose.x86.yml index bead121bf..885557e32 100644 --- a/samples/peoplenet_detector/docker-compose.x86.yml +++ b/samples/peoplenet_detector/docker-compose.x86.yml @@ -1,4 +1,3 @@ -version: "3.3" services: video-loop-source: @@ -32,13 +31,14 @@ services: - ZMQ_SRC_ENDPOINT=sub+bind:ipc:///tmp/zmq-sockets/input-video.ipc - ZMQ_SINK_ENDPOINT=pub+bind:ipc:///tmp/zmq-sockets/output-video.ipc - METRICS_FRAME_PERIOD=1000 + - DECODER_QUEUE_LENGTH=5 deploy: resources: reservations: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] always-on-sink: image: ghcr.io/insight-platform/savant-adapters-deepstream:latest @@ -55,6 +55,7 @@ services: - ZMQ_ENDPOINT=sub+connect:ipc:///tmp/zmq-sockets/output-video.ipc - SOURCE_ID=city-traffic - FRAMERATE=25/1 + - SYNC_INPUT=True - STUB_FILE_LOCATION=/stub_imgs/smpte100_1280x900.jpeg - DEV_MODE=True command: python -m adapters.ds.sinks.always_on_rtsp @@ -64,7 +65,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] volumes: zmq_sockets: diff --git a/samples/rtdetr/docker-compose.l4t.yml b/samples/rtdetr/docker-compose.l4t.yml index 1cf70b5ed..a941f0575 100644 --- a/samples/rtdetr/docker-compose.l4t.yml +++ b/samples/rtdetr/docker-compose.l4t.yml @@ -1,4 +1,3 @@ -version: "3.3" services: video-loop-source: diff --git a/samples/rtdetr/docker-compose.x86.yml b/samples/rtdetr/docker-compose.x86.yml index 5d77e96e6..3df39e678 100644 --- a/samples/rtdetr/docker-compose.x86.yml +++ b/samples/rtdetr/docker-compose.x86.yml @@ -1,4 +1,3 @@ -version: "3.3" services: video-loop-source: @@ -38,7 +37,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] always-on-sink: image: ghcr.io/insight-platform/savant-adapters-deepstream:latest @@ -63,7 +62,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] volumes: zmq_sockets: diff --git a/samples/rtsp_cam_compatibility_test/docker-compose.l4t.yml b/samples/rtsp_cam_compatibility_test/docker-compose.l4t.yml index 7493424ae..43283cf26 100644 --- a/samples/rtsp_cam_compatibility_test/docker-compose.l4t.yml +++ b/samples/rtsp_cam_compatibility_test/docker-compose.l4t.yml @@ -1,4 +1,3 @@ -version: "3.3" services: receiver: diff --git a/samples/rtsp_cam_compatibility_test/docker-compose.x86.yml b/samples/rtsp_cam_compatibility_test/docker-compose.x86.yml index 2ede34a79..eb79ae106 100644 --- a/samples/rtsp_cam_compatibility_test/docker-compose.x86.yml +++ b/samples/rtsp_cam_compatibility_test/docker-compose.x86.yml @@ -1,4 +1,3 @@ -version: "3.3" services: receiver: @@ -34,7 +33,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] volumes: zmq_sockets: diff --git a/samples/source_adapter_with_json_metadata/docker-compose.l4t.yml b/samples/source_adapter_with_json_metadata/docker-compose.l4t.yml index cc0a0c064..c07d909f9 100644 --- a/samples/source_adapter_with_json_metadata/docker-compose.l4t.yml +++ b/samples/source_adapter_with_json_metadata/docker-compose.l4t.yml @@ -1,4 +1,3 @@ -version: "3.3" services: image-json-source: diff --git a/samples/source_adapter_with_json_metadata/docker-compose.x86.yml b/samples/source_adapter_with_json_metadata/docker-compose.x86.yml index 1fe9b1f12..d9b83781b 100644 --- a/samples/source_adapter_with_json_metadata/docker-compose.x86.yml +++ b/samples/source_adapter_with_json_metadata/docker-compose.x86.yml @@ -1,4 +1,3 @@ -version: "3.3" services: image-json-source: @@ -39,7 +38,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] image-json-sink: image: ghcr.io/insight-platform/savant-adapters-py:latest diff --git a/samples/super_resolution/docker-compose.x86.yml b/samples/super_resolution/docker-compose.x86.yml index 7ebe9976e..1a803b9cf 100644 --- a/samples/super_resolution/docker-compose.x86.yml +++ b/samples/super_resolution/docker-compose.x86.yml @@ -1,4 +1,3 @@ -version: "3.3" services: video-loop-source: @@ -38,7 +37,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] always-on-sink: image: ghcr.io/insight-platform/savant-adapters-deepstream:latest @@ -64,7 +63,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] volumes: zmq_sockets: diff --git a/samples/telemetry/docker-compose.l4t.yml b/samples/telemetry/docker-compose.l4t.yml index 4dd3b8623..4fef45948 100644 --- a/samples/telemetry/docker-compose.l4t.yml +++ b/samples/telemetry/docker-compose.l4t.yml @@ -1,4 +1,3 @@ -version: "3.3" services: video-loop-source: diff --git a/samples/telemetry/docker-compose.x86.yml b/samples/telemetry/docker-compose.x86.yml index f3184f28d..3ba3a9cb6 100644 --- a/samples/telemetry/docker-compose.x86.yml +++ b/samples/telemetry/docker-compose.x86.yml @@ -1,4 +1,3 @@ -version: "3.3" services: video-loop-source: @@ -39,7 +38,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] always-on-sink: image: ghcr.io/insight-platform/savant-adapters-deepstream:latest @@ -65,7 +64,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] # All-in-One Jaeger # https://www.jaegertracing.io/docs/1.48/getting-started/#all-in-one diff --git a/samples/template/docker-compose.l4t.yml b/samples/template/docker-compose.l4t.yml index 5682a3f7a..e43253ec9 100644 --- a/samples/template/docker-compose.l4t.yml +++ b/samples/template/docker-compose.l4t.yml @@ -1,4 +1,3 @@ -version: "3.3" services: client: diff --git a/samples/template/docker-compose.x86.yml b/samples/template/docker-compose.x86.yml index 514d669ec..3db940f70 100644 --- a/samples/template/docker-compose.x86.yml +++ b/samples/template/docker-compose.x86.yml @@ -1,4 +1,3 @@ -version: "3.3" services: client: @@ -35,7 +34,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] networks: - network @@ -60,7 +59,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] links: - jaeger networks: @@ -107,7 +106,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] volumes: zmq_sockets: diff --git a/samples/traffic_meter/docker-compose-no-adapters.l4t.yml b/samples/traffic_meter/docker-compose-no-adapters.l4t.yml index 056a77379..29e3fccfc 100644 --- a/samples/traffic_meter/docker-compose-no-adapters.l4t.yml +++ b/samples/traffic_meter/docker-compose-no-adapters.l4t.yml @@ -1,4 +1,3 @@ -version: "3.3" services: module: build: diff --git a/samples/traffic_meter/docker-compose-no-adapters.x86.yml b/samples/traffic_meter/docker-compose-no-adapters.x86.yml index 4c8a637b9..174441598 100644 --- a/samples/traffic_meter/docker-compose-no-adapters.x86.yml +++ b/samples/traffic_meter/docker-compose-no-adapters.x86.yml @@ -1,4 +1,3 @@ -version: "3.3" services: module: build: @@ -25,7 +24,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] graphite: image: graphiteapp/graphite-statsd volumes: diff --git a/samples/traffic_meter/docker-compose.l4t.yml b/samples/traffic_meter/docker-compose.l4t.yml index 6bcc881b8..51cd62f0f 100644 --- a/samples/traffic_meter/docker-compose.l4t.yml +++ b/samples/traffic_meter/docker-compose.l4t.yml @@ -1,4 +1,3 @@ -version: "3.3" services: video-loop-source: diff --git a/samples/traffic_meter/docker-compose.x86.yml b/samples/traffic_meter/docker-compose.x86.yml index 3048acc02..5debb3c9f 100644 --- a/samples/traffic_meter/docker-compose.x86.yml +++ b/samples/traffic_meter/docker-compose.x86.yml @@ -1,4 +1,3 @@ -version: "3.3" services: video-loop-source: @@ -41,7 +40,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] always-on-sink: image: ghcr.io/insight-platform/savant-adapters-deepstream:latest @@ -66,7 +65,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] graphite: image: graphiteapp/graphite-statsd diff --git a/samples/yolov8_seg/docker-compose.l4t.yml b/samples/yolov8_seg/docker-compose.l4t.yml index 118b3d4b5..b8b0a4bb7 100644 --- a/samples/yolov8_seg/docker-compose.l4t.yml +++ b/samples/yolov8_seg/docker-compose.l4t.yml @@ -1,4 +1,3 @@ -version: "3.3" services: video-loop-source: diff --git a/samples/yolov8_seg/docker-compose.x86.yml b/samples/yolov8_seg/docker-compose.x86.yml index c6a03eb52..ce3b9dc90 100644 --- a/samples/yolov8_seg/docker-compose.x86.yml +++ b/samples/yolov8_seg/docker-compose.x86.yml @@ -1,4 +1,3 @@ -version: "3.3" services: video-loop-source: @@ -39,7 +38,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] always-on-sink: image: ghcr.io/insight-platform/savant-adapters-deepstream:latest @@ -65,7 +64,7 @@ services: devices: - driver: nvidia count: 1 - capabilities: [gpu] + capabilities: [ gpu ] volumes: zmq_sockets: diff --git a/savant/VERSION b/savant/VERSION index 0784c0769..500d9f7db 100644 --- a/savant/VERSION +++ b/savant/VERSION @@ -1,3 +1,3 @@ SAVANT=0.4.1 -SAVANT_RS=0.2.29 +SAVANT_RS=0.2.30 DEEPSTREAM=6.4