michael/scrypted
1
0
Fork 0
mirror of https://github.com/koush/scrypted.git synced 2026-03-20 16:40:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sdk: remove filter from VideoFrameGenerator

Browse Source
This commit is contained in:
Koushik Dutta
2023-11-09 10:24:55 -08:00
parent 7eca7f69c0
commit 6d5fedc931
5 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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,

1
plugins/python-codecs/src/libav.py
View File

@@ -20,7 +20,6 @@ except:
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(

9
plugins/python-codecs/src/main.py
View File

@@ -36,7 +36,7 @@ class LibavGenerator(scrypted_sdk.ScryptedDeviceBase, scrypted_sdk.VideoFrameGen
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 @@ class GstreamerGenerator(
return await forked.generateVideoFramesGstreamer(
mediaObject,
options,
filter,
self.storage.getItem("h264Decoder"),
self.storage.getItem("h265Decoder"),
self.storage.getItem("postProcessPipeline"),
@@ -242,14 +241,13 @@ class CodecFork:
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 @@ class CodecFork:
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"),
):