RTCTransportStats added.

webrtc/api/rtcstatscollector.h

 /*
  *  Copyright 2016 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #ifndef WEBRTC_API_RTCSTATSCOLLECTOR_H_
 #define WEBRTC_API_RTCSTATSCOLLECTOR_H_
 
+#include <map>
 #include <memory>
 #include <vector>
 
 #include "webrtc/api/stats/rtcstats_objects.h"
 #include "webrtc/api/stats/rtcstatsreport.h"
 #include "webrtc/base/asyncinvoker.h"
 #include "webrtc/base/refcount.h"
 #include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/base/timeutils.h"
 
@@ skipping 44 matching lines @@
   // returning. Virtual for the sake of testing.
   virtual void ProducePartialResultsOnSignalingThread(int64_t timestamp_us);
   virtual void ProducePartialResultsOnWorkerThread(int64_t timestamp_us);
   virtual void ProducePartialResultsOnNetworkThread(int64_t timestamp_us);
 
   // Can be called on any thread.
   void AddPartialResults(
       const rtc::scoped_refptr<RTCStatsReport>& partial_report);
 
  private:
+  struct CertificateStatsPair {
+    CertificateStatsPair() : local(nullptr), remote(nullptr) {}
+    RTCCertificateStats* local;
+    RTCCertificateStats* remote;
+  };
+
   void AddPartialResults_s(rtc::scoped_refptr<RTCStatsReport> partial_report);
   void DeliverCachedReport();
 
   // Produces |RTCCertificateStats|.
-  void ProduceCertificateStats_s(
+  std::map<std::string, CertificateStatsPair> ProduceCertificateStats_s(
       int64_t timestamp_us, const SessionStats& session_stats,
       RTCStatsReport* report) const;

[hta-webrtc, 2016/10/12 22:52:35]

This is now doing more than producing certificate stats. Please add a comment
about it.

[hbos, 2016/10/17 19:33:13]

Code changed to not do two things.

-  void ProduceCertificateStatsFromSSLCertificateAndChain_s(
+  RTCCertificateStats* ProduceCertificateStatsFromSSLCertificateAndChain_s(
       int64_t timestamp_us, const rtc::SSLCertificate& certificate,
       RTCStatsReport* report) const;
   // Produces |RTCIceCandidatePairStats| and |RTCIceCandidateStats|.
   void ProduceIceCandidateAndPairStats_s(
       int64_t timestamp_us, const SessionStats& session_stats,
       RTCStatsReport* report) const;
   const std::string& ProduceIceCandidateStats_s(
       int64_t timestamp_us, const cricket::Candidate& candidate, bool is_local,
       RTCStatsReport* report) const;
   // Produces |RTCPeerConnectionStats|.
   void ProducePeerConnectionStats_s(
       int64_t timestamp_us, RTCStatsReport* report) const;
+  // Produces |RTCTransportStats|.
+  void ProduceTransportStats_s(
+      int64_t timestamp_us, const SessionStats& session_stats,
+      const std::map<std::string, CertificateStatsPair>& transport_certificates,
+      RTCStatsReport* report) const;
 
   PeerConnection* const pc_;
   rtc::Thread* const signaling_thread_;
   rtc::Thread* const worker_thread_;
   rtc::Thread* const network_thread_;
   rtc::AsyncInvoker invoker_;
 
   int num_pending_partial_reports_;
   int64_t partial_report_timestamp_us_;
   rtc::scoped_refptr<RTCStatsReport> partial_report_;
   std::vector<rtc::scoped_refptr<RTCStatsCollectorCallback>> callbacks_;
 
   // A timestamp, in microseconds, that is based on a timer that is
   // monotonically increasing. That is, even if the system clock is modified the
   // difference between the timer and this timestamp is how fresh the cached
   // report is.
   int64_t cache_timestamp_us_;
   int64_t cache_lifetime_us_;
   rtc::scoped_refptr<const RTCStatsReport> cached_report_;
 };
 
 // Helper function, exposed for unittests.
 const char* CandidateTypeToRTCIceCandidateType(const std::string& type);
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_API_RTCSTATSCOLLECTOR_H_