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

hikvision: fix camera number detection when more than 10 cameras

Browse Source
This commit is contained in:
Koushik Dutta
2022-10-30 10:16:15 -07:00
parent 31c776900b
commit 2cd2aa1ec2
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,12 +1,12 @@
{
"name": "@scrypted/hikvision",
"version": "0.0.110",
"version": "0.0.111",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@scrypted/hikvision",
"version": "0.0.110",
"version": "0.0.111",
"license": "Apache",
"dependencies": {
"@koush/axios-digest-auth": "^0.8.5",

2
plugins/hikvision/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scrypted/hikvision",
"version": "0.0.110",
"version": "0.0.111",
"description": "HikVision Plugin for Scrypted",
"author": "Scrypted",
"license": "Apache",

17
plugins/hikvision/src/main.ts
View File

@@ -11,6 +11,12 @@ import xml2js from 'xml2js';
const { mediaManager } = sdk;
function channelToCameraNumber(channel: string) {
if (!channel)
return;
return channel.substring(0, channel.length - 2);
}
class HikVisionCamera extends RtspSmartCamera implements Camera, Intercom {
detectedChannels: Promise<Map<string, MediaStreamOptions>>;
client: HikVisionCameraAPI;
@@ -65,7 +71,7 @@ class HikVisionCamera extends RtspSmartCamera implements Camera, Intercom {
const channelIds = (await this.detectedChannels).keys();
ignoreCameraNumber = true;
for (const id of channelIds) {
if (id === userCameraNumber) {
if (channelToCameraNumber(id) === userCameraNumber) {
ignoreCameraNumber = false;
break;
}
@@ -138,12 +144,7 @@ class HikVisionCamera extends RtspSmartCamera implements Camera, Intercom {
}
getCameraNumber() {
const channel = this.getRtspChannel();
// have users with more than 10 cameras. unsure if it is possible
// to have more than 10 substreams...
if (channel?.length > 3)
return channel.substring(0, channel.length - 2);
return channel?.substring(0, 1) || '1';
return channelToCameraNumber(this.getRtspChannel());
}
getRtspUrlParams() {
@@ -231,7 +232,7 @@ class HikVisionCamera extends RtspSmartCamera implements Camera, Intercom {
let index = 0;
const cameraNumber = this.getCameraNumber();
for (const [id, channel] of detectedChannels.entries()) {
if (cameraNumber && id !== cameraNumber)
if (cameraNumber && channelToCameraNumber(id) !== cameraNumber)
continue;
const mso = this.createRtspMediaStreamOptions(`rtsp://${this.getRtspAddress()}/ISAPI/Streaming/channels/${id}/${params}`, index++);
Object.assign(mso.video, channel?.video);