diff --git a/plugins/opencv/package-lock.json b/plugins/opencv/package-lock.json index addee9245..2ae6b7c6d 100644 --- a/plugins/opencv/package-lock.json +++ b/plugins/opencv/package-lock.json @@ -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" } diff --git a/plugins/opencv/package.json b/plugins/opencv/package.json index 1af5551e3..a2ce8993b 100644 --- a/plugins/opencv/package.json +++ b/plugins/opencv/package.json @@ -30,5 +30,5 @@ "devDependencies": { "@scrypted/sdk": "file:../../sdk" }, - "version": "0.0.38" + "version": "0.0.39" } diff --git a/plugins/tensorflow-lite/package-lock.json b/plugins/tensorflow-lite/package-lock.json index 0121d064f..0c0d26d14 100644 --- a/plugins/tensorflow-lite/package-lock.json +++ b/plugins/tensorflow-lite/package-lock.json @@ -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" } diff --git a/plugins/tensorflow-lite/package.json b/plugins/tensorflow-lite/package.json index e457d0252..d8bb55ae8 100644 --- a/plugins/tensorflow-lite/package.json +++ b/plugins/tensorflow-lite/package.json @@ -37,5 +37,5 @@ "devDependencies": { "@scrypted/sdk": "file:../../sdk" }, - "version": "0.0.33" + "version": "0.0.34" } diff --git a/plugins/tensorflow-lite/src/detect/__init__.py b/plugins/tensorflow-lite/src/detect/__init__.py index eb85622f1..f06e85c0b 100644 --- a/plugins/tensorflow-lite/src/detect/__init__.py +++ b/plugins/tensorflow-lite/src/detect/__init__.py @@ -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