Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
159 commits
Select commit Hold shift + click to select a range
ad1a992
Set revision to v0.28.alpha.dev to start feature branch
rjhowell44 Oct 25, 2023
01a59dd
Implement new Remuxer Component
rjhowell44 Oct 25, 2023
3a1d4ff
Document the new Remuxer Component
rjhowell44 Oct 26, 2023
ec20f9b
Merge pull request #1093 from prominenceai/remuxer
rjhowell44 Oct 26, 2023
959eb9c
Implement dsl_preproc_pph_add/remove_services
rjhowell44 Oct 26, 2023
8061181
Add documentation for dsl_preproc_pph_add/remove services
rjhowell44 Oct 26, 2023
a8a3f1b
Add documentation for dsl_preproc_pph_add/remove services
rjhowell44 Oct 26, 2023
f8ee177
Merge pull request #1095 from prominenceai/preproc_pph
rjhowell44 Oct 26, 2023
bc94429
Rename 'RTSP Sink' to 'RTSP Server Sink'
rjhowell44 Oct 26, 2023
bfa5624
Rename RTSP Sink to RTSP Server Sink
rjhowell44 Oct 27, 2023
3b8ae22
Fix link to Tee documentation
rjhowell44 Oct 28, 2023
9b1c361
Fix broken link to Sink documentation
rjhowell44 Oct 28, 2023
8f65d54
Rename "RTSP Sink" to "RTSP Server Sink"
rjhowell44 Oct 28, 2023
35d5804
Rename "RTSP Sink" to "RTSP Server Sink"
rjhowell44 Oct 28, 2023
f86b35a
Merge pull request #1097 from prominenceai/rtsp_server
rjhowell44 Oct 28, 2023
07a2d8c
Implement new RTSP Client Sink
rjhowell44 Oct 30, 2023
398aa16
Implement new RTSP Client Sink
rjhowell44 Nov 1, 2023
6ae7742
Implement new RTSP Client Sink
rjhowell44 Nov 1, 2023
2067ebf
WIP add RTSP Client Sink documentation
rjhowell44 Nov 2, 2023
8e77212
Add documentation for RTSP Client Sink
rjhowell44 Nov 2, 2023
c316df7
Add RTSP Client Sink
rjhowell44 Nov 2, 2023
b749931
Merge pull request #1098 from prominenceai/rtsp_client
rjhowell44 Nov 2, 2023
90c9256
Implement new V4L2 Sink component
rjhowell44 Nov 2, 2023
4250901
Implement new V4L2 Sink component
rjhowell44 Nov 3, 2023
f2db01c
Add documentation for V4L2 Sink
rjhowell44 Nov 3, 2023
af435ff
Add documentation for new V4L2 Sink
rjhowell44 Nov 3, 2023
fec34d1
Implement new V4L2 Sink component
rjhowell44 Nov 4, 2023
3e23cdb
Merge pull request #1099 from prominenceai/v4l2sink
rjhowell44 Nov 4, 2023
bc3a3b7
Implement dsl_sink_frame_capture_schedule
rjhowell44 Nov 4, 2023
62f76db
Implement dsl_sink_frame_capture_schedule
rjhowell44 Nov 4, 2023
21f3d53
Implement dsl_sink_frame_capture_schedule
rjhowell44 Nov 5, 2023
a017bd7
Implement dsl_sink_frame_capture_schedule
rjhowell44 Nov 5, 2023
01eb384
Add documentation for dsl_sink_frame_capture_schedule
rjhowell44 Nov 5, 2023
315d49f
Add documentation for dsl_sink_frame_capture_schedule
rjhowell44 Nov 5, 2023
b72ad7c
Implement dsl_sink_frame_capture_schedule
rjhowell44 Nov 5, 2023
754dc78
Merge pull request #1101 from prominenceai/schedule_capture
rjhowell44 Nov 5, 2023
0269d76
Implement new Style BBox Actions
rjhowell44 Nov 6, 2023
7229b07
Merge pull request #1103 from prominenceai/style_actions
rjhowell44 Nov 8, 2023
b1211b2
USB Source - allow 0 dimensions & framerate
rjhowell44 Nov 8, 2023
b7acfb0
Merge pull request #1108 from prominenceai/usb_source
rjhowell44 Nov 9, 2023
7f56c51
Update .gitignore for latest codelite version
rjhowell44 Nov 9, 2023
0c554e3
Merge Makefile fix from v0.27.b.alpha
rjhowell44 Nov 9, 2023
0120d83
Replace spaces with tab
rjhowell44 Nov 9, 2023
539fa50
Merge pull request #1109 from prominenceai/merge_v0.27.b.alpha
rjhowell44 Nov 9, 2023
19dbb05
Update tests - consolidate on int8 model
rjhowell44 Nov 9, 2023
0330f05
Update all tests for DS 6.3
rjhowell44 Nov 11, 2023
74046a6
Update all tests and examples for DS 6.3
rjhowell44 Nov 11, 2023
e166483
Merge pull request #1112 from prominenceai/update_tests
rjhowell44 Nov 11, 2023
e90d109
Implement new RTMP Sink
rjhowell44 Nov 11, 2023
47cc0e2
fix dox comments for RTMP Sink
rjhowell44 Nov 11, 2023
b3559da
Fix component verification for new RTMP Sink
rjhowell44 Nov 12, 2023
dd68b9f
Add files via upload
rjhowell44 Nov 14, 2023
e9a8de4
Implement new RTMP Sink component
rjhowell44 Nov 15, 2023
aba87bd
Add documentation for RTMP Sink
rjhowell44 Nov 15, 2023
6f0878c
Add documentation for RTMP Sink
rjhowell44 Nov 15, 2023
6b0c687
Implement new RTMP Sink component
rjhowell44 Nov 15, 2023
f7444b3
fix spelling
rjhowell44 Nov 15, 2023
962da01
Merge pull request #1115 from prominenceai/rtmp_sink
rjhowell44 Nov 15, 2023
e68deee
Replace Overlay Sink with 3D Sink
rjhowell44 Nov 17, 2023
2546307
Refactor EGL and 3D Sinks as Window Sinks
rjhowell44 Nov 17, 2023
9b380e0
Refactor: WindowSinkBintr as base for EGL & 3D Sinks
rjhowell44 Nov 18, 2023
c3d1b53
Update examples for 3D/EGL sink usage
rjhowell44 Nov 20, 2023
3311767
Update Sink API for 3D and EGL Window Sinks
rjhowell44 Nov 24, 2023
742cb31
Refactor Window Sink APIs for EGL & 3D
rjhowell44 Nov 25, 2023
2e6ed5b
Review/cleanup Window Sink API dox
rjhowell44 Nov 26, 2023
7844b8b
Update reference for refactored Window Sinks
rjhowell44 Nov 26, 2023
156e7e6
Update reference for refactored Window Sinks
rjhowell44 Nov 26, 2023
cdba0e1
Merge pull request #1118 from prominenceai/3d_sink
rjhowell44 Nov 26, 2023
38ee879
Update DSL to use new nvstreammux plugin
rjhowell44 Nov 27, 2023
1f6272b
Update DSL to use new nvstreammux plugin
rjhowell44 Nov 30, 2023
e5c9e03
Update DSL to use new nvstreammux plugin
rjhowell44 Nov 30, 2023
6d6cd21
Update DSL to use new nvstreammux plugin
rjhowell44 Dec 5, 2023
6bba6d7
WIP Update api-pipeline.md for new Streammuxer
rjhowell44 Dec 5, 2023
962f92b
Update api-pipeline.md for new Streammuxer
rjhowell44 Dec 5, 2023
f8d2b00
Update api-reference-list.md for new Streammuxer
rjhowell44 Dec 5, 2023
04ed15e
Update DSL to use new Streammux plugin
rjhowell44 Dec 11, 2023
33be87b
Update DSL to use new NVIDIA Streammux plugin
rjhowell44 Dec 13, 2023
e6cf9ee
Update DSL to use new NVIDIA Streammux plugin
rjhowell44 Dec 13, 2023
211e35b
Update Remuxer API for new Streammux changes
rjhowell44 Dec 14, 2023
2287b28
Update Remuxer API for new Streammux changes
rjhowell44 Dec 14, 2023
99b8bb6
Fix test cases for DS 6.3 upgrade
rjhowell44 Dec 18, 2023
aa12975
Merge pull request #1121 from prominenceai/new_streammux
rjhowell44 Dec 18, 2023
077371a
Update Tracker API for DS 6.3/6.4
rjhowell44 Dec 27, 2023
758cfb3
Update Tracker API reference for DS 6.3
rjhowell44 Dec 27, 2023
03f7081
Update Tracker API for DS 6.3/6.4
rjhowell44 Dec 27, 2023
275a047
Update Tracker API for DS 6.3/6.4
rjhowell44 Dec 27, 2023
97d1890
Merge pull request #1123 from prominenceai/tracker_updates
rjhowell44 Dec 27, 2023
c87845e
refactor pph - support both buffer and ds event client handlers
rjhowell44 Dec 30, 2023
3336ea8
Implement Stream-Event Pad Probe Handler
rjhowell44 Dec 31, 2023
6b331d2
Implement dsl_pipeline_streammux_pph_add/remove services
rjhowell44 Dec 31, 2023
e4ba423
Implement dsl_pipeline_streammux_pph_add/remove services
rjhowell44 Jan 1, 2024
64a6eb5
Fix column widths
rjhowell44 Jan 1, 2024
10bd0d8
Add reference for new Stream Event PPH
rjhowell44 Jan 1, 2024
ce07cd8
Add reference for new Stream Event PPH
rjhowell44 Jan 1, 2024
fa119eb
Fix links
rjhowell44 Jan 1, 2024
0738b08
Add reference for dsl_pipeline_streammux_pph_add/remove
rjhowell44 Jan 1, 2024
861273b
Add reference for dsl_pipeline_streammux_pph_add/remove
rjhowell44 Jan 1, 2024
2801256
Merge pull request #1128 from prominenceai/pph_updates
rjhowell44 Jan 1, 2024
2258bdb
Read plugin properties on SinkBintr Get calls
rjhowell44 Jan 2, 2024
76c9d1f
Disable max-lateness as default for 3D, EGL, and, V4L2 Sinks
rjhowell44 Jan 2, 2024
9d06d5a
Update common propery setting for max-lateness
rjhowell44 Jan 2, 2024
0d9de98
Merge pull request #1130 from prominenceai/sink_updates
rjhowell44 Jan 2, 2024
7b121f8
Implement dsl_pipeline_streammux_attach_sys_ts_enabled_get/set services
rjhowell44 Jan 3, 2024
84cfbe2
Add reference for dsl_pipeline_streammux_attach_sys_ts_enabled_get/se…
rjhowell44 Jan 4, 2024
092c127
Add reference for dsl_pipeline_streammux_attach_sys_ts_enabled_get/se…
rjhowell44 Jan 4, 2024
8e17e95
Merge pull request #1131 from prominenceai/attach_sys_ts
rjhowell44 Jan 4, 2024
ae52a74
WIP write up v0.28.alpha Release Notes
rjhowell44 Jan 4, 2024
9135e20
Reenable all old streammux services - support old and new
rjhowell44 Jan 12, 2024
66cafd9
Reenable all old streammux services - support old and new
rjhowell44 Jan 13, 2024
1bad3d0
Reenable all old streammux services - support old and new
rjhowell44 Jan 13, 2024
c3354d7
Reenable all old streammux services - support old and new
rjhowell44 Jan 13, 2024
c319ddc
Reenable all old streammux services - support old and new
rjhowell44 Jan 14, 2024
1bdbcc9
Add the old nvstreammux services back into reference.
rjhowell44 Jan 15, 2024
d7bd060
Update Pipeline reference - cover both OLD and NEW Streammuxer
rjhowell44 Jan 15, 2024
19b4be9
Add missing dsl_pipeline_streammux_padding_get/set services
rjhowell44 Jan 15, 2024
a67564d
Merge pull request #1133 from prominenceai/reenabled_old_streammux
rjhowell44 Jan 15, 2024
072ad8b
Fix parameter name in dsl_pph_buffer_timeout_new
rjhowell44 Jan 15, 2024
e01745e
Merge pull request #1135 from prominenceai/fix_dslpy
rjhowell44 Jan 15, 2024
8ed63bd
Set 'bufapi-version' on DS 6.2 only
rjhowell44 Jan 16, 2024
862c04d
Merge pull request #1136 from prominenceai/decoder_encoder
rjhowell44 Jan 16, 2024
a1b35e4
Update overview.md
rjhowell44 Jan 17, 2024
8dfffd3
Update overview.md for v0.28.alpha
rjhowell44 Jan 17, 2024
af0d771
Fix link
rjhowell44 Jan 17, 2024
839320e
Add old-Streammuxer Remuxer services back to reference list
rjhowell44 Jan 18, 2024
321b88e
Add old-Streammuxer Remuxer services back
rjhowell44 Jan 18, 2024
18c3671
Merge pull request #1137 from prominenceai/v0.28.alpha.docs
rjhowell44 Jan 18, 2024
2130f22
Update make_models utility for DS 6.3/6.4
rjhowell44 Jan 23, 2024
ec0d399
Merge pull request #1143 from prominenceai/make_models
rjhowell44 Jan 23, 2024
cf78225
Update all tests/examples - use trafficcamnet/resnet18_vehicle models
rjhowell44 Jan 24, 2024
56cdbd8
Merge pull request #1145 from prominenceai/update_model_refs
rjhowell44 Jan 24, 2024
21c4597
Update Makefile to build opencv Ubuntu 22.04 / DS 6.4
rjhowell44 Jan 25, 2024
e6a24ee
Merge pull request #1147 from prominenceai/make_opencv
rjhowell44 Jan 25, 2024
c4b19d2
Update Make to build WebRtcSink for DS 6.4 - GST 1.20
rjhowell44 Jan 26, 2024
d25a38d
Merge pull request #1150 from prominenceai/make_webrtcsink
rjhowell44 Jan 26, 2024
dc97982
Update installing-dependencies.md for DS 6.4 / Ubuntu 22.04
rjhowell44 Jan 26, 2024
b74468c
Merge pull request #1151 from prominenceai/v0.28.alpha.docs
rjhowell44 Jan 26, 2024
63017e3
Implement new V4L2 Source / replace USB Source
rjhowell44 Jan 27, 2024
9390e23
Implement new V4L2 Source / replace USB Source
rjhowell44 Jan 28, 2024
a858315
Replace USB Source with new V4L2 Source
rjhowell44 Jan 28, 2024
496e571
Replace USB Source with new V4L2 Source
rjhowell44 Jan 28, 2024
839c72a
Update api-sink.md with minor fixes
rjhowell44 Jan 28, 2024
8ea0df8
Merge pull request #1153 from prominenceai/v4l2_source
rjhowell44 Jan 28, 2024
c467492
Fix area exclusion determination and missing params in dsl.py
rjhowell44 Jan 29, 2024
d1b5dc8
Merge pull request #1156 from prominenceai/ode_areas
rjhowell44 Jan 29, 2024
22fbb0c
Verify/correct all python examples
rjhowell44 Jan 29, 2024
019b725
Merge pull request #1157 from prominenceai/python_examples
rjhowell44 Jan 29, 2024
7c3b871
WIP writeup v0.28.alpha release notes
rjhowell44 Jan 29, 2024
aec0154
Write up v0.28.alpha.md release notes.
rjhowell44 Jan 30, 2024
1b78bcc
Delete Images/under-construction.png
rjhowell44 Jan 30, 2024
2e346ab
Add files via upload
rjhowell44 Jan 30, 2024
6cddb07
Update README.md
rjhowell44 Jan 30, 2024
ee96830
Link the v0.28.alpha release
rjhowell44 Jan 30, 2024
0869a3a
Merge pull request #1158 from prominenceai/v0.28.alpha.notes
rjhowell44 Jan 30, 2024
3fcfeac
Fix preproc example to use existing model engine
rjhowell44 Jan 30, 2024
aeafcbf
Merge pull request #1159 from prominenceai/cpp_examples
rjhowell44 Jan 30, 2024
36df612
Add V4L2 Source to overview.md
rjhowell44 Jan 30, 2024
b7101ac
Update version for v0.28.alpha release
rjhowell44 Jan 30, 2024
3f81222
Complete v0.28.alpha Release Notes
rjhowell44 Jan 30, 2024
29c77be
Merge branch 'master' into v0.28.alpha
rjhowell44 Jan 30, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix area exclusion determination and missing params in dsl.py
  • Loading branch information
rjhowell44 committed Jan 29, 2024
commit c467492a3d2dbbf2b4aadebc3d2e450e37d3ab31
4 changes: 2 additions & 2 deletions dsl.py
Original file line number Diff line number Diff line change
Expand Up @@ -1561,7 +1561,7 @@ def dsl_ode_action_list_size():
##
## dsl_ode_area_inclusion_new()
##
_dsl.dsl_ode_area_inclusion_new.argtypes = [c_wchar_p, c_wchar_p, c_bool]
_dsl.dsl_ode_area_inclusion_new.argtypes = [c_wchar_p, c_wchar_p, c_bool, c_uint]
_dsl.dsl_ode_area_inclusion_new.restype = c_uint
def dsl_ode_area_inclusion_new(name, polygon, show, bbox_test_point):
global _dsl
Expand All @@ -1571,7 +1571,7 @@ def dsl_ode_area_inclusion_new(name, polygon, show, bbox_test_point):
##
## dsl_ode_area_exclusion_new()
##
_dsl.dsl_ode_area_exclusion_new.argtypes = [c_wchar_p, c_wchar_p, c_bool]
_dsl.dsl_ode_area_exclusion_new.argtypes = [c_wchar_p, c_wchar_p, c_bool, c_uint]
_dsl.dsl_ode_area_exclusion_new.restype = c_uint
def dsl_ode_area_exclusion_new(name, polygon, show, bbox_test_point):
global _dsl
Expand Down
6 changes: 5 additions & 1 deletion src/DslOdeTrigger.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -937,7 +937,11 @@ namespace DSL
std::dynamic_pointer_cast<OdeArea>(imap.second);
if (pOdeArea->IsBboxInside(pObjectMeta->rect_params))
{
return !pOdeArea->IsType(typeid(OdeExclusionArea));
return pOdeArea->IsType(typeid(OdeInclusionArea));
}
else
{
return pOdeArea->IsType(typeid(OdeExclusionArea));
}
}
return false;
Expand Down