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

Merge branch 'main' of github.com:koush/scrypted

Browse Source
This commit is contained in:
Koushik Dutta
2022-05-03 18:42:21 -07:00
parent 9c91e3bc16 59a0e602e0
commit c696a94fd2
7 changed files with 57 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,12 +1,12 @@
{
"name": "@scrypted/homekit",
"version": "0.0.265",
"version": "0.0.267",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@scrypted/homekit",
"version": "0.0.265",
"version": "0.0.267",
"dependencies": {
"@koush/qrcode-terminal": "^0.12.0",
"check-disk-space": "^3.3.0",
@@ -130,7 +130,7 @@
},
"../../sdk": {
"name": "@scrypted/sdk",
"version": "0.0.192",
"version": "0.0.195",
"dev": true,
"license": "ISC",
"dependencies": {

2
plugins/homekit/package.json
View File

@@ -44,5 +44,5 @@
"@types/node": "^14.17.9",
"@types/url-parse": "^1.4.3"
},
"version": "0.0.265"
"version": "0.0.267"
}

8
plugins/homekit/src/types/camera/camera-streaming-ffmpeg.ts
View File

@@ -2,12 +2,12 @@ import { getDebugModeH264EncoderArgs } from '@scrypted/common/src/ffmpeg-hardwar
import { createBindZero } from '@scrypted/common/src/listen-cluster';
import { ffmpegLogInitialOutput, safePrintFFmpegArguments } from '@scrypted/common/src/media-helpers';
import { addTrackControls, parseSdp, replacePorts } from '@scrypted/common/src/sdp-utils';
import sdk, { FFmpegInput, MediaStreamDestination, RequestMediaStreamOptions, ScryptedDevice, ScryptedMimeTypes, VideoCamera } from '@scrypted/sdk';
import sdk, { FFmpegInput, MediaStreamDestination, ScryptedDevice, VideoCamera } from '@scrypted/sdk';
import child_process from 'child_process';
import { Writable } from 'stream';
import { RtpPacket } from '../../../../../external/werift/packages/rtp/src/rtp/rtp';
import { AudioStreamingCodecType, SRTPCryptoSuites, StartStreamRequest } from '../../hap';
import { CameraStreamingSession, KillCameraStreamingSession } from './camera-streaming-session';
import { AudioStreamingCodecType, SRTPCryptoSuites } from '../../hap';
import { CameraStreamingSession, KillCameraStreamingSession, waitForFirstVideoRtcp } from './camera-streaming-session';
import { startCameraStreamSrtp } from './camera-streaming-srtp';
import { createCameraStreamSender } from './camera-streaming-srtp-sender';
import { checkCompatibleCodec, transcodingDebugModeWarning } from './camera-utils';
@@ -322,6 +322,8 @@ export async function startCameraStreamFfmpeg(device: ScryptedDevice & VideoCame
return;
}
await waitForFirstVideoRtcp(console, session);
if (audioInput !== ffmpegInput) {
safePrintFFmpegArguments(console, videoArgs);
safePrintFFmpegArguments(console, audioArgs);

12
plugins/homekit/src/types/camera/camera-streaming-session.ts
View File

@@ -17,9 +17,21 @@ export interface CameraStreamingSession {
audioProcess: ChildProcess;
videoReturn: dgram.Socket;
audioReturn: dgram.Socket;
videoReturnRtcpReady: Promise<any>;
rtpSink?: HomeKitRtpSink;
tryReconfigureBitrate?: (reason: string, bitrate: number) => void;
mediaStreamOptions?: ResponseMediaStreamOptions;
}
export type KillCameraStreamingSession = () => void;
// this is a workaround for a bug seen in:
// ios 15.5 beta 1
// ios 15.5 beta 2
// ios 15.5 beta 4 (3 seemed fine)
// macos 12.3 beta 1
export async function waitForFirstVideoRtcp(console: Console, session: CameraStreamingSession) {
console.log('Waiting for video RTCP packet before sending video.');
await session.videoReturnRtcpReady;
console.log('Received first video RTCP packet.');
}

5
plugins/homekit/src/types/camera/camera-streaming-srtp.ts
View File

@@ -5,7 +5,7 @@ import net from 'net';
import { Readable } from 'stream';
import { RtspClient } from '../../../../../common/src/rtsp-server';
import { RtpPacket } from '../../../../../external/werift/packages/rtp/src/rtp/rtp';
import { CameraStreamingSession, KillCameraStreamingSession } from './camera-streaming-session';
import { CameraStreamingSession, KillCameraStreamingSession, waitForFirstVideoRtcp } from './camera-streaming-session';
import { createCameraStreamSender } from './camera-streaming-srtp-sender';
export interface AudioMode {
@@ -98,6 +98,9 @@ export async function startCameraStreamSrtp(media: FFmpegInput, console: Console
session.videoReturn.once('close', () => running = false);
const headerLength = isRtsp ? 4 : 2;
const lengthOffset = isRtsp ? 2 : 0;
await waitForFirstVideoRtcp(console, session);
while (running) {
let isAudio = false;
let isVideo = false;

1
plugins/homekit/src/types/camera/camera-streaming.ts
View File

@@ -95,6 +95,7 @@ export function createCameraStreamingDelegate(device: ScryptedDevice & VideoCame
audioProcess: null,
videoReturn,
audioReturn,
videoReturnRtcpReady: once(videoReturn, 'message'),
}
sessions.set(request.sessionID, session);

33
plugins/homekit/src/types/sensor.ts
View File

@@ -1,8 +1,24 @@
import { AmbientLightSensor, AudioSensor, BinarySensor, FloodSensor, HumiditySensor, MotionSensor, OccupancySensor, ScryptedDevice, ScryptedDeviceType, ScryptedInterface, Thermometer } from '@scrypted/sdk';
import { AmbientLightSensor, AudioSensor, BinarySensor, FloodSensor, HumiditySensor, MotionSensor, OccupancySensor, PM25Sensor, AirQualitySensor, ScryptedDevice, ScryptedDeviceType, ScryptedInterface, Thermometer, VOCSensor, AirQuality } from '@scrypted/sdk';
import { addSupportedType, bindCharacteristic, DummyDevice, HomeKitSession } from '../common';
import { Characteristic, Service } from '../hap';
import { makeAccessory } from './common';
function airQualityToHomekit(airQuality: AirQuality) {
switch (airQuality) {
case AirQuality.Excellent:
return Characteristic.AirQuality.EXCELLENT;
case AirQuality.Good:
return Characteristic.AirQuality.GOOD;
case AirQuality.Fair:
return Characteristic.AirQuality.FAIR;
case AirQuality.Inferior:
return Characteristic.AirQuality.INFERIOR;
case AirQuality.Poor:
return Characteristic.AirQuality.POOR;
}
return Characteristic.AirQuality.UNKNOWN;
}
const supportedSensors: string[] = [
ScryptedInterface.Thermometer,
ScryptedInterface.BinarySensor,
@@ -13,6 +29,9 @@ const supportedSensors: string[] = [
ScryptedInterface.Thermometer,
ScryptedInterface.HumiditySensor,
ScryptedInterface.FloodSensor,
ScryptedInterface.AirQualitySensor,
ScryptedInterface.PM25Sensor,
ScryptedInterface.VOCSensor,
];
addSupportedType({
@@ -24,7 +43,7 @@ addSupportedType({
}
return false;
},
getAccessory: async (device: ScryptedDevice & OccupancySensor & AmbientLightSensor & AmbientLightSensor & AudioSensor & BinarySensor & MotionSensor & Thermometer & HumiditySensor & FloodSensor, homekitSession: HomeKitSession) => {
getAccessory: async (device: ScryptedDevice & OccupancySensor & AmbientLightSensor & AmbientLightSensor & AudioSensor & BinarySensor & MotionSensor & Thermometer & HumiditySensor & FloodSensor & AirQualitySensor & PM25Sensor & VOCSensor, homekitSession: HomeKitSession) => {
const accessory = makeAccessory(device, homekitSession);
if (device.interfaces.includes(ScryptedInterface.BinarySensor)) {
@@ -75,6 +94,16 @@ addSupportedType({
() => !!device.flooded);
}
if (device.interfaces.includes(ScryptedInterface.AirQualitySensor)) {
const service = accessory.addService(Service.AirQualitySensor, device.name);
bindCharacteristic(device, ScryptedInterface.AirQualitySensor, service, Characteristic.AirQuality,
() => airQualityToHomekit(device.airQuality));
bindCharacteristic(device, ScryptedInterface.PM25Sensor, service, Characteristic.PM2_5Density,
() => device.pm25Density || 0);
bindCharacteristic(device, ScryptedInterface.VOCSensor, service, Characteristic.VOCDensity,
() => device.vocDensity || 0);
}
// todo: more sensors.
return accessory;
}