opencv/tflite: support sdp inputs from wrtc

This commit is contained in:
Koushik Dutta
2022-01-28 14:49:45 -08:00
parent cc53bbffb5
commit c704472f77
5 changed files with 14 additions and 8 deletions

View File

@@ -1,12 +1,12 @@
{
"name": "@scrypted/opencv",
"version": "0.0.38",
"version": "0.0.39",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@scrypted/opencv",
"version": "0.0.38",
"version": "0.0.39",
"devDependencies": {
"@scrypted/sdk": "file:../../sdk"
}

View File

@@ -30,5 +30,5 @@
"devDependencies": {
"@scrypted/sdk": "file:../../sdk"
},
"version": "0.0.38"
"version": "0.0.39"
}

View File

@@ -1,12 +1,12 @@
{
"name": "@scrypted/tensorflow-lite",
"version": "0.0.33",
"version": "0.0.34",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@scrypted/tensorflow-lite",
"version": "0.0.33",
"version": "0.0.34",
"devDependencies": {
"@scrypted/sdk": "file:../../sdk"
}

View File

@@ -37,5 +37,5 @@
"devDependencies": {
"@scrypted/sdk": "file:../../sdk"
},
"version": "0.0.33"
"version": "0.0.34"
}

View File

@@ -272,10 +272,16 @@ class DetectPlugin(scrypted_sdk.ScryptedDeviceBase, ObjectDetection):
j: FFMpegInput = json.loads(s)
container = j.get('container', None)
videosrc = j['url']
if container == 'mpegts' and videosrc.startswith('tcp://'):
if videosrc.startswith('tcp://'):
parsed_url = urlparse(videosrc)
videosrc = 'tcpclientsrc port=%s host=%s ! tsdemux' % (
videosrc = 'tcpclientsrc port=%s host=%s' % (
parsed_url.port, parsed_url.hostname)
if container == 'mpegts':
videosrc += ' ! tsdemux'
elif container == 'sdp':
videosrc += ' ! sdpdemux'
else:
raise Exception('unknown container %s' % container)
elif videosrc.startswith('rtsp'):
videosrc = 'rtspsrc location=%s ! rtph264depay ! h264parse' % videosrc