Skip to content

Commit

Permalink
Replace nvvideotestsrc with videotestsrc (#909)
Browse files Browse the repository at this point in the history
  • Loading branch information
denisvmedyantsev authored Jan 14, 2025
1 parent 80e0617 commit d2103dc
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 9 deletions.
2 changes: 2 additions & 0 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
copyright = '2020-2023 BWSoft Management, LLC'
# author = 'BWSoft'

favicon_url = 'https://avatars.githubusercontent.com/u/102944477?s=48&v=4'

# The full version, including alpha/beta/rc tags
from savant import __version__

Expand Down
15 changes: 13 additions & 2 deletions savant/deepstream/nvinfer/build_engine.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,18 @@ def build_engine(element: ModelElement, rebuild: bool = True):
pipeline: Gst.Pipeline = Gst.Pipeline()
elements = [
PipelineElement(
'nvvideotestsrc',
'videotestsrc',
properties={
'num-buffers': model.batch_size,
},
),
PipelineElement('nvvideoconvert'),
PipelineElement(
element='capsfilter',
properties={
'caps': 'video/x-raw(memory:NVMM)',
},
),
PipelineElement(
element='nvstreammux',
name='muxer',
Expand All @@ -53,7 +60,11 @@ def build_engine(element: ModelElement, rebuild: bool = True):

last_gst_element = None
for element in elements:
gst_element = GstElementFactory.create_element(element)
gst_element = (
GstElementFactory.create_element(element)
if element.element != 'capsfilter'
else GstElementFactory.create_caps_filter(element)
)
pipeline.add(gst_element)
if last_gst_element is not None:
if element.element == 'nvstreammux':
Expand Down
6 changes: 0 additions & 6 deletions savant/deepstream/pipeline.py
Original file line number Diff line number Diff line change
Expand Up @@ -400,12 +400,6 @@ def _add_source(self, source: PipelineElement):
# to prevent pipeline from shutting down
self._suppress_eos = source.element == 'zeromq_source_bin'
# nvstreammux is required for NvDs pipeline
# add queue and set live-source for rtsp
live_source = source.element == 'uridecodebin' and source.properties[
'uri'
].startswith('rtsp://')
if live_source:
self.add_element(PipelineElement('queue'))
self._create_muxer()

# Sink
Expand Down
2 changes: 1 addition & 1 deletion savant/deepstream/pyfunc.py
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ def process_frame(self, buffer: Gst.Buffer, frame_meta: NvDsFrameMeta):
"""Process gstreamer buffer and frame metadata. Throws an exception if fatal
error has occurred.
Use `savant.deepstream.utils.get_nvds_buf_surface` to get a frame image.
Use `savant.deepstream.utils.surface.get_nvds_buf_surface` to get a frame image.
:param buffer: Gstreamer buffer.
:param frame_meta: Frame metadata for a frame in a batch.
Expand Down

0 comments on commit d2103dc

Please sign in to comment.