cameras: update onvif two way

koush · Mar 27, 2024 · ec6d617 · ec6d617
1 parent 1238abe
commit ec6d617
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 13 deletions.
diff --git a/plugins/amcrest/.vscode/launch.json b/plugins/amcrest/.vscode/launch.json
@@ -10,7 +10,7 @@
             "port": 10081,
             "request": "attach",
             "skipFiles": [
-                "**/plugin-remote-worker.*",
+                "**/plugin-console.*",
                 "<node_internals>/**"
             ],
             "preLaunchTask": "scrypted: deploy+debug",

diff --git a/plugins/amcrest/package-lock.json b/plugins/amcrest/package-lock.json
diff --git a/plugins/amcrest/package.json b/plugins/amcrest/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/amcrest",
-   "version": "0.0.138",
+   "version": "0.0.140",
    "description": "Amcrest Plugin for Scrypted",
    "author": "Scrypted",
    "license": "Apache",

diff --git a/plugins/amcrest/src/main.ts b/plugins/amcrest/src/main.ts
@@ -623,7 +623,7 @@ class AmcrestCamera extends RtspSmartCamera implements VideoCameraConfiguration,
                 method: 'POST',
                 headers: {
                     'Content-Type': contentType,
-                    'Content-Length': '9999999'
+                    'Content-Length': '9999999',
                 },
                 responseType: 'readable',
             }, passthrough);

diff --git a/plugins/hikvision/package-lock.json b/plugins/hikvision/package-lock.json
diff --git a/plugins/hikvision/package.json b/plugins/hikvision/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/hikvision",
-   "version": "0.0.142",
+   "version": "0.0.144",
    "description": "Hikvision Plugin for Scrypted",
    "author": "Scrypted",
    "license": "Apache",

diff --git a/plugins/onvif/package-lock.json b/plugins/onvif/package-lock.json
diff --git a/plugins/onvif/package.json b/plugins/onvif/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/onvif",
-   "version": "0.1.10",
+   "version": "0.1.11",
    "description": "ONVIF Camera Plugin for Scrypted",
    "author": "Scrypted",
    "license": "Apache",

diff --git a/plugins/onvif/src/onvif-intercom.ts b/plugins/onvif/src/onvif-intercom.ts
@@ -60,7 +60,6 @@ export class OnvifIntercom implements Intercom {
         let transportDict: ReturnType<typeof parseSemicolonDelimited>;
         let tcp = false;
         try {
-            throw new Error()
             const headers: any = {
                 Require,
                 Transport: `RTP/AVP;unicast;client_port=${rtp}-${rtcp}`,
@@ -98,7 +97,7 @@ export class OnvifIntercom implements Intercom {
         this.camera.console.log('backchannel transport', transportDict);
 
         const availableMatches = audioBackchannel.rtpmaps.filter(rtpmap => rtpmap.ffmpegEncoder);
-        const defaultMatch = audioBackchannel.rtpmaps.find(rtpmap => rtpmap.ffmpegEncoder);
+        const defaultMatch = audioBackchannel.rtpmaps.find(rtpmap => rtpmap.ffmpegEncoder === 'pcm_mulaw') || audioBackchannel.rtpmaps.find(rtpmap => rtpmap.ffmpegEncoder);
 
         if (!defaultMatch)
             throw new Error('no supported codec was found for back channel');