sdk: remove filter from VideoFrameGenerator

koush · Nov 9, 2023 · 6d5fedc · 6d5fedc
1 parent 7eca7f6
commit 6d5fedc
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 15 deletions.
diff --git a/plugins/objectdetector/src/ffmpeg-videoframes-no-sharp.ts b/plugins/objectdetector/src/ffmpeg-videoframes-no-sharp.ts
@@ -50,7 +50,7 @@ class RawImage implements Image, RawFrame {
 }
 
 export class FFmpegVideoFrameGenerator extends ScryptedDeviceBase implements VideoFrameGenerator {
-    async *generateVideoFramesInternal(mediaObject: MediaObject, options?: VideoFrameGeneratorOptions, filter?: (videoFrame: VideoFrame) => Promise<boolean>): AsyncGenerator<VideoFrame, any, unknown> {
+    async *generateVideoFramesInternal(mediaObject: MediaObject, options?: VideoFrameGeneratorOptions): AsyncGenerator<VideoFrame, any, unknown> {
         const ffmpegInput = await sdk.mediaManager.convertMediaObjectToJSON<FFmpegInput>(mediaObject, ScryptedMimeTypes.FFmpegInput);
         const gray = options?.format === 'gray';
         const format = options?.format || 'rgb';
@@ -171,7 +171,7 @@ export class FFmpegVideoFrameGenerator extends ScryptedDeviceBase implements Vid
     }
 
 
-    async generateVideoFrames(mediaObject: MediaObject, options?: VideoFrameGeneratorOptions, filter?: (videoFrame: VideoFrame & MediaObject) => Promise<boolean>): Promise<AsyncGenerator<VideoFrame, any, unknown>> {
-        return this.generateVideoFramesInternal(mediaObject, options, filter);
+    async generateVideoFrames(mediaObject: MediaObject, options?: VideoFrameGeneratorOptions): Promise<AsyncGenerator<VideoFrame, any, unknown>> {
+        return this.generateVideoFramesInternal(mediaObject, options);
     }
 }
diff --git a/plugins/objectdetector/src/ffmpeg-videoframes.ts b/plugins/objectdetector/src/ffmpeg-videoframes.ts
@@ -132,7 +132,7 @@ class VipsImage implements Image {
 }
 
 export class FFmpegVideoFrameGenerator extends ScryptedDeviceBase implements VideoFrameGenerator {
-    async *generateVideoFramesInternal(mediaObject: MediaObject, options?: VideoFrameGeneratorOptions, filter?: (videoFrame: VideoFrame) => Promise<boolean>): AsyncGenerator<VideoFrame, any, unknown> {
+    async *generateVideoFramesInternal(mediaObject: MediaObject, options?: VideoFrameGeneratorOptions): AsyncGenerator<VideoFrame, any, unknown> {
         const ffmpegInput = await sdk.mediaManager.convertMediaObjectToJSON<FFmpegInput>(mediaObject, ScryptedMimeTypes.FFmpegInput);
         const gray = options?.format === 'gray';
         const channels = gray ? 1 : 3;
@@ -249,8 +249,7 @@ export class FFmpegVideoFrameGenerator extends ScryptedDeviceBase implements Vid
         }
     }
 
-
-    async generateVideoFrames(mediaObject: MediaObject, options?: VideoFrameGeneratorOptions, filter?: (videoFrame: VideoFrame) => Promise<boolean>): Promise<AsyncGenerator<VideoFrame, any, unknown>> {
-        return this.generateVideoFramesInternal(mediaObject, options, filter);
+    async generateVideoFrames(mediaObject: MediaObject, options?: VideoFrameGeneratorOptions): Promise<AsyncGenerator<VideoFrame, any, unknown>> {
+        return this.generateVideoFramesInternal(mediaObject, options);
     }
 }
diff --git a/plugins/python-codecs/src/gstreamer.py b/plugins/python-codecs/src/gstreamer.py
@@ -314,7 +314,6 @@ async def createGstMediaObject(image: GstImage):
 async def generateVideoFramesGstreamer(
     mediaObject: scrypted_sdk.MediaObject,
     options: scrypted_sdk.VideoFrameGeneratorOptions = None,
-    filter: Any = None,
     h264Decoder: str = None,
     h265Decoder: str = None,
     postProcessPipeline: str = None,

diff --git a/plugins/python-codecs/src/libav.py b/plugins/python-codecs/src/libav.py
@@ -20,7 +20,6 @@
 async def generateVideoFramesLibav(
     mediaObject: scrypted_sdk.MediaObject,
     options: scrypted_sdk.VideoFrameGeneratorOptions = None,
-    filter: Any = None,
 ) -> scrypted_sdk.VideoFrame:
     ffmpegInput: scrypted_sdk.FFmpegInput = (
         await scrypted_sdk.mediaManager.convertMediaObjectToJSON(

diff --git a/plugins/python-codecs/src/main.py b/plugins/python-codecs/src/main.py
@@ -36,7 +36,7 @@ async def generateVideoFrames(
         filter: Any = None,
     ) -> scrypted_sdk.VideoFrame:
         forked: CodecFork = await self.zygote().result
-        return await forked.generateVideoFramesLibav(mediaObject, options, filter)
+        return await forked.generateVideoFramesLibav(mediaObject, options)
 
 
 class GstreamerGenerator(
@@ -60,7 +60,6 @@ async def generateVideoFrames(
         return await forked.generateVideoFramesGstreamer(
             mediaObject,
             options,
-            filter,
             self.storage.getItem("h264Decoder"),
             self.storage.getItem("h265Decoder"),
             self.storage.getItem("postProcessPipeline"),
@@ -242,14 +241,13 @@ async def generateVideoFramesGstreamer(
         self,
         mediaObject: scrypted_sdk.MediaObject,
         options: scrypted_sdk.VideoFrameGeneratorOptions,
-        filter: Any,
         h264Decoder: str,
         h265Decoder: str,
         postProcessPipeline: str,
     ) -> scrypted_sdk.VideoFrame:
         async for data in self.generateVideoFrames(
             gstreamer.generateVideoFramesGstreamer(
-                mediaObject, options, filter, h264Decoder, h265Decoder, postProcessPipeline
+                mediaObject, options, h264Decoder, h265Decoder, postProcessPipeline
             ),
             "gstreamer",
             options and options.get("firstFrameOnly"),
@@ -260,10 +258,9 @@ async def generateVideoFramesLibav(
         self,
         mediaObject: scrypted_sdk.MediaObject,
         options: scrypted_sdk.VideoFrameGeneratorOptions = None,
-        filter: Any = None,
     ) -> scrypted_sdk.VideoFrame:
         async for data in self.generateVideoFrames(
-            libav.generateVideoFramesLibav(mediaObject, options, filter),
+            libav.generateVideoFramesLibav(mediaObject, options),
             "libav",
             options and options.get("firstFrameOnly"),
         ):