michael/scrypted
1
0
Fork 0
mirror of https://github.com/koush/scrypted.git synced 2026-05-04 21:30:30 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

videoanalysis/motion: implement video rate control

Browse Source
This commit is contained in:
Koushik Dutta
2023-05-03 15:57:37 -07:00
parent 9ed850e327
commit 9d8345e901
6 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/objectdetector/package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "@scrypted/objectdetector",
"version": "0.0.134",
"version": "0.0.135",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@scrypted/objectdetector",
"version": "0.0.134",
"version": "0.0.135",
"license": "Apache-2.0",
"dependencies": {
"@scrypted/common": "file:../../common",

2
plugins/objectdetector/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scrypted/objectdetector",
"version": "0.0.134",
"version": "0.0.135",
"description": "Scrypted Video Analysis Plugin. Installed alongside a detection service like OpenCV or TensorFlow.",
"author": "Scrypted",
"license": "Apache-2.0",

1
plugins/objectdetector/src/main.ts
View File

@@ -363,6 +363,7 @@ class ObjectDetectionMixin extends SettingsMixinDeviceBase<VideoCamera & Camera
return await videoFrameGenerator.generateVideoFrames(stream, {
queue: 0,
fps: this.hasMotionType ? 4 : undefined,
resize: this.model?.inputSize ? {
width: this.model.inputSize[0],
height: this.model.inputSize[1],

4
plugins/python-codecs/package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "@scrypted/python-codecs",
"version": "0.1.47",
"version": "0.1.48",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "@scrypted/python-codecs",
"version": "0.1.47",
"version": "0.1.48",
"devDependencies": {
"@scrypted/sdk": "file:../../sdk"
}

2
plugins/python-codecs/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scrypted/python-codecs",
"version": "0.1.47",
"version": "0.1.48",
"description": "Python Codecs for Scrypted",
"keywords": [
"scrypted",

8
plugins/python-codecs/src/gstreamer.py
View File

@@ -78,7 +78,13 @@ async def generateVideoFramesGstreamer(mediaObject: scrypted_sdk.MediaObject, op
# so use a known software decoder for h264 and decodebin for anything else.
decoder = 'decodebin'
videosrc += ' ! {decoder} ! queue leaky=downstream max-size-buffers=0 ! videoconvert ! {videocaps}'.format(decoder=decoder, videocaps=videocaps)
fps = options and options.get('fps', None)
videorate = ''
if fps:
videorate = 'videorate !'
videocaps += ',framerate={fps}/1'.format(fps=fps)
videosrc += ' ! {decoder} ! queue leaky=downstream max-size-buffers=0 ! videoconvert ! {videorate} {videocaps}'.format(decoder=decoder, videocaps=videocaps, videorate=videorate)
gst, gen = await createPipelineIterator(videosrc)
async for gstsample in gen():