michael/scrypted
1
0
Fork 0
mirror of https://github.com/koush/scrypted.git synced 2026-02-09 00:39:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

coral: scale fixes

Browse Source
This commit is contained in:
Koushik Dutta
2021-12-06 00:36:20 -08:00
parent c41e871741
commit 32ced8236c
2 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
plugins/coral/src/main.py
View File

@@ -145,7 +145,7 @@ class CoralPlugin(scrypted_sdk.ScryptedDeviceBase, ObjectDetection):
detection: ObjectDetectionResult = {}
detection['id'] = str(trackID)
detection['boundingBox'] = (
obj.bbox.xmin, obj.bbox.ymin, obj.bbox.ymax, obj.bbox.ymax)
obj.bbox.xmin, obj.bbox.ymin, obj.bbox.xmax, obj.bbox.ymax)
detection['className'] = self.labels.get(obj.id, obj.id)
detection['score'] = obj.score
detections.append(detection)
@@ -153,7 +153,7 @@ class CoralPlugin(scrypted_sdk.ScryptedDeviceBase, ObjectDetection):
for obj in objs:
detection: ObjectDetectionResult = {}
detection['boundingBox'] = (
obj.bbox.xmin, obj.bbox.ymin, obj.bbox.ymax, obj.bbox.ymax)
obj.bbox.xmin, obj.bbox.ymin, obj.bbox.xmax, obj.bbox.ymax)
detection['className'] = self.labels.get(obj.id, obj.id)
detection['score'] = obj.score
detections.append(detection)
@@ -174,19 +174,20 @@ class CoralPlugin(scrypted_sdk.ScryptedDeviceBase, ObjectDetection):
detection_result: ObjectsDetected = {}
detection_result['running'] = False
detection_result['timestamp'] = int(time.time() * 1000)
self.detection_event(detection_session, detection_result)
async def detectObjects(self, mediaObject: MediaObject, session: ObjectDetectionSession = None) -> ObjectsDetected:
score_threshold = -float('inf')
score_threshold = None
duration = None
detection_id = None
detection_session = None
if session:
detection_id = session.get('detectionId', -float('inf'))
detection_id = session.get('detectionId', None)
duration = session.get('duration', None)
score_threshold = session.get('minScore', score_threshold)
score_threshold = session.get('minScore', None)
is_image = mediaObject and mediaObject.mimeType.startswith('image/')
@@ -207,7 +208,7 @@ class CoralPlugin(scrypted_sdk.ScryptedDeviceBase, ObjectDetection):
detection_session = DetectionSession()
detection_session.id = detection_id
detection_session.score_threshold = score_threshold
detection_session.score_threshold = score_threshold or -float('inf')
loop = asyncio.get_event_loop()
detection_session.loop = loop
self.detection_sessions[detection_id] = detection_session
@@ -234,7 +235,7 @@ class CoralPlugin(scrypted_sdk.ScryptedDeviceBase, ObjectDetection):
with self.mutex:
self.interpreter.invoke()
objs = detect.get_objects(
self.interpreter, score_threshold=score_threshold, image_scale=scale)
self.interpreter, score_threshold=score_threshold or -float('inf'), image_scale=scale)
return self.create_detection_result(objs, image.size, tracker = tracker)
@@ -243,9 +244,11 @@ class CoralPlugin(scrypted_sdk.ScryptedDeviceBase, ObjectDetection):
detection_session.running = True
detection_session.setTimeout(duration / 1000)
if score_threshold != None:
detection_session.score_threshold = score_threshold
if not new_session:
print("existing session")
print("existing session", detection_session.id)
return
print('detection starting', detection_id)
@@ -265,13 +268,13 @@ class CoralPlugin(scrypted_sdk.ScryptedDeviceBase, ObjectDetection):
inference_size = input_size(self.interpreter)
width, height = inference_size
w, h = (size['width'], size['height'])
scale = min(width / w, height / h)
scale = (width / w, height / h)
def user_callback(input_tensor, src_size, inference_box):
with self.mutex:
run_inference(self.interpreter, input_tensor)
objs = detect.get_objects(
self.interpreter, score_threshold=score_threshold, image_scale=(scale, scale))
self.interpreter, score_threshold=detection_session.score_threshold, image_scale=scale)
# (result, mapinfo) = input_tensor.map(Gst.MapFlags.READ)
@@ -301,6 +304,7 @@ class CoralPlugin(scrypted_sdk.ScryptedDeviceBase, ObjectDetection):
detection_result: ObjectsDetected = {}
detection_result['detectionId'] = detection_id
detection_result['running'] = True
detection_result['timestamp'] = int(time.time() * 1000)
return detection_result

13
plugins/objectdetector/src/main.ts
View File

@@ -107,16 +107,7 @@ class ObjectDetectionMixin extends SettingsMixinDeviceBase<ObjectDetector> imple
});
}
reportObjectDetections(detections: ObjectDetectionResult[], detectionInput?: DetectionInput) {
const detection: ObjectsDetected = {
timestamp: Date.now(),
detectionId: detectionInput ? this.detectionId : undefined,
inputDimensions: detectionInput
? [detectionInput?.input.shape[1], detectionInput?.input.shape[0]]
: undefined,
detections,
}
reportObjectDetections(detection: ObjectsDetected, detectionInput?: DetectionInput) {
if (detectionInput)
this.setDetection(this.detectionId, detectionInput);
@@ -165,7 +156,7 @@ class ObjectDetectionMixin extends SettingsMixinDeviceBase<ObjectDetector> imple
this.extendedObjectDetect();
}
this.reportObjectDetections(detectionResult.detections, undefined);
this.reportObjectDetections(detectionResult, undefined);
}
reportPeopleDetections(faces?: ObjectDetectionResult[], detectionInput?: DetectionInput) {