fix: getting right resolution for mobile web (#2356)

modules/RTC/JitsiLocalTrack.js

@@ -102,7 +102,7 @@ export default class JitsiLocalTrack extends JitsiTrack {
 
         // Get the resolution from the track itself because it cannot be
         // certain which resolution webrtc has fallen back to using.
-        this.resolution = track.getSettings().height;
+        this.resolution = this.getHeight();
         this.maxEnabledResolution = resolution;
 
         // Cache the constraints of the track in case of any this track
@@ -112,8 +112,8 @@ export default class JitsiLocalTrack extends JitsiTrack {
         // Safari returns an empty constraints object, construct the constraints using getSettings.
         if (!Object.keys(this._constraints).length && videoType === VideoType.CAMERA) {
             this._constraints = {
-                height: track.getSettings().height,
-                width: track.getSettings().width
+                height: track.getHeight(),
+                width: track.getWidth()
             };
         }
 

modules/RTC/JitsiTrack.js

@@ -378,6 +378,20 @@ export default class JitsiTrack extends EventEmitter {
         return this.videoType;
     }
 
+    /**
+     * Returns the height of the track in normalized landscape format.
+     */
+    getHeight() {
+        return Math.min(this.track.getSettings().height, this.track.getSettings().width);
+    }
+
+    /**
+     * Returns the width of the track in normalized landscape format.
+     */
+    getWidth() {
+        return Math.max(this.track.getSettings().height, this.track.getSettings().width);
+    }
+
     /**
      * Checks whether the MediaStream is active/not ended.
      * When there is no check for active we don't have information and so

modules/RTC/TPCUtils.js

@@ -307,8 +307,7 @@ export class TPCUtils {
      * @returns {Array<boolean>}
      */
     calculateEncodingsActiveState(localVideoTrack, newHeight) {
-        const localTrack = localVideoTrack.getTrack();
-        const { height } = localTrack.getSettings();
+        const height = localVideoTrack.getHeight();
         const videoStreamEncodings = this._getVideoStreamEncodings(localVideoTrack.getVideoType());
         const encodingsState = videoStreamEncodings
         .map(encoding => height / encoding.scaleResolutionDownBy)
@@ -384,8 +383,7 @@ export class TPCUtils {
      * @returns {number|null} The max encoded resolution for the given video track.
      */
     getConfiguredEncodeResolution(localVideoTrack) {
-        const localTrack = localVideoTrack.getTrack();
-        const { height } = localTrack.getSettings();
+        const height = localVideoTrack.getHeight();
         const videoSender = this.pc.findSenderForTrack(localVideoTrack.getTrack());
         let maxHeight = 0;
 

modules/RTC/TraceablePeerConnection.js

@@ -2677,7 +2677,7 @@ TraceablePeerConnection.prototype.setSenderVideoConstraints = function(frameHeig
     if ((localVideoTrack.getVideoType() === VideoType.CAMERA && configuredResolution === frameHeight)
         || (localVideoTrack.getVideoType() === VideoType.DESKTOP
             && frameHeight > 0
-            && configuredResolution === localVideoTrack.getTrack()?.getSettings()?.height)) {
+            && configuredResolution === localVideoTrack.getHeight())) {
         return Promise.resolve();
     }