Bug 1588588: Get MediaPipeline to use the new timestamp implementation, and fix a typo in how we calculate expiries for CSRC stats. r=ng

Differential Revision: https://phabricator.services.mozilla.com/D50113

--HG--
extra : moz-landing-system : lando

media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp

@@ -1664,14 +1664,14 @@ void MediaPipelineReceiveVideo::OnRtpPacketReceived() {
   }
 }
 
-DOMHighResTimeStamp MediaPipeline::GetNow() {
-  return webrtc::Clock::GetRealTimeClock()->TimeInMilliseconds();
+DOMHighResTimeStamp MediaPipeline::GetNow() const {
+  return Conduit()->GetNow();
 }
 
 DOMHighResTimeStamp MediaPipeline::RtpCSRCStats::GetExpiryFromTime(
     const DOMHighResTimeStamp aTime) {
   // DOMHighResTimeStamp is a unit measured in ms
-  return aTime - EXPIRY_TIME_MILLISECONDS;
+  return aTime + EXPIRY_TIME_MILLISECONDS;
 }
 
 MediaPipeline::RtpCSRCStats::RtpCSRCStats(const uint32_t aCsrc,

media/webrtc/signaling/src/mediapipeline/MediaPipeline.h

@@ -157,6 +157,8 @@ class MediaPipeline : public sigslot::has_slots<> {
   int32_t RtpPacketsReceived() const { return mRtpPacketsReceived; }
   int64_t RtpBytesReceived() const { return mRtpBytesReceived; }
   int32_t RtcpPacketsReceived() const { return mRtcpPacketsReceived; }
+  // Gets the current time as a DOMHighResTimeStamp
+  DOMHighResTimeStamp GetNow() const;
 
   MediaSessionConduit* Conduit() const { return mConduit; }
 
@@ -260,9 +262,6 @@ class MediaPipeline : public sigslot::has_slots<> {
   UniquePtr<PacketDumper> mPacketDumper;
 
  private:
-  // Gets the current time as a DOMHighResTimeStamp
-  static DOMHighResTimeStamp GetNow();
-
   bool IsRtp(const unsigned char* aData, size_t aLen) const;
   // Must be called on the STS thread.  Must be called after DetachMedia().
   void DetachTransport_s();