diff --git a/common/src/autoconfigure-codecs.ts b/common/src/autoconfigure-codecs.ts
index 5eab68c7c..6b0031d3f 100644
--- a/common/src/autoconfigure-codecs.ts
+++ b/common/src/autoconfigure-codecs.ts
@@ -86,10 +86,12 @@ export async function autoconfigureCodecs(
         let diff = 999999999;
         let ret: [number, number];
 
+        const targetArea = width * height;
         for (const res of config.video.resolutions) {
-            const d = Math.abs(res[0] - width) + Math.abs(res[1] - height);
-            if (d < diff) {
-                diff = d;
+            const actualArea = res[0] * res[1];
+            const diffArea = Math.abs(targetArea - actualArea);            
+            if (diffArea < diff) {
+                diff = diffArea;
                 ret = res;
             }
         }
diff --git a/plugins/amcrest/package-lock.json b/plugins/amcrest/package-lock.json
index 317b20733..31d35d505 100644
--- a/plugins/amcrest/package-lock.json
+++ b/plugins/amcrest/package-lock.json
@@ -1,12 +1,12 @@
 {
    "name": "@scrypted/amcrest",
-   "version": "0.0.160",
+   "version": "0.0.161",
    "lockfileVersion": 3,
    "requires": true,
    "packages": {
       "": {
          "name": "@scrypted/amcrest",
-         "version": "0.0.160",
+         "version": "0.0.161",
          "license": "Apache",
          "dependencies": {
             "@scrypted/common": "file:../../common",
diff --git a/plugins/amcrest/package.json b/plugins/amcrest/package.json
index 65d4a08bc..44cd44c0d 100644
--- a/plugins/amcrest/package.json
+++ b/plugins/amcrest/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/amcrest",
-   "version": "0.0.160",
+   "version": "0.0.161",
    "description": "Amcrest Plugin for Scrypted",
    "author": "Scrypted",
    "license": "Apache",
diff --git a/plugins/hikvision/package-lock.json b/plugins/hikvision/package-lock.json
index c9844f0c9..c94f925ea 100644
--- a/plugins/hikvision/package-lock.json
+++ b/plugins/hikvision/package-lock.json
@@ -1,12 +1,12 @@
 {
    "name": "@scrypted/hikvision",
-   "version": "0.0.158",
+   "version": "0.0.159",
    "lockfileVersion": 2,
    "requires": true,
    "packages": {
       "": {
          "name": "@scrypted/hikvision",
-         "version": "0.0.158",
+         "version": "0.0.159",
          "license": "Apache",
          "dependencies": {
             "@scrypted/common": "file:../../common",
diff --git a/plugins/hikvision/package.json b/plugins/hikvision/package.json
index 2fa3bf521..ea8990369 100644
--- a/plugins/hikvision/package.json
+++ b/plugins/hikvision/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/hikvision",
-   "version": "0.0.158",
+   "version": "0.0.159",
    "description": "Hikvision Plugin for Scrypted",
    "author": "Scrypted",
    "license": "Apache",
diff --git a/plugins/onvif/package-lock.json b/plugins/onvif/package-lock.json
index b351b7f4d..eb2d671fd 100644
--- a/plugins/onvif/package-lock.json
+++ b/plugins/onvif/package-lock.json
@@ -1,12 +1,12 @@
 {
    "name": "@scrypted/onvif",
-   "version": "0.1.21",
+   "version": "0.1.22",
    "lockfileVersion": 3,
    "requires": true,
    "packages": {
       "": {
          "name": "@scrypted/onvif",
-         "version": "0.1.21",
+         "version": "0.1.22",
          "license": "Apache",
          "dependencies": {
             "@scrypted/common": "file:../../common",
diff --git a/plugins/onvif/package.json b/plugins/onvif/package.json
index 151bbeac0..3630b593a 100644
--- a/plugins/onvif/package.json
+++ b/plugins/onvif/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/onvif",
-   "version": "0.1.21",
+   "version": "0.1.22",
    "description": "ONVIF Camera Plugin for Scrypted",
    "author": "Scrypted",
    "license": "Apache",