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

homekit: log packet loss

Browse Source
This commit is contained in:
Koushik Dutta
2022-04-11 11:56:36 -07:00
parent 5ce5e7ca1a
commit 0fa228cd03
2 changed files with 43 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,18 +1,13 @@
import { readLength } from '@scrypted/common/src/read-stream';
import { parsePayloadTypes, parseSdp } from '@scrypted/common/src/sdp-utils';
import sdk, { RequestMediaStreamOptions, VideoCamera } from '@scrypted/sdk';
import { parseSdp } from '@scrypted/common/src/sdp-utils';
import net from 'net';
import { Readable } from 'stream';
import { RtspClient } from '../../../../../common/src/rtsp-server';
import { RtcpPacketConverter } from '../../../../../external/werift/packages/rtp/src/rtcp/rtcp';
import { RtpPacket } from '../../../../../external/werift/packages/rtp/src/rtp/rtp';
import { ProtectionProfileAes128CmHmacSha1_80 } from '../../../../../external/werift/packages/rtp/src/srtp/const';
import { SrtcpSession } from '../../../../../external/werift/packages/rtp/src/srtp/srtcp';
import { CameraStreamingSession, KillCameraStreamingSession } from './camera-streaming-session';
import { createCameraStreamSender } from './camera-streaming-srtp-sender';
const { mediaManager } = sdk;
export async function startCameraStreamSrtp(media: any, console: Console, session: CameraStreamingSession, killSession: KillCameraStreamingSession) {
const vconfig = {
keys: {
@@ -33,13 +28,6 @@ export async function startCameraStreamSrtp(media: any, console: Console, sessio
profile: ProtectionProfileAes128CmHmacSha1_80,
};
const asrtcp = new SrtcpSession(aconfig);
session.audioReturn.on('message', data => {
const d = asrtcp.decrypt(data);
const rtcp = RtcpPacketConverter.deSerialize(d);
console.log(rtcp);
})
let { url, sdp, mediaStreamOptions } = media;
session.mediaStreamOptions = mediaStreamOptions;
let socket: Readable;

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

@@ -182,6 +182,34 @@ export function createCameraStreamingDelegate(device: ScryptedDevice & VideoCame
session.startRequest = request as StartStreamRequest;
const vconfig = {
keys: {
localMasterKey: session.prepareRequest.video.srtp_key,
localMasterSalt: session.prepareRequest.video.srtp_salt,
remoteMasterKey: session.prepareRequest.video.srtp_key,
remoteMasterSalt: session.prepareRequest.video.srtp_salt,
},
profile: ProtectionProfileAes128CmHmacSha1_80,
};
const vrtcp = new SrtcpSession(vconfig);
// watch for data to verify other side is alive.
const resetIdleTimeout = () => {
clearTimeout(idleTimeout);
idleTimeout = setTimeout(() => {
console.log('HomeKit Streaming RTCP timed out. Terminating Streaming.');
killSession(request.sessionID);
}, 30000);
}
let lastPacketLoss = 0;
const logPacketLoss = (rr: RtcpRrPacket) => {
if (rr.reports[0]?.packetsLost && rr.reports[0].packetsLost !== lastPacketLoss) {
console.log('packet loss', rr.reports[0].packetsLost);
lastPacketLoss = rr.reports[0].packetsLost;
}
}
if (dynamicBitrate) {
const initialBitrate = request.video.max_bit_rate * 1000;
let dynamicBitrateSession: DynamicBitrateSession;
@@ -217,27 +245,18 @@ export function createCameraStreamingDelegate(device: ScryptedDevice & VideoCame
session.tryReconfigureBitrate('start', initialBitrate);
const vconfig = {
keys: {
localMasterKey: session.prepareRequest.video.srtp_key,
localMasterSalt: session.prepareRequest.video.srtp_salt,
remoteMasterKey: session.prepareRequest.video.srtp_key,
remoteMasterSalt: session.prepareRequest.video.srtp_salt,
},
profile: ProtectionProfileAes128CmHmacSha1_80,
};
const vrtcp = new SrtcpSession(vconfig);
session.videoReturn.on('message', data => {
resetIdleTimeout();
if (!!ensureDynamicBitrateSession())
return;
const d = vrtcp.decrypt(data);
const rtcp = RtcpPacketConverter.deSerialize(d);
const rr = rtcp.find(packet => packet.type === 201);
const rr = rtcp.find(packet => packet.type === 201) as RtcpRrPacket;
if (!rr)
return;
if (dynamicBitrateSession.shouldReconfigureBitrate(rr as RtcpRrPacket))
if (dynamicBitrateSession.shouldReconfigureBitrate(rr))
session.tryReconfigureBitrate('rtcp', dynamicBitrateSession.currentBitrate)
logPacketLoss(rr);
});
// reset the video bitrate to max after a dynanic bitrate session ends.
@@ -247,19 +266,18 @@ export function createCameraStreamingDelegate(device: ScryptedDevice & VideoCame
session.tryReconfigureBitrate('stop', session.mediaStreamOptions?.video?.maxBitrate);
});
}
// watch for data to verify other side is alive.
const resetIdleTimeout = () => {
clearTimeout(idleTimeout);
idleTimeout = setTimeout(() => {
console.log('HomeKit Streaming RTCP timed out. Terminating Streaming.');
killSession(request.sessionID);
}, 30000);
else {
session.videoReturn.on('message', data => {
resetIdleTimeout();
const d = vrtcp.decrypt(data);
const rtcp = RtcpPacketConverter.deSerialize(d);
const rr = rtcp.find(packet => packet.type === 201) as RtcpRrPacket;
if (!rr)
return;
logPacketLoss(rr);
});
}
session.videoReturn.on('message', () => {
resetIdleTimeout();
});
resetIdleTimeout();
const mediaOptions: RequestMediaStreamOptions = {