Changeset 236478 in webkit

Timestamp:

Sep 25, 2018, 2:59:35 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Implement MediaStreamTrack Content Hints
​https://bugs.webkit.org/show_bug.cgi?id=189262
<rdar://problem/44101773>

Patch by YUHAN WU <​yuhan_wu@apple.com> on 2018-09-25
Reviewed by Youenn Fablet.

LayoutTests/imported/w3c:

• web-platform-tests/mst-content-hint/MediaStreamTrack-contentHint-expected.txt:

Source/WebCore:

contentHint is a new attribute which is stored in MediaStreamTrackPrivate.
​https://w3c.github.io/mst-content-hint/

Covered by tests:
LayoutTests/imported/w3c/web-platform-tests/mst-content-hint/MediaStreamTrack-contentHint.html
LayoutTests/imported/w3c/web-platform-tests/mst-content-hint/idlharness.window.html

• Modules/mediastream/MediaStreamTrack.cpp:

(WebCore::MediaStreamTrack::contentHint const):
(WebCore::MediaStreamTrack::setContentHint):

• Modules/mediastream/MediaStreamTrack.h:
• Modules/mediastream/MediaStreamTrack.idl:
• platform/mediastream/MediaStreamTrackPrivate.cpp:

(WebCore::MediaStreamTrackPrivate::setContentHint):
(WebCore::MediaStreamTrackPrivate::clone):

• platform/mediastream/MediaStreamTrackPrivate.h:

(WebCore::MediaStreamTrackPrivate::contentHint):

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/mst-content-hint/MediaStreamTrack-contentHint-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp (modified) (1 diff)
• Source/WebCore/Modules/mediastream/MediaStreamTrack.h (modified) (1 diff)
• Source/WebCore/Modules/mediastream/MediaStreamTrack.idl (modified) (1 diff)
• Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.cpp (modified) (2 diffs)
• Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.h (modified) (2 diffs)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2018-09-25  YUHAN WU  <yuhan_wu@apple.com>
+
+        Implement MediaStreamTrack Content Hints
+        https://bugs.webkit.org/show_bug.cgi?id=189262
+        <rdar://problem/44101773>
+
+        Reviewed by Youenn Fablet.
+
+        * web-platform-tests/mst-content-hint/MediaStreamTrack-contentHint-expected.txt:
+
 2018-09-25  YUHAN WU  <yuhan_wu@apple.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/mst-content-hint/MediaStreamTrack-contentHint-expected.txt

@@ -1 +1 @@
 
-FAIL Tracks have empty default content hint assert_equals: expected (undefined) undefined but got (string) ""
+PASS Tracks have empty default content hint 
 PASS Accepts valid audio contentHints 
-FAIL Audio tracks ignore invalid/video contentHints assert_equals: Audio tracks should ignore video-only contentHints. expected "speech" but got "motion"
+PASS Audio tracks ignore invalid/video contentHints 
 PASS Accepts valid video contentHints 
-FAIL Video tracks ignore invalid/audio contentHints assert_equals: Video tracks should ignore audio-only contentHints. expected "motion" but got "speech"
-FAIL Cloned video tracks have separate contentHints assert_equals: expected (string) "motion" but got (undefined) undefined
-FAIL Cloned audio tracks have separate contentHints assert_equals: expected (string) "speech" but got (undefined) undefined
+PASS Video tracks ignore invalid/audio contentHints 
+FAIL Cloned video tracks have separate contentHints assert_equals: expected "motion" but got ""
+PASS Cloned audio tracks have separate contentHints 
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-09-25  YUHAN WU  <yuhan_wu@apple.com>
+
+        Implement MediaStreamTrack Content Hints
+        https://bugs.webkit.org/show_bug.cgi?id=189262
+        <rdar://problem/44101773>
+
+        Reviewed by Youenn Fablet.
+
+        contentHint is a new attribute which is stored in MediaStreamTrackPrivate.
+        https://w3c.github.io/mst-content-hint/
+
+        Covered by tests: 
+        LayoutTests/imported/w3c/web-platform-tests/mst-content-hint/MediaStreamTrack-contentHint.html
+        LayoutTests/imported/w3c/web-platform-tests/mst-content-hint/idlharness.window.html
+
+        * Modules/mediastream/MediaStreamTrack.cpp:
+        (WebCore::MediaStreamTrack::contentHint const):
+        (WebCore::MediaStreamTrack::setContentHint):
+        * Modules/mediastream/MediaStreamTrack.h:
+        * Modules/mediastream/MediaStreamTrack.idl:
+        * platform/mediastream/MediaStreamTrackPrivate.cpp:
+        (WebCore::MediaStreamTrackPrivate::setContentHint):
+        (WebCore::MediaStreamTrackPrivate::clone):
+        * platform/mediastream/MediaStreamTrackPrivate.h:
+        (WebCore::MediaStreamTrackPrivate::contentHint):
+
 2018-09-25  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp

@@ -93 +93 @@
 }
 
+const AtomicString& MediaStreamTrack::contentHint() const
+{
+    static NeverDestroyed<const AtomicString> speechHint("speech", AtomicString::ConstructFromLiteral);
+    static NeverDestroyed<const AtomicString> musicHint("music", AtomicString::ConstructFromLiteral);
+    static NeverDestroyed<const AtomicString> detailHint("detail", AtomicString::ConstructFromLiteral);
+    static NeverDestroyed<const AtomicString> textHint("text", AtomicString::ConstructFromLiteral);
+    static NeverDestroyed<const AtomicString> motionHint("motion", AtomicString::ConstructFromLiteral);
+
+    switch (m_private->contentHint()) {
+    case MediaStreamTrackPrivate::HintValue::Empty:
+        return emptyAtom();
+    case MediaStreamTrackPrivate::HintValue::Speech:
+        return speechHint;
+    case MediaStreamTrackPrivate::HintValue::Music:
+        return musicHint;
+    case MediaStreamTrackPrivate::HintValue::Motion:
+        return motionHint;
+    case MediaStreamTrackPrivate::HintValue::Detail:
+        return detailHint;
+    case MediaStreamTrackPrivate::HintValue::Text:
+        return textHint;
+    default:
+        return emptyAtom();
+    }
+}
+
+void MediaStreamTrack::setContentHint(const String& hintValue)
+{
+    MediaStreamTrackPrivate::HintValue value;
+    if (m_private->type() == RealtimeMediaSource::Type::Audio) {
+        if (hintValue == "")
+            value = MediaStreamTrackPrivate::HintValue::Empty;
+        else if (hintValue == "speech")
+            value = MediaStreamTrackPrivate::HintValue::Speech;
+        else if (hintValue == "music")
+            value = MediaStreamTrackPrivate::HintValue::Music;
+        else
+            return;
+    } else {
+        if (hintValue == "")
+            value = MediaStreamTrackPrivate::HintValue::Empty;
+        else if (hintValue == "detail")
+            value = MediaStreamTrackPrivate::HintValue::Detail;
+        else if (hintValue == "motion")
+            value = MediaStreamTrackPrivate::HintValue::Motion;
+        else if (hintValue == "text")
+            value = MediaStreamTrackPrivate::HintValue::Text;
+        else
+            return;
+    }
+    m_private->setContentHint(value);
+}
+
 bool MediaStreamTrack::enabled() const
 {

trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h

@@ -70 +70 @@
     const String& label() const;
 
+
+    const AtomicString& contentHint() const;
+    void setContentHint(const String&);
+        
     bool enabled() const;
     void setEnabled(bool);

trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.idl

@@ -38 +38 @@
     readonly attribute DOMString label;
     attribute boolean enabled;
+    attribute DOMString contentHint;
     readonly attribute boolean muted;
     attribute EventHandler onmute;

trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.cpp

@@ -97 +97 @@
 }
 
+void MediaStreamTrackPrivate::setContentHint(HintValue hintValue)
+{
+    m_contentHint = hintValue;
+}
+    
 bool MediaStreamTrackPrivate::muted() const
 {
@@ -143 +148 @@
     clonedMediaStreamTrackPrivate->m_isEnabled = this->m_isEnabled;
     clonedMediaStreamTrackPrivate->m_isEnded = this->m_isEnded;
+    clonedMediaStreamTrackPrivate->m_contentHint = this->m_contentHint;
     clonedMediaStreamTrackPrivate->updateReadyState();
 

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

@@ -67 +67 @@
     bool ended() const { return m_isEnded; }
 
+    enum class HintValue { Empty, Speech, Music, Motion, Detail, Text };
+    HintValue contentHint() const { return m_contentHint; }
+    void setContentHint(HintValue);
+    
     void startProducingData() { m_source->start(); }
     void stopProducingData() { m_source->stop(); }
@@ -130 +134 @@
     bool m_isEnded { false };
     bool m_haveProducedData { false };
+    HintValue m_contentHint { HintValue::Empty };
     RefPtr<WebAudioSourceProvider> m_audioSourceProvider;
 };