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

homekit: send snapshot hints along

Browse Source
This commit is contained in:
Koushik Dutta
2021-10-05 00:00:47 -07:00
parent 78a8ee1e76
commit c412d819e0
4 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/homekit/package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "@scrypted/homekit",
"version": "0.0.78",
"version": "0.0.79",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@scrypted/homekit",
"version": "0.0.78",
"version": "0.0.79",
"dependencies": {
"hap-nodejs": "file:../HAP-NodeJS",
"lodash": "^4.17.21",

2
plugins/homekit/package.json
View File

@@ -40,5 +40,5 @@
"@types/qrcode": "^1.4.1",
"@types/url-parse": "^1.4.3"
},
"version": "0.0.78"
"version": "0.0.79"
}

5
plugins/homekit/src/common.ts
View File

@@ -1,7 +1,6 @@
import { EventListenerRegister, ScryptedDevice, ScryptedDeviceType, ScryptedInterface } from '@scrypted/sdk';
import { Accessory, Service } from './hap';
import throttle from 'lodash/throttle';
import { Accessory, Service, SnapshotRequest } from './hap';
export interface DummyDevice {
interfaces?: string[];
@@ -9,7 +8,7 @@ export interface DummyDevice {
}
export interface SnapshotThrottle {
(): Promise<Buffer>;
(request: SnapshotRequest): Promise<Buffer>;
}
export interface HomeKitSession {

23
plugins/homekit/src/types/camera.ts
View File

@@ -111,7 +111,7 @@ async function* handleFragmentsRequests(device: ScryptedDevice & VideoCamera & M
}
log.i(`${device.name} motion recording starting`);
const session = await startFFMPegFragmetedMP4Session(ffmpegInput, audioArgs, videoArgs);
const session = await startFFMPegFragmetedMP4Session(ffmpegInput, audioArgs, videoArgs, console);
log.i(`${device.name} motion recording started`);
const { socket, cp, generator } = session;
@@ -186,12 +186,17 @@ addSupportedType({
}
const takePicture = async () => {
const takePicture = async (request: SnapshotRequest) => {
if (pendingPicture)
return pendingPicture;
if (device.interfaces.includes(ScryptedInterface.Camera)) {
const media = await device.takePicture();
const media = await device.takePicture({
picture: {
width: request.width,
height: request.height,
}
});
pendingPicture = mediaManager.convertMediaObjectToBuffer(media, 'image/jpeg');
}
else {
@@ -235,9 +240,9 @@ addSupportedType({
trailing: true,
});
function snapshotAll() {
function snapshotAll(request: SnapshotRequest) {
for (const snapshotThrottle of homekitSession.snapshotThrottles.values()) {
snapshotThrottle();
snapshotThrottle(request);
}
}
@@ -248,7 +253,7 @@ addSupportedType({
try {
// non zero reason is for homekit secure video... or something else.
if (request.reason) {
callback(null, await takePicture());
callback(null, await takePicture(request));
return;
}
@@ -261,8 +266,8 @@ addSupportedType({
// fetch everything serially.
// this call is not a bug, to force lodash to take a picture on the trailing edge,
// throttle must be called twice.
snapshotAll();
snapshotAll();
snapshotAll(request);
snapshotAll(request);
// path to return blank snapshots
if (localStorage.getItem('blankSnapshots') === 'true') {
@@ -275,7 +280,7 @@ addSupportedType({
return;
}
callback(null, await throttledTakePicture());
callback(null, await throttledTakePicture(request));
}
catch (e) {
console.error('snapshot error', e);