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

python-codecs: implement hang protection

Browse Source
This commit is contained in:
Koushik Dutta
2023-06-11 14:24:53 -07:00
parent ea6e33d159
commit 8f83894e49
5 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/python-codecs/.vscode/settings.json vendored
View File

@@ -1,8 +1,8 @@
{
// docker installation
"scrypted.debugHost": "koushik-ubuntu",
"scrypted.serverRoot": "/server",
// "scrypted.debugHost": "koushik-ubuntu",
// "scrypted.serverRoot": "/server",
// windows installation
// "scrypted.debugHost": "koushik-windows",
@@ -13,8 +13,8 @@
// "scrypted.serverRoot": "/home/pi/.scrypted",
// local checkout
// "scrypted.debugHost": "127.0.0.1",
// "scrypted.serverRoot": "/Users/koush/.scrypted",
"scrypted.debugHost": "127.0.0.1",
"scrypted.serverRoot": "/Users/koush/.scrypted",
"scrypted.pythonRemoteRoot": "${config:scrypted.serverRoot}/volume/plugin.zip",
"python.analysis.extraPaths": [

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

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

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

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

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

@@ -20,7 +20,6 @@ async def createPipelineIterator(pipeline: str, gst = None):
print(pipeline)
finished = concurrent.futures.Future()
newGst = not gst
if gst:
bin = Gst.parse_bin_from_description(pipeline, False)
gst.add(bin)

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

@@ -149,30 +149,33 @@ def multiprocess_exit():
os._exit(os.EX_OK)
class CodecFork:
async def generateVideoFramesGstreamer(self, mediaObject: scrypted_sdk.MediaObject, options: scrypted_sdk.VideoFrameGeneratorOptions, filter: Any, h264Decoder: str, postProcessPipeline: str) -> scrypted_sdk.VideoFrame:
async def generateVideoFrames(self, iter, src: str):
start = time.time()
loop = asyncio.get_event_loop()
def timeoutExit():
print('Frame yield timed out, exiting pipeline.')
multiprocess_exit()
try:
async for data in gstreamer.generateVideoFramesGstreamer(mediaObject, options, filter, h264Decoder, postProcessPipeline):
while True:
data = await asyncio.wait_for(iter.__anext__(), timeout=10)
timeout = loop.call_later(10, timeoutExit)
yield data
except Exception as e:
timeout.cancel()
except Exception:
traceback.print_exc()
raise
finally:
print('gstreamer finished after %s' % (time.time() - start))
print('%s finished after %s' % (src, time.time() - start))
asyncio.get_event_loop().call_later(1, multiprocess_exit)
async def generateVideoFramesGstreamer(self, mediaObject: scrypted_sdk.MediaObject, options: scrypted_sdk.VideoFrameGeneratorOptions, filter: Any, h264Decoder: str, postProcessPipeline: str) -> scrypted_sdk.VideoFrame:
async for data in self.generateVideoFrames(gstreamer.generateVideoFramesGstreamer(mediaObject, options, filter, h264Decoder, postProcessPipeline), "gstreamer"):
yield data
async def generateVideoFramesLibav(self, mediaObject: scrypted_sdk.MediaObject, options: scrypted_sdk.VideoFrameGeneratorOptions = None, filter: Any = None) -> scrypted_sdk.VideoFrame:
start = time.time()
try:
async for data in libav.generateVideoFramesLibav(mediaObject, options, filter):
yield data
except Exception as e:
traceback.print_exc()
raise
finally:
print('libav finished after %s' % (time.time() - start))
asyncio.get_event_loop().call_later(1, multiprocess_exit)
async for data in self.generateVideoFrames(libav.generateVideoFramesLibav(mediaObject, options, filter), "libav"):
yield data
async def fork():
return CodecFork()