Fixing the ability to choose default input in browsers when default c…

…hanges

CHANGELOG.md

@@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 - Updated cloudwatch log stream ID to have attendee_id
+- Fixing the ability to choose default input in browsers when default changes
 
 ## [1.9.0] - 2020-06-12
 

demos/browser/package.json

@@ -32,7 +32,7 @@
   },
   "dependencies": {
     "amazon-chime-sdk-js": "file:../..",
-    "aws-sdk": "^2.698.0",
+    "aws-sdk": "^2.699.0",
     "bootstrap": "^4.3.1",
     "compression": "^1.7.4",
     "jquery": "^3.4.1",

docs/classes/deviceselection.html

@@ -82,6 +82,7 @@ <h2>Index</h2>
 							<h3>Properties</h3>
 							<ul class="tsd-index-list">
 								<li class="tsd-kind-property tsd-parent-kind-class"><a href="deviceselection.html#constraints" class="tsd-kind-icon">constraints</a></li>
+								<li class="tsd-kind-property tsd-parent-kind-class"><a href="deviceselection.html#groupid" class="tsd-kind-icon">group<wbr>Id</a></li>
 								<li class="tsd-kind-property tsd-parent-kind-class"><a href="deviceselection.html#stream" class="tsd-kind-icon">stream</a></li>
 							</ul>
 						</section>
@@ -106,6 +107,16 @@ <h3>constraints</h3>
 						</ul>
 					</aside>
 				</section>
+				<section class="tsd-panel tsd-member tsd-kind-property tsd-parent-kind-class">
+					<a name="groupid" class="tsd-anchor"></a>
+					<h3>group<wbr>Id</h3>
+					<div class="tsd-signature tsd-kind-icon">group<wbr>Id<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">string</span><span class="tsd-signature-symbol"> = &quot;&quot;</span></div>
+					<aside class="tsd-sources">
+						<ul>
+							<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/master/src/devicecontroller/DeviceSelection.ts#L7">src/devicecontroller/DeviceSelection.ts:7</a></li>
+						</ul>
+					</aside>
+				</section>
 				<section class="tsd-panel tsd-member tsd-kind-property tsd-parent-kind-class">
 					<a name="stream" class="tsd-anchor"></a>
 					<h3>stream</h3>
@@ -129,7 +140,7 @@ <h3>matches<wbr>Constraints</h3>
 						<li class="tsd-description">
 							<aside class="tsd-sources">
 								<ul>
-									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/master/src/devicecontroller/DeviceSelection.ts#L8">src/devicecontroller/DeviceSelection.ts:8</a></li>
+									<li>Defined in <a href="https://github.com/aws/amazon-chime-sdk-js/blob/master/src/devicecontroller/DeviceSelection.ts#L9">src/devicecontroller/DeviceSelection.ts:9</a></li>
 								</ul>
 							</aside>
 							<h4 class="tsd-parameters-title">Parameters</h4>
@@ -162,6 +173,9 @@ <h4 class="tsd-returns-title">Returns <span class="tsd-signature-type">boolean</
 							<li class=" tsd-kind-property tsd-parent-kind-class">
 								<a href="deviceselection.html#constraints" class="tsd-kind-icon">constraints</a>
 							</li>
+							<li class=" tsd-kind-property tsd-parent-kind-class">
+								<a href="deviceselection.html#groupid" class="tsd-kind-icon">group<wbr>Id</a>
+							</li>
 							<li class=" tsd-kind-property tsd-parent-kind-class">
 								<a href="deviceselection.html#stream" class="tsd-kind-icon">stream</a>
 							</li>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "amazon-chime-sdk-js",
-  "version": "1.9.8",
+  "version": "1.9.9",
   "description": "Amazon Chime SDK for JavaScript",
   "main": "build/index.js",
   "types": "build/index.d.ts",

src/devicecontroller/DefaultDeviceController.ts

@@ -41,6 +41,11 @@ export default class DefaultDeviceController implements DeviceControllerBasedMed
   private videoMaxBandwidthKbps: number = DefaultDeviceController.defaultVideoMaxBandwidthKbps;
 
   private useWebAudio: boolean = false;
+  private deviceIdGroupIdMap: { [mediaDeviceKind: string]: Map<Device, string> } = {
+    audioinput: new Map(),
+    audiooutput: new Map(),
+    videoinput: new Map(),
+  };
 
   private isAndroid: boolean = false;
   private isPixel3: boolean = false;
@@ -394,6 +399,7 @@ export default class DefaultDeviceController implements DeviceControllerBasedMed
         hasDeviceLabels = false;
         break;
       }
+      this.deviceIdGroupIdMap[device.kind].set(device.deviceId, device.groupId || '');
     }
     if (!hasDeviceLabels) {
       try {
@@ -475,6 +481,15 @@ export default class DefaultDeviceController implements DeviceControllerBasedMed
     return device && device.id ? device : null;
   }
 
+  private isGroudpIdSame(groupId: string, kind: string, device: Device): boolean {
+    if (device === null) return false;
+    if (typeof device !== 'string')
+      device = JSON.parse(JSON.stringify(device)).deviceId
+        ? JSON.parse(JSON.stringify(device)).deviceId.exact
+        : JSON.parse(JSON.stringify(device)).streamId;
+    return groupId === this.deviceIdGroupIdMap[kind + 'input'].get(device);
+  }
+
   private async chooseInputDevice(
     kind: string,
     device: Device,
@@ -492,21 +507,24 @@ export default class DefaultDeviceController implements DeviceControllerBasedMed
       return DevicePermission.PermissionGrantedByBrowser;
     }
 
-    const proposedConstraints: MediaStreamConstraints | null = this.calculateMediaStreamConstraints(
+    let proposedConstraints: MediaStreamConstraints | null = this.calculateMediaStreamConstraints(
       kind,
       device
     );
+
     if (
       this.activeDevices[kind] &&
       this.activeDevices[kind].matchesConstraints(proposedConstraints) &&
-      this.activeDevices[kind].stream.active
+      this.activeDevices[kind].stream.active &&
+      this.activeDevices[kind].groupId !== null &&
+      this.isGroudpIdSame(this.activeDevices[kind].groupId, kind, device)
     ) {
       this.logger.info(`reusing existing ${kind} device`);
       return DevicePermission.PermissionGrantedPreviously;
     }
 
-    const startTimeMs = Date.now();
     const newDevice: DeviceSelection = new DeviceSelection();
+    const startTimeMs = Date.now();
     try {
       this.logger.info(
         `requesting new ${kind} device with constraint ${JSON.stringify(proposedConstraints)}`
@@ -520,9 +538,16 @@ export default class DefaultDeviceController implements DeviceControllerBasedMed
         newDevice.stream = stream;
         newDevice.constraints = proposedConstraints;
       } else {
+        //Check can be removed after we confirm that getUserMedia bug has been fixed by chromium
+        if (
+          kind === 'audio' &&
+          this.activeDevices[kind] &&
+          JSON.parse(JSON.stringify(proposedConstraints)).audio.deviceId.exact === 'default'
+        ) {
+          this.activeDevices[kind].stream.getAudioTracks()[0].stop();
+        }
         newDevice.stream = await navigator.mediaDevices.getUserMedia(proposedConstraints);
         newDevice.constraints = proposedConstraints;
-
         if (kind === 'video' && this.lastNoVideoInputDeviceCount > callCount) {
           this.logger.warn(
             `ignored to get video device for constraints ${JSON.stringify(
@@ -550,6 +575,13 @@ export default class DefaultDeviceController implements DeviceControllerBasedMed
           }
         });
       }
+
+      let groupId = this.deviceIdGroupIdMap[kind + 'input'].get(device);
+      if (groupId === null) {
+        groupId = '';
+        this.deviceIdGroupIdMap[kind + 'input'].set(device, groupId);
+      }
+      newDevice.groupId = groupId;
     } catch (error) {
       this.logger.error(
         `failed to get ${kind} device for constraints ${JSON.stringify(proposedConstraints)}: ${
@@ -641,8 +673,6 @@ export default class DefaultDeviceController implements DeviceControllerBasedMed
       trackConstraints.width = trackConstraints.width || this.videoWidth;
       trackConstraints.height = trackConstraints.height || this.videoHeight;
       trackConstraints.frameRate = trackConstraints.frameRate || this.videoFrameRate;
-      // TODO: try to replace hard-code value related to videos into quality-level presets
-      // The following configs relaxes CPU overuse detection threshold to offer better encoding quality
       // @ts-ignore
       trackConstraints.googCpuOveruseDetection = true;
       // @ts-ignore

src/devicecontroller/DeviceSelection.ts

@@ -1,9 +1,10 @@
-// Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// Copyright 2019-2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 export default class DeviceSelection {
   constraints: MediaStreamConstraints;
   stream: MediaStream;
+  groupId: string = '';
 
   matchesConstraints(constraints: MediaStreamConstraints): boolean {
     return JSON.stringify(this.constraints) === JSON.stringify(constraints);

src/versioning/Versioning.ts

@@ -18,7 +18,7 @@ export default class Versioning {
    * Return string representation of SDK version
    */
   static get sdkVersion(): string {
-    return '1.9.8';
+    return '1.9.9';
   }
 
   /**