Support the groupId property in MediaStreamTrack.getSettings()

Bug: 834281
Change-Id: I5ef11a3343e5b534bee6e088a36fb3365bd218e8
Reviewed-on: https://chromium-review.googlesource.com/1019323
Commit-Queue: Guido Urdaneta <guidou@chromium.org>
Reviewed-by: Philip Jägenstedt <foolip@chromium.org>
Reviewed-by: Harald Alvestrand <hta@chromium.org>
Cr-Commit-Position: refs/heads/master@{#555759}

content/renderer/media/stream/user_media_processor.cc

@@ -7,6 +7,7 @@
 #include <stddef.h>
 
 #include <algorithm>
+#include <map>
 #include <utility>
 
 #include "base/location.h"
@@ -1158,6 +1159,8 @@ blink::WebMediaStreamSource UserMediaProcessor::FindOrInitializeSourceObject(
   source.Initialize(blink::WebString::FromUTF8(device.id), type,
                     blink::WebString::FromUTF8(device.name),
                     false /* remote */);
+  if (device.group_id)
+    source.SetGroupId(blink::WebString::FromUTF8(*device.group_id));
 
   DVLOG(1) << "Initialize source object :"
            << "id = " << source.Id().Utf8()

third_party/WebKit/LayoutTests/external/wpt/mediacapture-streams/MediaStreamTrack-getSettings.https.html

@@ -57,4 +57,22 @@
       });
     });
   }, 'A device can be opened twice with different resolutions');
+
+  promise_test(t => {
+    return navigator.mediaDevices.enumerateDevices().then(async devices => {
+      for (var device of devices) {
+        if (device.kind == "audiooutput")
+          continue;
+        var device_id_constraint = {deviceId: {exact: device.deviceId}};
+        var constraints = device.kind == "audioinput"
+          ? {audio: device_id_constraint}
+          : {video: device_id_constraint};
+
+        var stream = await navigator.mediaDevices.getUserMedia(constraints);
+        assert_equals(stream.getTracks()[0].getSettings().groupId,
+                      device.groupId);
+        assert_true(device.groupId.length > 0);
+      }
+    });
+  }, 'groupId is correctly reported by getSettings() for all devices');
 </script>

third_party/blink/public/platform/web_media_stream_source.h

@@ -116,6 +116,9 @@ class WebMediaStreamSource {
   BLINK_PLATFORM_EXPORT WebString GetName() const;
   BLINK_PLATFORM_EXPORT bool Remote() const;
 
+  BLINK_PLATFORM_EXPORT void SetGroupId(const WebString& group_id);
+  BLINK_PLATFORM_EXPORT WebString GroupId() const;
+
   BLINK_PLATFORM_EXPORT void SetReadyState(ReadyState);
   BLINK_PLATFORM_EXPORT ReadyState GetReadyState() const;
 

third_party/blink/public/platform/web_media_stream_track.h

@@ -62,6 +62,7 @@ class WebMediaStreamTrack {
     long height = -1;
     double aspect_ratio = -1.0;
     WebString device_id;
+    WebString group_id;
     FacingMode facing_mode = FacingMode::kNone;
     base::Optional<bool> echo_cancellation;
     base::Optional<bool> auto_gain_control;

third_party/blink/renderer/modules/mediastream/media_stream_track.cc

@@ -435,6 +435,8 @@ void MediaStreamTrack::getSettings(MediaTrackSettings& settings) {
       settings.setFocalLengthY(platform_settings.focal_length_y);
   }
   settings.setDeviceId(platform_settings.device_id);
+  if (!platform_settings.group_id.IsNull())
+    settings.setGroupId(platform_settings.group_id);
   if (platform_settings.HasFacingMode()) {
     switch (platform_settings.facing_mode) {
       case WebMediaStreamTrack::FacingMode::kUser:

third_party/blink/renderer/modules/mediastream/media_track_settings.idl

@@ -21,8 +21,7 @@ dictionary MediaTrackSettings {
     // double latency;
     // long channelCount;
     DOMString deviceId;
-    // groupId is not implemented.
-    // DOMString groupId;
+    DOMString groupId;
     // Media Capture Depth Stream Extensions
     // https://w3c.github.io/mediacapture-depth/#mediatracksettings-dictionary
     // TODO(aleksandar.stojiljkovic): videoKind, depthNear, depthFar,

third_party/blink/renderer/platform/exported/web_media_stream_source.cc

@@ -127,6 +127,16 @@ bool WebMediaStreamSource::Remote() const {
   return private_.Get()->Remote();
 }
 
+void WebMediaStreamSource::SetGroupId(const blink::WebString& group_id) {
+  DCHECK(!private_.IsNull());
+  private_->SetGroupId(group_id);
+}
+
+WebString WebMediaStreamSource::GroupId() const {
+  DCHECK(!private_.IsNull());
+  return private_->GroupId();
+}
+
 void WebMediaStreamSource::SetReadyState(ReadyState state) {
   DCHECK(!private_.IsNull());
   private_->SetReadyState(static_cast<MediaStreamSource::ReadyState>(state));

third_party/blink/renderer/platform/mediastream/media_stream_source.cc

@@ -56,6 +56,10 @@ MediaStreamSource::MediaStreamSource(const String& id,
       ready_state_(ready_state),
       requires_consumer_(requires_consumer) {}
 
+void MediaStreamSource::SetGroupId(const String& group_id) {
+  group_id_ = group_id;
+}
+
 void MediaStreamSource::SetReadyState(ReadyState ready_state) {
   if (ready_state_ != kReadyStateEnded && ready_state_ != ready_state) {
     ready_state_ = ready_state;
@@ -117,6 +121,7 @@ bool MediaStreamSource::RemoveAudioConsumer(
 
 void MediaStreamSource::GetSettings(WebMediaStreamTrack::Settings& settings) {
   settings.device_id = Id();
+  settings.group_id = GroupId();
 
   if (echo_cancellation_)
     settings.echo_cancellation = *echo_cancellation_;

third_party/blink/renderer/platform/mediastream/media_stream_source.h

@@ -84,6 +84,9 @@ class PLATFORM_EXPORT MediaStreamSource final
   const String& GetName() const { return name_; }
   bool Remote() const { return remote_; }
 
+  void SetGroupId(const String& group_id);
+  const String& GroupId() { return group_id_; }
+
   void SetReadyState(ReadyState);
   ReadyState GetReadyState() const { return ready_state_; }
 
@@ -138,6 +141,7 @@ class PLATFORM_EXPORT MediaStreamSource final
   String id_;
   StreamType type_;
   String name_;
+  String group_id_;
   bool remote_;
   ReadyState ready_state_;
   bool requires_consumer_;