Bug 1339906: removed old and unused RTCIceComponentStats and RTCTransportStats draft
authorNils Ohlmeier [:drno] <drno@ohlmeier.org>
Wed, 15 Feb 2017 23:00:00 -0800
changeset 488782 13be1ca678a8349f2c32b49afd2c2b8d29c6b23d
parent 488781 9020f890f4cd22883bace4f23423a20556703587
child 546833 70a2258fb388da94f6edda4fba908a7a01939d0a
push id46638
push userdrno@ohlmeier.org
push dateThu, 23 Feb 2017 18:38:45 +0000
bugs1339906
milestone54.0a1
Bug 1339906: removed old and unused RTCIceComponentStats and RTCTransportStats MozReview-Commit-ID: LWdWv1uxRLa
dom/media/webrtc/WebrtcGlobal.h
dom/webidl/RTCStatsReport.webidl
media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
--- a/dom/media/webrtc/WebrtcGlobal.h
+++ b/dom/media/webrtc/WebrtcGlobal.h
@@ -98,48 +98,44 @@ struct ParamTraits<mozilla::dom::RTCStat
   typedef mozilla::dom::RTCStatsReportInternal paramType;
 
   static void Write(Message* aMsg, const paramType& aParam)
   {
     WriteParam(aMsg, aParam.mClosed);
     WriteParam(aMsg, aParam.mCodecStats);
     WriteParam(aMsg, aParam.mIceCandidatePairStats);
     WriteParam(aMsg, aParam.mIceCandidateStats);
-    WriteParam(aMsg, aParam.mIceComponentStats);
     WriteParam(aMsg, aParam.mInboundRTPStreamStats);
     WriteParam(aMsg, aParam.mLocalSdp);
     WriteParam(aMsg, aParam.mMediaStreamStats);
     WriteParam(aMsg, aParam.mMediaStreamTrackStats);
     WriteParam(aMsg, aParam.mOutboundRTPStreamStats);
     WriteParam(aMsg, aParam.mPcid);
     WriteParam(aMsg, aParam.mRemoteSdp);
     WriteParam(aMsg, aParam.mTimestamp);
     WriteParam(aMsg, aParam.mIceRestarts);
     WriteParam(aMsg, aParam.mIceRollbacks);
-    WriteParam(aMsg, aParam.mTransportStats);
   }
 
   static bool Read(const Message* aMsg, PickleIterator* aIter, paramType* aResult)
   {
     if (!ReadParam(aMsg, aIter, &(aResult->mClosed)) ||
         !ReadParam(aMsg, aIter, &(aResult->mCodecStats)) ||
         !ReadParam(aMsg, aIter, &(aResult->mIceCandidatePairStats)) ||
         !ReadParam(aMsg, aIter, &(aResult->mIceCandidateStats)) ||
-        !ReadParam(aMsg, aIter, &(aResult->mIceComponentStats)) ||
         !ReadParam(aMsg, aIter, &(aResult->mInboundRTPStreamStats)) ||
         !ReadParam(aMsg, aIter, &(aResult->mLocalSdp)) ||
         !ReadParam(aMsg, aIter, &(aResult->mMediaStreamStats)) ||
         !ReadParam(aMsg, aIter, &(aResult->mMediaStreamTrackStats)) ||
         !ReadParam(aMsg, aIter, &(aResult->mOutboundRTPStreamStats)) ||
         !ReadParam(aMsg, aIter, &(aResult->mPcid)) ||
         !ReadParam(aMsg, aIter, &(aResult->mRemoteSdp)) ||
         !ReadParam(aMsg, aIter, &(aResult->mTimestamp)) ||
         !ReadParam(aMsg, aIter, &(aResult->mIceRestarts)) ||
-        !ReadParam(aMsg, aIter, &(aResult->mIceRollbacks)) ||
-        !ReadParam(aMsg, aIter, &(aResult->mTransportStats))) {
+        !ReadParam(aMsg, aIter, &(aResult->mIceRollbacks))) {
       return false;
     }
 
     return true;
   }
 };
 
 typedef mozilla::dom::RTCStats RTCStats;
@@ -259,46 +255,16 @@ struct ParamTraits<mozilla::dom::RTCIceC
         !ReadRTCStats(aMsg, aIter, aResult)) {
       return false;
     }
 
     return true;
  }
 };
 
-template<>
-struct ParamTraits<mozilla::dom::RTCIceComponentStats>
-{
-  typedef mozilla::dom::RTCIceComponentStats paramType;
-
-  static void Write(Message* aMsg, const paramType& aParam)
-  {
-    WriteParam(aMsg, aParam.mActiveConnection);
-    WriteParam(aMsg, aParam.mBytesReceived);
-    WriteParam(aMsg, aParam.mBytesSent);
-    WriteParam(aMsg, aParam.mComponent);
-    WriteParam(aMsg, aParam.mTransportId);
-    WriteRTCStats(aMsg, aParam);
-  }
-
-  static bool Read(const Message* aMsg, PickleIterator* aIter, paramType* aResult)
-  {
-    if (!ReadParam(aMsg, aIter, &(aResult->mActiveConnection)) ||
-        !ReadParam(aMsg, aIter, &(aResult->mBytesReceived)) ||
-        !ReadParam(aMsg, aIter, &(aResult->mBytesSent)) ||
-        !ReadParam(aMsg, aIter, &(aResult->mComponent)) ||
-        !ReadParam(aMsg, aIter, &(aResult->mTransportId)) ||
-        !ReadRTCStats(aMsg, aIter, aResult)) {
-      return false;
-    }
-
-    return true;
-  }
-};
-
 static void WriteRTCRTPStreamStats(
               Message* aMsg,
               const mozilla::dom::RTCRTPStreamStats& aParam)
 {
     WriteParam(aMsg, aParam.mBitrateMean);
     WriteParam(aMsg, aParam.mBitrateStdDev);
     WriteParam(aMsg, aParam.mCodecId);
     WriteParam(aMsg, aParam.mFramerateMean);
@@ -420,40 +386,16 @@ struct ParamTraits<mozilla::dom::RTCMedi
       return false;
     }
 
     return true;
   }
 };
 
 template<>
-struct ParamTraits<mozilla::dom::RTCTransportStats>
-{
-  typedef mozilla::dom::RTCTransportStats paramType;
-
-  static void Write(Message* aMsg, const paramType& aParam)
-  {
-    WriteParam(aMsg, aParam.mBytesReceived);
-    WriteParam(aMsg, aParam.mBytesSent);
-    WriteRTCStats(aMsg, aParam);
-  }
-
-  static bool Read(const Message* aMsg, PickleIterator* aIter, paramType* aResult)
-  {
-    if (!ReadParam(aMsg, aIter, &(aResult->mBytesReceived)) ||
-        !ReadParam(aMsg, aIter, &(aResult->mBytesSent)) ||
-        !ReadRTCStats(aMsg, aIter, aResult)) {
-      return false;
-    }
-
-    return true;
-  }
-};
-
-template<>
 struct ParamTraits<mozilla::dom::RTCMediaStreamTrackStats>
 {
   typedef mozilla::dom::RTCMediaStreamTrackStats paramType;
 
   static void Write(Message* aMsg, const paramType& aParam)
   {
     WriteParam(aMsg, aParam.mAudioLevel);
     WriteParam(aMsg, aParam.mEchoReturnLoss);
--- a/dom/webidl/RTCStatsReport.webidl
+++ b/dom/webidl/RTCStatsReport.webidl
@@ -83,29 +83,16 @@ dictionary RTCMediaStreamTrackStats : RT
   double echoReturnLossEnhancement; // as above, section 3.15
 };
 
 dictionary RTCMediaStreamStats : RTCStats {
   DOMString streamIdentifier;     // stream.id property
   sequence<DOMString> trackIds;   // Note: stats object ids, not track.id
 };
 
-dictionary RTCTransportStats: RTCStats {
-  unsigned long bytesSent;
-  unsigned long bytesReceived;
-};
-
-dictionary RTCIceComponentStats : RTCStats {
-  DOMString transportId;
-  long component;
-  unsigned long bytesSent;
-  unsigned long bytesReceived;
-  boolean activeConnection;
-};
-
 enum RTCStatsIceCandidatePairState {
   "frozen",
   "waiting",
   "inprogress",
   "failed",
   "succeeded",
   "cancelled"
 };
@@ -171,18 +158,16 @@ dictionary RTCCodecStats : RTCStats {
 // to be received from c++
 
 dictionary RTCStatsReportInternal {
   DOMString                           pcid = "";
   sequence<RTCInboundRTPStreamStats>  inboundRTPStreamStats;
   sequence<RTCOutboundRTPStreamStats> outboundRTPStreamStats;
   sequence<RTCMediaStreamTrackStats>  mediaStreamTrackStats;
   sequence<RTCMediaStreamStats>       mediaStreamStats;
-  sequence<RTCTransportStats>         transportStats;
-  sequence<RTCIceComponentStats>      iceComponentStats;
   sequence<RTCIceCandidatePairStats>  iceCandidatePairStats;
   sequence<RTCIceCandidateStats>      iceCandidateStats;
   sequence<RTCCodecStats>             codecStats;
   DOMString                           localSdp;
   DOMString                           remoteSdp;
   DOMHighResTimeStamp                 timestamp;
   unsigned long                       iceRestarts;
   unsigned long                       iceRollbacks;
--- a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
+++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
@@ -2193,18 +2193,16 @@ PeerConnectionImpl::GetTimeSinceEpoch(DO
 class RTCStatsReportInternalConstruct : public RTCStatsReportInternal {
 public:
   RTCStatsReportInternalConstruct(const nsString &pcid, DOMHighResTimeStamp now) {
     mPcid = pcid;
     mInboundRTPStreamStats.Construct();
     mOutboundRTPStreamStats.Construct();
     mMediaStreamTrackStats.Construct();
     mMediaStreamStats.Construct();
-    mTransportStats.Construct();
-    mIceComponentStats.Construct();
     mIceCandidatePairStats.Construct();
     mIceCandidateStats.Construct();
     mCodecStats.Construct();
     mTimestamp.Construct(now);
   }
 };
 #endif