homebridge-unifi-protect 6.22.0 → 7.0.1

package/README.md

@@ -75,35 +75,35 @@ I hope to continue to work on this one to get AEC working for two-way audio. [Yo
   * [Plugin Configuration Reference](https://github.com/hjdhjd/homebridge-unifi-protect/blob/main/docs/ConfigurationReference.md): complete list of configuration options available in this plugin.
 
 ## Installation
-### Prerequisites:
 
-  * Ensure you are using a machine that can handle the CPU and GPU requirements of `homebridge-unifi-protect`. The more cameras you have, the higher the performance requirements. If you intend to use HomeKit Secure Video, in particular, you will need a capable, modern CPU. Raspberry Pi 4 is a great piece of hardware, but it cannot keep up with the demands of more than a few Protect cameras, and definitely not the higher end members of the Protect camera ecosystem.
-  * If you are new to Homebridge, please first read the [Homebridge](https://homebridge.io) [documentation](https://github.com/homebridge/homebridge/wiki) and installation instructions before proceeding. Ensure you've installed Homebridge and the [Homebridge Config UI](https://github.com/homebridge/homebridge-config-ui-x) before proceeding.
-  * Ensure you have a ***local user*** account on your UniFi console dedicated to `homebridge-unifi-protect`. To create a local user account on your UniFi console:
-    * Go to the ***OS Settings*** tab on the Protect controller web interface. This is typicaly near the top left of the Protect controller UI page.
-    * Click ***Add Admin*** located near the top right of the ***OS Settings*** page.
-    * Click ***Restrict to local access only*** and then enter in a username and password for the new local user.
-    * Optionally customize the role of the user to adjust the roles. HBUP requires the ***Full Management*** role for all of it's capabilities to work, although it will work in a more limited form without administrative privileges.
-
-### Getting Started
-To install `homebridge-unifi-protect`:
-
-1. Go to the `Plugins` tab in the Homebridge Config UI and searching for `homebridge-unifi-protect` and install it.
-2. Click on the ***Set Up*** icon located in the top right corner of the Homebridge UniFi Protect tile and then enter the hostname or IP address of the Protect controller as well as the username and password you created in the steps above and then login to the Protect controller.
-3. For the moment, don't make any other configuration changes and click ***Save*** and then click ***Restart Homebridge***.
-4. After restarting Homebridge, click on the ***Set Up Child Bridge*** icon located in the top right corner of the Homebridge UniFi Protect tile. Toggle the child bridge setting for UniFi Protect to ***on*** and then save and restart Homebridge.
-5. After restarting Homebridge, click on the ***Connect to HomeKit*** icon located in the top right corner of the Homebridge UniFi Protect tile. Use the Home app on your iPhone and scan the QR code to connect UniFi Protect to HomeKit. The Home app may ask questions about where to locate your cameras and whether you want to enable HomeKit Secure Video. Answer according to your preferences.
-6. That's it! You should now be able to access all your UniFi Protect devices in HomeKit. You can further tailor your experience by going to the Homebridge UniFi Protect webUI and exploring the various features and options that are available to you.
-
-### Technical Considerations
-
-HBUP includes everything required to get up and running on many of the [more popular platforms and operating systems](https://github.com/homebridge/ffmpeg-for-homebridge#supported-platforms). **If you're running on an unsupported platform, you will need to install a working version of *FFmpeg* for `homebridge-unifi-protect` to work correctly with your cameras. Additionally, your FFmpeg will need to support the *fdk-aac* codec if you want audio support to work. Setting up and configuring FFmpeg is beyond the scope of this documentation.**
-
-### Things To Be Aware Of
-- Only official releases of UniFi Protect and UniFi OS firmwares are supported. **No beta, early access, or release candidate versions of any kind are supported**.
-- Only official hardware releases for UniFi Protect are supported. Early access or beta hardware is unsupported.
-- No support is provided for any beta versions of Apple operating systems (iOS, iPadOS, macOS, tvOS, etc.).
-- **My philosophy is to aggressively adopt the capability and features (that make sense in a HomeKit context) in the latest official Ubiquiti firmware releases and to deprecate old functionality that's been superceded by newer, richer, or more performant capabilities - either by HomeKit or Ubiquiti. Read the [Changelog](https://github.com/hjdhjd/homebridge-unifi-protect/blob/main/docs/Changelog.md) carefully for the latest information on what's new.**
+> [!IMPORTANT]
+>  ### Prerequisites
+>   * Ensure you are using a machine that can handle the CPU and GPU requirements of `homebridge-unifi-protect`. The more cameras you have, the higher the performance requirements. If you intend to use HomeKit Secure Video, in particular, you will need a capable, modern CPU. Raspberry Pi 4 is a great piece of hardware, but it cannot keep up with the demands of more than a few Protect cameras, and definitely not the higher end members of the Protect camera ecosystem.
+>   * If you are new to Homebridge, please first read the [Homebridge](https://homebridge.io) [documentation](https://github.com/homebridge/homebridge/wiki) and installation instructions before proceeding. Ensure you've installed Homebridge and the [Homebridge Config UI](https://github.com/homebridge/homebridge-config-ui-x) before proceeding.
+>   * Ensure you have a ***local user*** account on your UniFi console dedicated to `homebridge-unifi-protect`. To create a local user account on your UniFi console:
+>     * Go to the ***OS Settings*** tab on the Protect controller web interface. This is typicaly near the top left of the Protect controller UI page.
+>     * Click ***Add Admin*** located near the top right of the ***OS Settings*** page.
+>     * Click ***Restrict to local access only*** and then enter in a username and password for the new local user.
+>     * Optionally customize the role of the user to adjust the roles. HBUP requires the ***Full Management*** role for all of it's capabilities to work, although it will work in a more limited form without administrative privileges.
+>
+> ### Getting Started
+> To install `homebridge-unifi-protect`:
+>
+> 1. Go to the `Plugins` tab in the Homebridge Config UI and searching for `homebridge-unifi-protect` and install it.
+> 2. Click on the ***Set Up*** icon located in the top right corner of the Homebridge UniFi Protect tile and then enter the hostname or IP address of the Protect controller as well as the username and password you created in the steps above and then login to the Protect controller.
+> 3. For the moment, don't make any other configuration changes and click ***Save*** and then click ***Restart Homebridge***.
+> 4. After restarting Homebridge, click on the ***Set Up Child Bridge*** icon located in the top right corner of the Homebridge UniFi Protect tile. Toggle the child bridge setting for UniFi Protect to ***on*** and then save and restart Homebridge.
+> 5. After restarting Homebridge, click on the ***Connect to HomeKit*** icon located in the top right corner of the Homebridge UniFi Protect tile. Use the Home app on your iPhone and scan the QR code to connect UniFi Protect to HomeKit. The Home app may ask questions about where to locate your cameras and whether you want to enable HomeKit Secure Video. Answer according to your preferences.
+> 6. That's it! You should now be able to access all your UniFi Protect devices in HomeKit. You can further tailor your experience by going to the Homebridge UniFi Protect webUI and exploring the various features and options that are available to you.
+
+> [!NOTE]
+> HBUP includes everything required to get up and running on many of the [more popular platforms and operating systems](https://github.com/homebridge/ffmpeg-for-homebridge#supported-platforms). **If you're running on an unsupported platform, you will need to install a working version of *FFmpeg* for `homebridge-unifi-protect` to work correctly with your cameras. Additionally, your FFmpeg will need to support the *fdk-aac* codec if you want audio support to work. Setting up and configuring FFmpeg is beyond the scope of this documentation.**
+
+> [!TIP]
+> - Only official releases of UniFi Protect and UniFi OS firmwares are supported. **No beta, early access, or release candidate versions of any kind are supported**.
+> - Only official hardware releases for UniFi Protect are supported. Early access or beta hardware is unsupported.
+> - No support is provided for any beta versions of Apple operating systems (iOS, iPadOS, macOS, tvOS, etc.).
+> - **My philosophy is to aggressively adopt the capability and features (that make sense in a HomeKit context) in the latest official Ubiquiti firmware releases and to deprecate old functionality that's been superceded by newer, richer, or more performant capabilities - either by HomeKit or Ubiquiti. Read the [Changelog](https://github.com/hjdhjd/homebridge-unifi-protect/blob/main/docs/Changelog.md) carefully for the latest information on what's new.**
 
 ## Plugin Development Dashboard
 This is mostly of interest to the true developer nerds amongst us.
@@ -111,4 +111,4 @@ This is mostly of interest to the true developer nerds amongst us.
 [![License](https://img.shields.io/npm/l/homebridge-unifi-protect?color=%230559C9&logo=open%20source%20initiative&logoColor=%23FFFFFF&style=for-the-badge)](https://github.com/hjdhjd/homebridge-unifi-protect/blob/main/LICENSE.md)
 [![Build Status](https://img.shields.io/github/actions/workflow/status/hjdhjd/homebridge-unifi-protect/ci.yml?branch=main&color=%230559C9&logo=github-actions&logoColor=%23FFFFFF&style=for-the-badge)](https://github.com/hjdhjd/homebridge-unifi-protect/actions?query=workflow%3A%22Continuous+Integration%22)
 [![Dependencies](https://img.shields.io/librariesio/release/npm/homebridge-unifi-protect?color=%230559C9&logo=dependabot&style=for-the-badge)](https://libraries.io/npm/homebridge-unifi-protect)
-[![GitHub commits since latest release (by SemVer)](https://img.shields.io/github/commits-since/hjdhjd/homebridge-unifi-protect/latest?color=%230559C9&logo=github&sort=semver&style=for-the-badge)](https://github.com/hjdhjd/homebridge-unifi-protect/commits/master)
+[![GitHub commits since latest release (by SemVer)](https://img.shields.io/github/commits-since/hjdhjd/homebridge-unifi-protect/latest?color=%230559C9&logo=github&sort=semver&style=for-the-badge)](https://github.com/hjdhjd/homebridge-unifi-protect/commits/main)

package/config.schema.json

@@ -2,7 +2,7 @@
   "pluginAlias": "UniFi Protect",
   "pluginType": "platform",
   "headerDisplay": "Full HomeKit support UniFi Protect devices. See the [homebridge-unifi-protect](https://github.com/hjdhjd/homebridge-unifi-protect) developer page for detailed documentation.",
-  "footerDisplay": "A working **ffmpeg** installation is required for this plugin to work. For audio support, make sure your version of ffmpeg is compiled with support for **fdk-aac**.",
+  "footerDisplay": "A working **FFmpeg** installation is required for this plugin to work. For audio support, make sure your version of ffmpeg is compiled with support for the **fdk-aac** codec.",
   "singular": true,
   "customUi": true,
 
@@ -28,15 +28,6 @@
               "description": "Hostname or IP address of your UniFi Protect controller."
             },
 
-            "defaultDoorbellMessage": {
-              "type": "string",
-              "title": "Default doorbell message",
-              "required": false,
-              "maxLength": 30,
-              "placeholder": "e.g. WELCOME",
-              "description": "Default message to be used on UniFi Protect doorbells. Default: WELCOME."
-            },
-
             "doorbellMessages": {
               "type": "array",
               "title": "Doorbell Messages",
@@ -138,8 +129,8 @@
           "type": "string",
           "title": "Feature Option",
           "required": false,
-          "description": "Enter only one option per entry. See the plugin documentation for the complete list of available options or use the feature options webUI tab above.",
-          "placeholder": "e.g. Disable.Video.Transcode"
+          "description": "Enter only one option per entry. Use the feature options webUI tab above unless you know what you're doing.",
+          "placeholder": "e.g. Disable.Device"
         }
       },
 
@@ -210,7 +201,6 @@
               "expanded": false,
               "items": [
 
-                "controllers[].defaultDoorbellMessage",
                 {
                   "key": "controllers[].doorbellMessages",
                   "type": "array",
@@ -273,8 +263,8 @@
           "key": "options",
           "type": "array",
           "name": " ",
-          "description": "Feature options allow you to further customize the behavior of this plugin such as the ability to show or hide cameras or specify stream quality. You can use the the feature options tab above (recommended) to customize these settings or enter them manually below.",
-          "orderable": false,
+          "description": "Use the feature options webUI tab above instead of manually configuring feature options here.",
+          "orderable": true,
           "buttonText": "Add Feature Option",
           "items": [
             "options[]"

package/dist/devices/protect-camera-package.d.ts

@@ -4,6 +4,4 @@ export declare class ProtectCameraPackage extends ProtectCamera {
     get id(): string;
     findRtsp(): RtspEntry | null;
     findRecordingRtsp(): RtspEntry | null;
-    getBitrate(channelId: number): number;
-    setBitrate(): Promise<boolean>;
 }

package/dist/devices/protect-camera-package.js

@@ -13,10 +13,12 @@ export class ProtectCameraPackage extends ProtectCamera {
         this.hasHksv = true;
         this.hints.probesize = 32768;
         if (parentCamera) {
-            this.hints.timeshift = parentCamera.hints.timeshift;
+            this.hints.apiStreaming = parentCamera.hints.apiStreaming;
             this.hints.hardwareDecoding = parentCamera.hints.hardwareDecoding;
-            this.hints.hardwareTranscoding = false;
+            this.hints.hardwareTranscoding = parentCamera.hints.hardwareTranscoding;
+            this.hints.highResSnapshots = parentCamera.hints.highResSnapshots;
             this.hints.logHksv = parentCamera.hints.logHksv;
+            this.hints.timeshift = parentCamera.hints.timeshift;
         }
         // Clean out the context object in case it's been polluted somehow.
         this.accessory.context = {};
@@ -102,15 +104,5 @@ export class ProtectCameraPackage extends ProtectCamera {
     findRecordingRtsp() {
         return this.findRtsp();
     }
-    // Get the current bitrate for a specific camera channel.
-    getBitrate(channelId) {
-        // Find the right channel.
-        const channel = this.ufp.channels.find(x => x.id === channelId);
-        return channel?.bitrate ?? -1;
-    }
-    // Set the bitrate for a specific camera channel.
-    setBitrate() {
-        return Promise.resolve(true);
-    }
 }
 //# sourceMappingURL=protect-camera-package.js.map

package/dist/devices/protect-camera-package.js.map

@@ -1 +1 @@
-{"version":3,"file":"protect-camera-package.js","sourceRoot":"","sources":["../../src/devices/protect-camera-package.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"protect-camera-package.js","sourceRoot":"","sources":["../../src/devices/protect-camera-package.ts"],"names":[],"mappings":"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"}

package/dist/devices/protect-camera.d.ts

@@ -1,5 +1,6 @@
 import { PlatformAccessory, Resolution } from "homebridge";
 import { ProtectCameraChannelConfig, ProtectCameraConfig, ProtectEventPacket } from "unifi-protect";
+import { LivestreamManager } from "../protect-livestream.js";
 import { ProtectDevice } from "./protect-device.js";
 import { ProtectNvr } from "../protect-nvr.js";
 import { ProtectStreamingDelegate } from "../protect-stream.js";
@@ -21,6 +22,7 @@ export declare class ProtectCamera extends ProtectDevice {
     private isDeleted;
     isRinging: boolean;
     detectLicensePlate: string[];
+    readonly livestream: LivestreamManager;
     private rtspEntries;
     private rtspQuality;
     stream: ProtectStreamingDelegate;
@@ -39,12 +41,9 @@ export declare class ProtectCamera extends ProtectDevice {
     private configureVideoStream;
     private configureHksv;
     private configureHksvRecordingSwitch;
-    private configureDynamicBitrateSwitch;
     private configureNvrRecordingSwitch;
     protected configureMqtt(): boolean;
     updateDevice(): boolean;
-    getBitrate(channelId: number): number;
-    setBitrate(channelId: number, value: number): Promise<boolean>;
     private findRtspEntry;
     findRtsp(width: number, height: number, options?: RtspOptions): RtspEntry | null;
     findRecordingRtsp(width: number, height: number): RtspEntry | null;

package/dist/devices/protect-camera.js

@@ -1,5 +1,6 @@
 import { ProtectReservedNames, toCamelCase } from "../protect-types.js";
-import { PROTECT_HOMEKIT_IDR_INTERVAL } from "../settings.js";
+import { LivestreamManager } from "../protect-livestream.js";
+import { PROTECT_HKSV_IDR_INTERVAL } from "../settings.js";
 import { ProtectDevice } from "./protect-device.js";
 import { ProtectStreamingDelegate } from "../protect-stream.js";
 export class ProtectCamera extends ProtectDevice {
@@ -7,6 +8,7 @@ export class ProtectCamera extends ProtectDevice {
     isDeleted;
     isRinging;
     detectLicensePlate;
+    livestream;
     rtspEntries;
     rtspQuality;
     stream;
@@ -18,6 +20,7 @@ export class ProtectCamera extends ProtectDevice {
         this.isDeleted = false;
         this.isRinging = false;
         this.detectLicensePlate = [];
+        this.livestream = new LivestreamManager(this);
         this.rtspEntries = [];
         this.rtspQuality = {};
         this.ufp = device;
@@ -28,6 +31,7 @@ export class ProtectCamera extends ProtectDevice {
     configureHints() {
         // Configure our parent's hints.
         super.configureHints();
+        this.hints.apiStreaming = this.hasFeature("Video.Stream.UseApi");
         this.hints.crop = this.hasFeature("Video.Crop");
         this.hints.hardwareDecoding = true;
         this.hints.hardwareTranscoding = this.hasFeature("Video.Transcode.Hardware");
@@ -59,17 +63,12 @@ export class ProtectCamera extends ProtectDevice {
         // Clean out the context object in case it's been polluted somehow.
         this.accessory.context = {};
         this.accessory.context.detectMotion = savedContext.detectMotion ?? true;
-        this.accessory.context.dynamicBitrate = savedContext.dynamicBitrate ?? false;
         this.accessory.context.hksvRecording = savedContext.hksvRecording ?? true;
         this.accessory.context.mac = this.ufp.mac;
         this.accessory.context.nvr = this.nvr.ufp.mac;
         // Inform the user that motion detection will suck.
         if (this.ufp.recordingSettings.mode === "never") {
-            this.log.info("WARNING: motion events will not be generated by the Protect controller when the controller's camera recording options are set to \"never\".");
-        }
-        // Inform the user if we have enabled the dynamic bitrate setting.
-        if (this.hasFeature("Video.DynamicBitrate")) {
-            this.log.info("Dynamic streaming bitrate adjustment on the UniFi Protect controller enabled.");
+            this.log.warn("Motion events will not be generated by the Protect controller when the controller's camera recording options are set to \"never\".");
         }
         // Check to see if we have smart motion events enabled on a supported camera.
         if (this.hints.smartDetect) {
@@ -81,6 +80,9 @@ export class ProtectCamera extends ProtectDevice {
             this.log.info("Smart motion detection enabled%s.", this.ufp.featureFlags.smartDetectTypes.length ?
                 ": " + this.ufp.featureFlags.smartDetectTypes.sort().join(", ") : "");
         }
+        if (this.hints.apiStreaming) {
+            this.log.warn("API streaming enabled. This feature is experimental and provided without support. Any related support requests will be closed without comment.");
+        }
         // Configure accessory information.
         this.configureInfo();
         // Configure MQTT services.
@@ -100,8 +102,6 @@ export class ProtectCamera extends ProtectDevice {
         await this.configureVideoStream();
         // Configure our camera details.
         this.configureCameraDetails();
-        // Configure our bitrate switch.
-        this.configureDynamicBitrateSwitch();
         // Configure our NVR recording switches.
         this.configureNvrRecordingSwitch();
         // Configure the doorbell trigger.
@@ -277,9 +277,7 @@ export class ProtectCamera extends ProtectDevice {
             else {
                 // If the doorbell ring event is still going, we should be as well.
                 if (this.isRinging) {
-                    setTimeout(() => {
-                        triggerService?.updateCharacteristic(this.hap.Characteristic.On, true);
-                    }, 50);
+                    setTimeout(() => triggerService?.updateCharacteristic(this.hap.Characteristic.On, true), 50);
                 }
             }
         });
@@ -379,12 +377,12 @@ export class ProtectCamera extends ProtectDevice {
         // Enable RTSP on the camera if needed and get the list of RTSP streams we have ultimately configured.
         this.ufp = await this.nvr.ufpApi.enableRtsp(this.ufp) ?? this.ufp;
         // Figure out which camera channels are RTSP-enabled, and user-enabled.
-        let cameraChannels = this.ufp.channels.filter(x => x.isRtspEnabled && this.hasFeature("Video.Stream." + x.name, true));
+        let cameraChannels = this.ufp.channels.filter(x => x.isRtspEnabled);
         // Make sure we've got a HomeKit compatible IDR frame interval. If not, let's take care of that.
-        const idrChannels = cameraChannels.filter(x => x.idrInterval !== PROTECT_HOMEKIT_IDR_INTERVAL);
+        const idrChannels = cameraChannels.filter(x => x.idrInterval !== (PROTECT_HKSV_IDR_INTERVAL / 2));
         if (idrChannels.length) {
             // Edit the channel map and update the Protect controller.
-            this.ufp = await this.nvr.ufpApi.updateDevice(this.ufp, { channels: idrChannels.map(x => Object.assign(x, { idrInterval: PROTECT_HOMEKIT_IDR_INTERVAL })) }) ??
+            this.ufp = await this.nvr.ufpApi.updateDevice(this.ufp, { channels: idrChannels.map(x => Object.assign(x, { idrInterval: (PROTECT_HKSV_IDR_INTERVAL / 2) })) }) ??
                 this.ufp;
         }
         // Set the camera and shapshot URLs.
@@ -393,9 +391,8 @@ export class ProtectCamera extends ProtectDevice {
         cameraChannels = cameraChannels.filter(x => x.name !== "Package Camera");
         // No RTSP streams are available that meet our criteria - we're done.
         if (!cameraChannels.length) {
-            this.log.info("No RTSP stream profiles have been configured for this camera. " +
-                "Enable at least one RTSP stream profile in the UniFi Protect webUI to resolve this issue or " +
-                "assign the Administrator role to the user configured for this plugin to allow it to automatically configure itself.");
+            this.log.info("No RTSP streaming profiles have been configured for this camera. You can resolve this issue by either enabling at least one RTSP profile in the " +
+                "UniFi Protect webUI or assigning an admin role to the local Protect user account you configured for this plugin.");
             return false;
         }
         // Now that we have our RTSP streams, create a list of supported resolutions for HomeKit.
@@ -494,24 +491,24 @@ export class ProtectCamera extends ProtectDevice {
         for (const rtspProfile of ["LOW", "MEDIUM", "HIGH"]) {
             // Check to see if the user has requested a specific streaming profile for this camera.
             if (this.hasFeature("Video.Stream.Only." + rtspProfile)) {
-                this.rtspQuality.streamingDefault = rtspProfile;
+                this.hints.streamingDefault = rtspProfile;
             }
             // Check to see if the user has requested a specific recording profile for this camera.
             if (this.hasFeature("Video.HKSV.Record.Only." + rtspProfile)) {
-                this.rtspQuality.recordingDefault = rtspProfile;
+                this.hints.recordingDefault = rtspProfile;
             }
         }
         // Inform the user if we've set a streaming default.
-        if (this.rtspQuality.streamingDefault) {
-            this.log.info("Video streaming configured to use only: %s.", toCamelCase(this.rtspQuality.streamingDefault.toLowerCase()));
+        if (this.hints.streamingDefault) {
+            this.log.info("Video streaming configured to use only: %s.", toCamelCase(this.hints.streamingDefault.toLowerCase()));
         }
         // Inform the user if they've selected the legacy snapshot API.
         if (!this.hints.highResSnapshots) {
             this.log.info("Disabling the use of higher quality snapshots.");
         }
         // Inform the user if we've set a recording default.
-        if (this.rtspQuality.recordingDefault) {
-            this.log.info("HomeKit Secure Video event recording configured to use only: %s.", toCamelCase(this.rtspQuality.recordingDefault.toLowerCase()));
+        if (this.hints.recordingDefault) {
+            this.log.info("HomeKit Secure Video event recording configured to use only: %s.", toCamelCase(this.hints.recordingDefault.toLowerCase()));
         }
         // Configure the video stream with our resolutions.
         this.stream = new ProtectStreamingDelegate(this, this.rtspEntries.map(x => x.resolution));
@@ -566,60 +563,6 @@ export class ProtectCamera extends ProtectDevice {
         this.log.info("Enabling HKSV recording switch.");
         return true;
     }
-    // Configure a switch to manually enable or disable dynamic bitrate capabilities for a camera.
-    configureDynamicBitrateSwitch() {
-        // Validate whether we should have this service enabled.
-        if (!this.validService(this.hap.Service.Switch, () => {
-            // If we don't want a dynamic bitrate switch, disable it and we're done.
-            if (!this.hasFeature("Video.DynamicBitrate.Switch")) {
-                return false;
-            }
-            return true;
-        }, ProtectReservedNames.SWITCH_DYNAMIC_BITRATE)) {
-            // We want to default this back to off by default whenever we disable the dynamic bitrate switch.
-            this.accessory.context.dynamicBitrate = false;
-            return false;
-        }
-        // Acquire the service.
-        const service = this.acquireService(this.hap.Service.Switch, this.accessoryName + " Dynamic Bitrate", ProtectReservedNames.SWITCH_DYNAMIC_BITRATE);
-        // Fail gracefully.
-        if (!service) {
-            this.log.error("Unable to add dynamic bitrate switch.");
-            return false;
-        }
-        // Activate or deactivate dynamic bitrate for this device.
-        service.getCharacteristic(this.hap.Characteristic.On)?.onGet(() => {
-            return this.accessory.context.dynamicBitrate ?? false;
-        });
-        service.getCharacteristic(this.hap.Characteristic.On)?.onSet(async (value) => {
-            if (this.accessory.context.dynamicBitrate === value) {
-                return;
-            }
-            // We're enabling dynamic bitrate for this device.
-            if (value) {
-                this.accessory.context.dynamicBitrate = true;
-                this.log.info("Dynamic streaming bitrate adjustment on the UniFi Protect controller enabled.");
-                return;
-            }
-            // We're disabling dynamic bitrate for this device. Update the channels JSON to revert to the maximum bitrate we can.
-            const updatedChannels = this.ufp.channels.map(channel => ({ ...channel, bitrate: channel.maxBitrate }));
-            // Send the channels JSON to Protect.
-            const newDevice = await this.nvr.ufpApi.updateDevice(this.ufp, { channels: updatedChannels });
-            // We failed.
-            if (!newDevice) {
-                this.log.error("Unable to set the streaming bitrate to %s.", value);
-            }
-            else {
-                this.ufp = newDevice;
-            }
-            this.accessory.context.dynamicBitrate = false;
-            this.log.info("Dynamic streaming bitrate adjustment on the UniFi Protect controller disabled.");
-        });
-        // Initialize the switch.
-        service.updateCharacteristic(this.hap.Characteristic.On, this.accessory.context.dynamicBitrate);
-        this.log.info("Enabling the dynamic streaming bitrate adjustment switch.");
-        return true;
-    }
     // Configure a series of switches to manually enable or disable recording on the UniFi Protect controller for a camera.
     configureNvrRecordingSwitch() {
         const switchesEnabled = [];
@@ -652,9 +595,7 @@ export class ProtectCamera extends ProtectDevice {
                 // We only want to do something if we're being activated. Turning off the switch would really be an undefined state given that there are three different
                 // settings one can choose from. Instead, we do nothing and leave it to the user to choose what state they really want to set.
                 if (!value) {
-                    setTimeout(() => {
-                        this.updateDevice();
-                    }, 50);
+                    setTimeout(() => this.updateDevice(), 50);
                     return;
                 }
                 // Set our recording mode.
@@ -738,45 +679,16 @@ export class ProtectCamera extends ProtectDevice {
         }
         return true;
     }
-    // Get the current bitrate for a specific camera channel.
-    getBitrate(channelId) {
-        // Find the right channel.
-        const channel = this.ufp.channels.find(x => x.id === channelId);
-        return channel?.bitrate ?? -1;
-    }
-    // Set the bitrate for a specific camera channel.
-    async setBitrate(channelId, value) {
-        // If we've disabled the ability to set the bitrate dynamically, silently fail. We prioritize switches over the global setting here, in case the user enabled both,
-        // using the principle that the most specific setting always wins. If the user has both the global setting and the switch enabled, the switch will take precedence.
-        if ((!this.accessory.context.dynamicBitrate && !this.hasFeature("Video.DynamicBitrate")) ||
-            (!this.accessory.context.dynamicBitrate && this.hasFeature("Video.DynamicBitrate") && this.hasFeature("Video.DynamicBitrate.Switch"))) {
-            return true;
-        }
-        // Find the right channel.
-        const channel = this.ufp.channels.find(x => x.id === channelId);
-        // No channel, we're done.
-        if (!channel) {
-            return false;
-        }
-        // If our correct bitrate is already set, we're done.
-        if (channel.bitrate === value) {
-            return true;
-        }
-        // Make sure the requested bitrate fits within the constraints of what this channel can do.
-        channel.bitrate = Math.min(channel.maxBitrate, Math.max(channel.minBitrate, value));
-        // Tell Protect about it.
-        const newDevice = await this.nvr.ufpApi.updateDevice(this.ufp, { channels: this.ufp.channels });
-        if (!newDevice) {
-            this.log.error("Unable to set the streaming bitrate to %s.", value);
-            return false;
-        }
-        // Save our updated device context.
-        this.ufp = newDevice;
-        return true;
-    }
     // Find an RTSP configuration for a given target resolution.
     findRtspEntry(width, height, options) {
         const rtspEntries = options?.rtspEntries ?? this.rtspEntries;
+        // Dynamically add codec information to the stream description.
+        const formatEntry = (entry) => {
+            if (!entry) {
+                return null;
+            }
+            return Object.assign({}, entry, { name: entry.name + " [" + (this.ufp.videoCodec.replace("h265", "hevc")).toUpperCase() + "]" });
+        };
         // No RTSP entries to choose from, we're done.
         if (!rtspEntries || !rtspEntries.length) {
             return null;
@@ -784,39 +696,38 @@ export class ProtectCamera extends ProtectDevice {
         // Second, we check to see if we've set an explicit preference for stream quality.
         if (options?.default) {
             options.default = options.default.toUpperCase();
-            return rtspEntries.find(x => x.channel.name.toUpperCase() === options.default) ?? null;
+            return formatEntry(rtspEntries.find(x => x.channel.name.toUpperCase() === options.default)) ?? null;
         }
         // See if we have a match for our desired resolution on the camera. We ignore FPS - HomeKit clients seem to be able to handle it just fine.
         const exactRtsp = rtspEntries.find(x => (x.channel.width === width) && (x.channel.height === height));
         if (exactRtsp) {
-            return exactRtsp;
+            return formatEntry(exactRtsp);
         }
         // If we haven't found an exact match, by default, we bias ourselves to the next lower resolution we find or the lowest resolution we have available as a backstop.
         if (!options?.biasHigher) {
-            return rtspEntries.find(x => x.channel.width < width) ?? rtspEntries[rtspEntries.length - 1];
+            return formatEntry(rtspEntries.find(x => x.channel.width < width) ?? rtspEntries[rtspEntries.length - 1]);
         }
         // If we're biasing ourselves toward higher resolutions (primarily used when transcoding so we start with a higher quality input), we look for the first entry that's
         // larger than our requested width and if not found, we return the highest resolution we have available.
-        return rtspEntries.filter(x => x.channel.width > width).pop() ?? rtspEntries[0];
+        return formatEntry(rtspEntries.filter(x => x.channel.width > width).pop() ?? rtspEntries[0]);
     }
     // Find a streaming RTSP configuration for a given target resolution.
     findRtsp(width, height, options) {
         // Create our options JSON if needed.
         options = options ?? {};
         // Set our default stream, if we've configured one.
-        options.default = this.rtspQuality.streamingDefault;
+        options.default = this.hints.streamingDefault;
         // See if we've been given RTSP entries or whether we should default to our own.
         options.rtspEntries = options.rtspEntries ?? this.rtspEntries;
         // If we've imposed a constraint on the maximum dimensions of what we want due to a hardware limitation, filter out those entries.
         if (options.maxPixels !== undefined) {
             options.rtspEntries = options.rtspEntries.filter(x => (x.channel.width * x.channel.height) <= (options.maxPixels ?? Infinity));
         }
-        // Return the entry.
         return this.findRtspEntry(width, height, options);
     }
     // Find a recording RTSP configuration for a given target resolution.
     findRecordingRtsp(width, height) {
-        return this.findRtspEntry(width, height, { biasHigher: true, default: this.rtspQuality.recordingDefault ?? this.stream.ffmpegOptions.recordingDefaultChannel });
+        return this.findRtspEntry(width, height, { biasHigher: true, default: this.hints.recordingDefault ?? this.stream.ffmpegOptions.recordingDefaultChannel });
     }
     // Utility function for sorting by resolution.
     sortByResolutions(a, b) {