Changeset 236963 in webkit

Timestamp:

Oct 9, 2018, 8:44:34 AM (8 years ago)

Author:

youenn@apple.com

Message:

Add support for IceCandidate stats
​https://bugs.webkit.org/show_bug.cgi?id=190329

Reviewed by Eric Carlson.

Source/ThirdParty/libwebrtc:

Export new stats kType values.

• Configurations/libwebrtc.iOS.exp:
• Configurations/libwebrtc.iOSsim.exp:
• Configurations/libwebrtc.mac.exp:

Source/WebCore:

Convert IceCandidate stats gathered by libwebrtc.
Since networkType might be sensitive information, we currently do not expose it.
We do not expose address either if it is a host or prflx candidate.

Test: webrtc/candidate-stats.html

• Modules/mediastream/RTCStatsReport.h:
• Modules/mediastream/RTCStatsReport.idl:
• Modules/mediastream/libwebrtc/LibWebRTCStatsCollector.cpp:

(WebCore::iceCandidateState):
(WebCore::fillRTCIceCandidateStats):
(WebCore::LibWebRTCStatsCollector::OnStatsDelivered):

LayoutTests:

• webrtc/candidate-stats-expected.txt: Added.
• webrtc/candidate-stats.html: Added.
• webrtc/routines.js:
• webrtc/video-stats.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/webrtc/candidate-stats-expected.txt (added)
• LayoutTests/webrtc/candidate-stats.html (added)
• LayoutTests/webrtc/routines.js (modified) (1 diff)
• LayoutTests/webrtc/video-stats.html (modified) (1 diff)
• Source/ThirdParty/libwebrtc/ChangeLog (modified) (1 diff)
• Source/ThirdParty/libwebrtc/Configurations/libwebrtc.iOS.exp (modified) (1 diff)
• Source/ThirdParty/libwebrtc/Configurations/libwebrtc.iOSsim.exp (modified) (1 diff)
• Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediastream/RTCStatsReport.h (modified) (1 diff)
• Source/WebCore/Modules/mediastream/RTCStatsReport.idl (modified) (2 diffs)
• Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCStatsCollector.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-10-09  Youenn Fablet  <youenn@apple.com>
+
+        Add support for IceCandidate stats
+        https://bugs.webkit.org/show_bug.cgi?id=190329
+
+        Reviewed by Eric Carlson.
+
+        * webrtc/candidate-stats-expected.txt: Added.
+        * webrtc/candidate-stats.html: Added.
+        * webrtc/routines.js:
+        * webrtc/video-stats.html:
+
 2018-10-09  Philippe Normand  <pnormand@igalia.com>
 

trunk/LayoutTests/webrtc/routines.js

@@ -212 +212 @@
     }).join('\r\n');
 }
+
+async function getTypedStats(connection, type)
+{
+    const report = await connection.getStats();
+    var stats;
+    report.forEach((statItem) => {
+        if (statItem.type === type)
+            stats = statItem;
+    });
+    return stats;
+}

trunk/LayoutTests/webrtc/video-stats.html

@@ -138 +138 @@
 
     let types = await getStatsType(firstConnection);
-    assert_array_equals(types, ["candidate-pair", "certificate", "codec", "inbound-rtp", "outbound-rtp", "track"]);
+    assert_array_equals(types, ["candidate-pair", "certificate", "codec", "inbound-rtp", "local-candidate", "outbound-rtp", "remote-candidate", "track"]);
 
     types = await getStatsType(secondConnection);
-    assert_array_equals(types, ["candidate-pair", "certificate", "codec", "inbound-rtp", "outbound-rtp", "track"]);
+    assert_array_equals(types, ["candidate-pair", "certificate", "codec", "inbound-rtp", "local-candidate", "outbound-rtp", "remote-candidate", "track"]);
 }, "Basic video stats");
 

trunk/Source/ThirdParty/libwebrtc/ChangeLog

@@ +1 @@
+2018-10-09  Youenn Fablet  <youenn@apple.com>
+
+        Add support for IceCandidate stats
+        https://bugs.webkit.org/show_bug.cgi?id=190329
+
+        Reviewed by Eric Carlson.
+
+        Export new stats kType values.
+
+        * Configurations/libwebrtc.iOS.exp:
+        * Configurations/libwebrtc.iOSsim.exp:
+        * Configurations/libwebrtc.mac.exp:
+
 2018-10-06  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.iOS.exp

@@ -217 +217 @@
 __ZN6webrtc9RtpSourceD1Ev
 __ZN6webrtc11field_trial25InitFieldTrialsFromStringEPKc
+__ZN6webrtc25RTCLocalIceCandidateStats5kTypeE
+__ZN6webrtc26RTCRemoteIceCandidateStats5kTypeE

trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.iOSsim.exp

@@ -218 +218 @@
 __ZN6webrtc9RtpSourceD1Ev
 __ZN6webrtc11field_trial25InitFieldTrialsFromStringEPKc
+__ZN6webrtc25RTCLocalIceCandidateStats5kTypeE
+__ZN6webrtc26RTCRemoteIceCandidateStats5kTypeE

trunk/Source/ThirdParty/libwebrtc/Configurations/libwebrtc.mac.exp

@@ -218 +218 @@
 __ZN6webrtc9RtpSourceD1Ev
 __ZN6webrtc11field_trial25InitFieldTrialsFromStringEPKc
+__ZN6webrtc25RTCLocalIceCandidateStats5kTypeE
+__ZN6webrtc26RTCRemoteIceCandidateStats5kTypeE

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-10-09  Youenn Fablet  <youenn@apple.com>
+
+        Add support for IceCandidate stats
+        https://bugs.webkit.org/show_bug.cgi?id=190329
+
+        Reviewed by Eric Carlson.
+
+        Convert IceCandidate stats gathered by libwebrtc.
+        Since networkType might be sensitive information, we currently do not expose it.
+        We do not expose address either if it is a host or prflx candidate.
+
+        Test: webrtc/candidate-stats.html
+
+        * Modules/mediastream/RTCStatsReport.h:
+        * Modules/mediastream/RTCStatsReport.idl:
+        * Modules/mediastream/libwebrtc/LibWebRTCStatsCollector.cpp:
+        (WebCore::iceCandidateState):
+        (WebCore::fillRTCIceCandidateStats):
+        (WebCore::LibWebRTCStatsCollector::OnStatsDelivered):
+
 2018-10-09  Philippe Normand  <pnormand@igalia.com>
 

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

@@ -178 +178 @@
     };
 
+    enum class IceCandidateType { Host, Srflx, Prflx, Relay };
+
+    struct IceCandidateStats : Stats {
+        String transportId;
+        String address;
+        std::optional<int32_t> port;
+        String protocol;
+        std::optional<IceCandidateType> candidateType;
+        std::optional<int32_t> priority;
+        String url;
+        bool deleted { false };
+    };
+
     struct CertificateStats : Stats {
         CertificateStats() { type = RTCStatsReport::Type::Certificate; }

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

@@ -166 +166 @@
 };
 
+enum RTCIceCandidateType {
+    "host",
+    "srflx",
+    "prflx",
+    "relay"
+};
+
+[ JSGenerateToJSObject ]
+dictionary RTCIceCandidateStats : RTCStats {
+    DOMString transportId;
+    // FIXME: decide whether to expose networkType
+    // FIXME: Expose relayProtocol
+    DOMString address;
+    long port;
+    DOMString protocol;
+    RTCIceCandidateType candidateType;
+    long priority;
+    DOMString url;
+    boolean deleted = false;
+};
+
 [ JSGenerateToJSObject ]
 dictionary RTCCertificateStats : RTCStats {
@@ -195 +216 @@
 // FIXME 169662: missing RTCTransportStats
 // FIXME 169662: missing RTCIceCandidateStats
-// FIXME 169662: missing RTCStatsIceCandidatePairState

trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCStatsCollector.cpp

@@ -279 +279 @@
 }
 
+static inline std::optional<RTCStatsReport::IceCandidateType> iceCandidateState(const std::string& state)
+{
+    if (state == "host")
+        return RTCStatsReport::IceCandidateType::Host;
+    if (state == "srflx")
+        return RTCStatsReport::IceCandidateType::Srflx;
+    if (state == "prflx")
+        return RTCStatsReport::IceCandidateType::Prflx;
+    if (state == "relay")
+        return RTCStatsReport::IceCandidateType::Relay;
+
+    return { };
+}
+
+static inline void fillRTCIceCandidateStats(RTCStatsReport::IceCandidateStats& stats, const webrtc::RTCIceCandidateStats& rtcStats)
+{
+    stats.type = rtcStats.type() == webrtc::RTCRemoteIceCandidateStats::kType ? RTCStatsReport::Type::RemoteCandidate : RTCStatsReport::Type::LocalCandidate;
+
+    fillRTCStats(stats, rtcStats);
+
+    if (rtcStats.transport_id.is_defined())
+        stats.transportId = fromStdString(*rtcStats.transport_id);
+    if (rtcStats.ip.is_defined())
+        stats.address = fromStdString(*rtcStats.ip);
+    if (rtcStats.port.is_defined())
+        stats.port = *rtcStats.port;
+    if (rtcStats.protocol.is_defined())
+        stats.protocol = fromStdString(*rtcStats.protocol);
+
+    if (rtcStats.candidate_type.is_defined())
+        stats.candidateType = iceCandidateState(*rtcStats.candidate_type);
+
+    if (stats.candidateType == RTCStatsReport::IceCandidateType::Prflx)
+        stats.candidateType = { };
+    if (stats.candidateType == RTCStatsReport::IceCandidateType::Prflx || stats.candidateType == RTCStatsReport::IceCandidateType::Host)
+        stats.address = { };
+
+    if (rtcStats.priority.is_defined())
+        stats.priority = *rtcStats.priority;
+    if (rtcStats.url.is_defined())
+        stats.url = fromStdString(*rtcStats.url);
+    if (rtcStats.deleted.is_defined())
+        stats.deleted = *rtcStats.deleted;
+}
+
 static inline void fillRTCCertificateStats(RTCStatsReport::CertificateStats& stats, const webrtc::RTCCertificateStats& rtcStats)
 {
@@ -341 +386 @@
                 fillRTCIceCandidatePairStats(stats, static_cast<const webrtc::RTCIceCandidatePairStats&>(rtcStats));
                 report->addStats<IDLDictionary<RTCStatsReport::IceCandidatePairStats>>(WTFMove(stats));
+            } else if (rtcStats.type() == webrtc::RTCRemoteIceCandidateStats::kType || rtcStats.type() == webrtc::RTCLocalIceCandidateStats::kType) {
+                RTCStatsReport::IceCandidateStats stats;
+                fillRTCIceCandidateStats(stats, static_cast<const webrtc::RTCIceCandidateStats&>(rtcStats));
+                report->addStats<IDLDictionary<RTCStatsReport::IceCandidateStats>>(WTFMove(stats));
             } else if (rtcStats.type() == webrtc::RTCCertificateStats::kType) {
                 RTCStatsReport::CertificateStats stats;