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

amcrest: ad410 autoconfigure fixes

Browse Source
This commit is contained in:
Koushik Dutta
2024-08-11 19:31:01 -07:00
parent 03f1957739
commit d32efd6500
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,12 +1,12 @@
{
"name": "@scrypted/amcrest",
"version": "0.0.155",
"version": "0.0.156",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "@scrypted/amcrest",
"version": "0.0.155",
"version": "0.0.156",
"license": "Apache",
"dependencies": {
"@scrypted/common": "file:../../common",

2
plugins/amcrest/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@scrypted/amcrest",
"version": "0.0.155",
"version": "0.0.156",
"description": "Amcrest Plugin for Scrypted",
"author": "Scrypted",
"license": "Apache",

16
plugins/amcrest/src/amcrest-api.ts
View File

@@ -484,10 +484,20 @@ export class AmcrestCameraClient {
}
const caps = `caps[${cameraNumber - 1}].${format}[${formatNumber}]`;
const singleCaps = `caps.${format}[${formatNumber}]`;
const resolutions = findValue(capsResponse.body, caps, 'Video.ResolutionTypes').split(',').map(fromAmcrestResolution);
const bitrates = findValue(capsResponse.body, caps, 'Video.BitRateOptions').split(',').map(s => parseInt(s) * 1000);
const fpsMax = parseInt(findValue(capsResponse.body, caps, 'Video.FPSMax'));
const findCaps = (key: string) => {
const found = findValue(capsResponse.body, caps, key);
if (found)
return found;
// ad410 doesnt return a camera number if accessed directly
if (cameraNumber - 1 === 0)
return findValue(capsResponse.body, singleCaps, key);
}
const resolutions = findCaps('Video.ResolutionTypes').split(',').map(fromAmcrestResolution);
const bitrates = findCaps('Video.BitRateOptions').split(',').map(s => parseInt(s) * 1000);
const fpsMax = parseInt(findCaps('Video.FPSMax'));
const vso: MediaStreamConfiguration = {
id: options.id,
video: {},