Changeset 224338 in webkit

Timestamp:

Nov 2, 2017 10:00:20 AM (6 years ago)

Author:

eric.carlson@apple.com

Message:

[MediaStream] audioTrack.label is always empty on macOS
​https://bugs.webkit.org/show_bug.cgi?id=179175
<rdar://problem/35315438>

Reviewed by Youenn Fablet.

Source/WebCore:

• platform/mediastream/RealtimeMediaSourceSettings.h:

(WebCore::RealtimeMediaSourceSettings::label const): New.
(WebCore::RealtimeMediaSourceSettings::setLabel): Ditto.
(WebCore::RealtimeMediaSourceSettings::encode const): Encode label.
(WebCore::RealtimeMediaSourceSettings::decode): Decode label.

• platform/mediastream/mac/AVMediaCaptureSource.mm:

(WebCore::AVMediaCaptureSource::initializeSettings): Set label.

• platform/mediastream/mac/CoreAudioCaptureSource.cpp:

(WebCore::CoreAudioCaptureSource::settings const): Ditto.

• platform/mock/MockRealtimeMediaSource.cpp:

(WebCore::MockRealtimeMediaSource::initializeSettings): Ditto.

Source/WebKit:

• WebProcess/cocoa/UserMediaCaptureManager.cpp:

(WebKit::UserMediaCaptureManager::createCaptureSource): Pass settings.label to Source constructor.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/mediastream/RealtimeMediaSourceSettings.h (modified) (4 diffs)
• WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm (modified) (1 diff)
• WebCore/platform/mediastream/mac/CoreAudioCaptureSource.cpp (modified) (1 diff)
• WebCore/platform/mock/MockRealtimeMediaSource.cpp (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebProcess/cocoa/UserMediaCaptureManager.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-11-02  Eric Carlson  <eric.carlson@apple.com>
+
+        [MediaStream] audioTrack.label is always empty on macOS
+        https://bugs.webkit.org/show_bug.cgi?id=179175
+        <rdar://problem/35315438>
+
+        Reviewed by Youenn Fablet.
+
+        * platform/mediastream/RealtimeMediaSourceSettings.h:
+        (WebCore::RealtimeMediaSourceSettings::label const): New.
+        (WebCore::RealtimeMediaSourceSettings::setLabel): Ditto.
+        (WebCore::RealtimeMediaSourceSettings::encode const): Encode label.
+        (WebCore::RealtimeMediaSourceSettings::decode): Decode label.
+
+        * platform/mediastream/mac/AVMediaCaptureSource.mm:
+        (WebCore::AVMediaCaptureSource::initializeSettings): Set label.
+
+        * platform/mediastream/mac/CoreAudioCaptureSource.cpp:
+        (WebCore::CoreAudioCaptureSource::settings const): Ditto.
+
+        * platform/mock/MockRealtimeMediaSource.cpp:
+        (WebCore::MockRealtimeMediaSource::initializeSettings): Ditto.
+
 2017-11-02  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.h

@@ -97 +97 @@
     void setSupportedConstraints(const RealtimeMediaSourceSupportedConstraints& supportedConstraints) { m_supportedConstraints = supportedConstraints; }
 
+    const AtomicString& label() const { return m_label; }
+    void setLabel(const AtomicString& label) { m_label = label; }
+
     template<class Encoder> void encode(Encoder&) const;
     template<class Decoder> static bool decode(Decoder&, RealtimeMediaSourceSettings&);
@@ -113 +116 @@
     AtomicString m_deviceId;
     AtomicString m_groupId;
+    AtomicString m_label;
 
     RealtimeMediaSourceSupportedConstraints m_supportedConstraints;
@@ -130 +134 @@
         << m_deviceId
         << m_groupId
+        << m_label
         << m_supportedConstraints;
     encoder.encodeEnum(m_facingMode);
@@ -147 +152 @@
         && decoder.decode(settings.m_deviceId)
         && decoder.decode(settings.m_groupId)
+        && decoder.decode(settings.m_label)
         && decoder.decode(settings.m_supportedConstraints)
         && decoder.decodeEnum(settings.m_facingMode);

trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm

@@ -215 +215 @@
 
     m_currentSettings.setDeviceId(id());
+    m_currentSettings.setLabel(name());
     updateSettings(m_currentSettings);
 }

trunk/Source/WebCore/platform/mediastream/mac/CoreAudioCaptureSource.cpp

@@ -795 +795 @@
         settings.setSampleRate(sampleRate());
         settings.setDeviceId(id());
+        settings.setLabel(name());
         settings.setEchoCancellation(echoCancellation());
 

trunk/Source/WebCore/platform/mock/MockRealtimeMediaSource.cpp

@@ -118 +118 @@
         m_currentSettings.setSupportedConstraints(supportedConstraints());
         m_currentSettings.setDeviceId(id());
+        m_currentSettings.setLabel(name());
     }
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-11-02  Eric Carlson  <eric.carlson@apple.com>
+
+        [MediaStream] audioTrack.label is always empty on macOS
+        https://bugs.webkit.org/show_bug.cgi?id=179175
+        <rdar://problem/35315438>
+
+        Reviewed by Youenn Fablet.
+
+        * WebProcess/cocoa/UserMediaCaptureManager.cpp:
+        (WebKit::UserMediaCaptureManager::createCaptureSource): Pass settings.label to Source constructor.
+
 2017-11-02  Frederic Wang  <fwang@igalia.com>
 

trunk/Source/WebKit/WebProcess/cocoa/UserMediaCaptureManager.cpp

@@ -182 +182 @@
 
     uint64_t id = nextSessionID();
-    bool succeeded;
-
     RealtimeMediaSourceSettings settings;
     String errorMessage;
+    bool succeeded;
     if (!m_process.sendSync(Messages::UserMediaCaptureManagerProxy::CreateMediaSourceForCaptureDeviceWithConstraints(id, deviceID, sourceType, *constraints), Messages::UserMediaCaptureManagerProxy::CreateMediaSourceForCaptureDeviceWithConstraints::Reply(succeeded, errorMessage, settings), 0))
         return WTFMove(errorMessage);
 
-    auto source = adoptRef(*new Source(String::number(id), sourceType, emptyString(), id, *this));
+    auto source = adoptRef(*new Source(String::number(id), sourceType, settings.label(), id, *this));
     source->setSettings(WTFMove(settings));
     m_sources.set(id, source.copyRef());