stabilise user media dimensions

binarykitchen · Nov 24, 2024 · d16bbed · d16bbed
1 parent ee5ac26
commit d16bbed
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/util/error/VideomailError.ts b/src/util/error/VideomailError.ts
@@ -61,7 +61,11 @@ class VideomailError extends HTTPError {
     const usefulClientData = browser.getUsefulData();
 
     this.browser = usefulClientData.browser;
-    this.cpu = usefulClientData.cpu;
+
+    // Only when architecture is set, pass it over
+    if (usefulClientData.cpu.architecture) {
+      this.cpu = usefulClientData.cpu;
+    }
     this.device = usefulClientData.device;
     this.engine = usefulClientData.engine;
     this.os = usefulClientData.os;

diff --git a/src/wrappers/visuals/userMedia.ts b/src/wrappers/visuals/userMedia.ts
@@ -391,11 +391,19 @@ class UserMedia extends Despot {
   }
 
   public getVideoHeight() {
-    return this.rawVisualUserMedia?.videoHeight;
+    if (!this.rawVisualUserMedia) {
+      return undefined;
+    }
+
+    return this.rawVisualUserMedia.videoHeight || this.rawVisualUserMedia.height;
   }
 
   public getVideoWidth() {
-    return this.rawVisualUserMedia?.videoWidth;
+    if (!this.rawVisualUserMedia) {
+      return undefined;
+    }
+
+    return this.rawVisualUserMedia.videoWidth || this.rawVisualUserMedia.width;
   }
 
   public hasVideoWidth() {