From 9d8345e9015c5e198aaa305d50170da3f6031ee8 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Wed, 3 May 2023 15:57:37 -0700
Subject: [PATCH] videoanalysis/motion: implement video rate control

---
 plugins/objectdetector/package-lock.json | 4 ++--
 plugins/objectdetector/package.json      | 2 +-
 plugins/objectdetector/src/main.ts       | 1 +
 plugins/python-codecs/package-lock.json  | 4 ++--
 plugins/python-codecs/package.json       | 2 +-
 plugins/python-codecs/src/gstreamer.py   | 8 +++++++-
 6 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/plugins/objectdetector/package-lock.json b/plugins/objectdetector/package-lock.json
index c45f67bae..8f27aac82 100644
--- a/plugins/objectdetector/package-lock.json
+++ b/plugins/objectdetector/package-lock.json
@@ -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",
diff --git a/plugins/objectdetector/package.json b/plugins/objectdetector/package.json
index 0427df686..59fec9bdb 100644
--- a/plugins/objectdetector/package.json
+++ b/plugins/objectdetector/package.json
@@ -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",
diff --git a/plugins/objectdetector/src/main.ts b/plugins/objectdetector/src/main.ts
index 0d2c47f36..c1f949283 100644
--- a/plugins/objectdetector/src/main.ts
+++ b/plugins/objectdetector/src/main.ts
@@ -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],
diff --git a/plugins/python-codecs/package-lock.json b/plugins/python-codecs/package-lock.json
index 3922b7b84..1850bea4e 100644
--- a/plugins/python-codecs/package-lock.json
+++ b/plugins/python-codecs/package-lock.json
@@ -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"
          }
diff --git a/plugins/python-codecs/package.json b/plugins/python-codecs/package.json
index 68406dd71..233244d03 100644
--- a/plugins/python-codecs/package.json
+++ b/plugins/python-codecs/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/python-codecs",
-   "version": "0.1.47",
+   "version": "0.1.48",
    "description": "Python Codecs for Scrypted",
    "keywords": [
       "scrypted",
diff --git a/plugins/python-codecs/src/gstreamer.py b/plugins/python-codecs/src/gstreamer.py
index 1e9edde39..e725b8c21 100644
--- a/plugins/python-codecs/src/gstreamer.py
+++ b/plugins/python-codecs/src/gstreamer.py
@@ -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():