Changeset 224338 in webkit
- Timestamp:
- Nov 2, 2017 10:00:20 AM (6 years ago)
- Location:
- trunk/Source
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r224337 r224338 1 2017-11-02 Eric Carlson <eric.carlson@apple.com> 2 3 [MediaStream] audioTrack.label is always empty on macOS 4 https://bugs.webkit.org/show_bug.cgi?id=179175 5 <rdar://problem/35315438> 6 7 Reviewed by Youenn Fablet. 8 9 * platform/mediastream/RealtimeMediaSourceSettings.h: 10 (WebCore::RealtimeMediaSourceSettings::label const): New. 11 (WebCore::RealtimeMediaSourceSettings::setLabel): Ditto. 12 (WebCore::RealtimeMediaSourceSettings::encode const): Encode label. 13 (WebCore::RealtimeMediaSourceSettings::decode): Decode label. 14 15 * platform/mediastream/mac/AVMediaCaptureSource.mm: 16 (WebCore::AVMediaCaptureSource::initializeSettings): Set label. 17 18 * platform/mediastream/mac/CoreAudioCaptureSource.cpp: 19 (WebCore::CoreAudioCaptureSource::settings const): Ditto. 20 21 * platform/mock/MockRealtimeMediaSource.cpp: 22 (WebCore::MockRealtimeMediaSource::initializeSettings): Ditto. 23 1 24 2017-11-02 Chris Dumez <cdumez@apple.com> 2 25 -
trunk/Source/WebCore/platform/mediastream/RealtimeMediaSourceSettings.h
r216463 r224338 97 97 void setSupportedConstraints(const RealtimeMediaSourceSupportedConstraints& supportedConstraints) { m_supportedConstraints = supportedConstraints; } 98 98 99 const AtomicString& label() const { return m_label; } 100 void setLabel(const AtomicString& label) { m_label = label; } 101 99 102 template<class Encoder> void encode(Encoder&) const; 100 103 template<class Decoder> static bool decode(Decoder&, RealtimeMediaSourceSettings&); … … 113 116 AtomicString m_deviceId; 114 117 AtomicString m_groupId; 118 AtomicString m_label; 115 119 116 120 RealtimeMediaSourceSupportedConstraints m_supportedConstraints; … … 130 134 << m_deviceId 131 135 << m_groupId 136 << m_label 132 137 << m_supportedConstraints; 133 138 encoder.encodeEnum(m_facingMode); … … 147 152 && decoder.decode(settings.m_deviceId) 148 153 && decoder.decode(settings.m_groupId) 154 && decoder.decode(settings.m_label) 149 155 && decoder.decode(settings.m_supportedConstraints) 150 156 && decoder.decodeEnum(settings.m_facingMode); -
trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm
r223476 r224338 215 215 216 216 m_currentSettings.setDeviceId(id()); 217 m_currentSettings.setLabel(name()); 217 218 updateSettings(m_currentSettings); 218 219 } -
trunk/Source/WebCore/platform/mediastream/mac/CoreAudioCaptureSource.cpp
r223476 r224338 795 795 settings.setSampleRate(sampleRate()); 796 796 settings.setDeviceId(id()); 797 settings.setLabel(name()); 797 798 settings.setEchoCancellation(echoCancellation()); 798 799 -
trunk/Source/WebCore/platform/mock/MockRealtimeMediaSource.cpp
r222858 r224338 118 118 m_currentSettings.setSupportedConstraints(supportedConstraints()); 119 119 m_currentSettings.setDeviceId(id()); 120 m_currentSettings.setLabel(name()); 120 121 } 121 122 -
trunk/Source/WebKit/ChangeLog
r224330 r224338 1 2017-11-02 Eric Carlson <eric.carlson@apple.com> 2 3 [MediaStream] audioTrack.label is always empty on macOS 4 https://bugs.webkit.org/show_bug.cgi?id=179175 5 <rdar://problem/35315438> 6 7 Reviewed by Youenn Fablet. 8 9 * WebProcess/cocoa/UserMediaCaptureManager.cpp: 10 (WebKit::UserMediaCaptureManager::createCaptureSource): Pass settings.label to Source constructor. 11 1 12 2017-11-02 Frederic Wang <fwang@igalia.com> 2 13 -
trunk/Source/WebKit/WebProcess/cocoa/UserMediaCaptureManager.cpp
r221743 r224338 182 182 183 183 uint64_t id = nextSessionID(); 184 bool succeeded;185 186 184 RealtimeMediaSourceSettings settings; 187 185 String errorMessage; 186 bool succeeded; 188 187 if (!m_process.sendSync(Messages::UserMediaCaptureManagerProxy::CreateMediaSourceForCaptureDeviceWithConstraints(id, deviceID, sourceType, *constraints), Messages::UserMediaCaptureManagerProxy::CreateMediaSourceForCaptureDeviceWithConstraints::Reply(succeeded, errorMessage, settings), 0)) 189 188 return WTFMove(errorMessage); 190 189 191 auto source = adoptRef(*new Source(String::number(id), sourceType, emptyString(), id, *this));190 auto source = adoptRef(*new Source(String::number(id), sourceType, settings.label(), id, *this)); 192 191 source->setSettings(WTFMove(settings)); 193 192 m_sources.set(id, source.copyRef());
Note: See TracChangeset
for help on using the changeset viewer.