Revert of RTCOutboundRTPStreamStats added. (patchset #3 id:80001 of https://codereview.webrtc.org/2456463002/ )
Reason for revert:
Breaks Chrome FYI.
peerconnection_unittest calls RTCStatsReport::Create without parameters.
Original issue's description:
> RTCOutboundRTPStreamStats[1] added.
>
> This also adds RTCRTPStreamStats[2] which it derives from. Not all stats
> are supported in this CL, this must be addressed before closing the
> issue.
>
> RTCStatsReport also gets a timestamp and ToString.
>
> [1] https://w3c.github.io/webrtc-stats/#outboundrtpstats-dict*
> [2] https://w3c.github.io/webrtc-stats/#streamstats-dict*
>
> BUG=chromium:627816, chromium:657856, chromium:657854
>
> Committed: https://crrev.com/69e9cb08285f6cbcab547c7a5e6aa668fa6f2d29
> Cr-Commit-Position: refs/heads/master@{#14860}
TBR=hta@webrtc.org,deadbeef@webrtc.org,hbos@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=chromium:627816, chromium:657856, chromium:657854
Review-Url: https://codereview.webrtc.org/2465223002
Cr-Commit-Position: refs/heads/master@{#14863}
diff --git a/webrtc/api/stats/rtcstats.h b/webrtc/api/stats/rtcstats.h
index d23e928..0876080 100644
--- a/webrtc/api/stats/rtcstats.h
+++ b/webrtc/api/stats/rtcstats.h
@@ -71,8 +71,8 @@
bool operator==(const RTCStats& other) const;
bool operator!=(const RTCStats& other) const;
- // Creates a human readable string representation of the stats object, listing
- // all of its members (names and values).
+ // Creates a human readable string representation of the report, listing all
+ // of its members (names and values).
std::string ToString() const;
// Downcasts the stats object to an |RTCStats| subclass |T|. DCHECKs that the
diff --git a/webrtc/api/stats/rtcstats_objects.h b/webrtc/api/stats/rtcstats_objects.h
index 232e66b..3684e27 100644
--- a/webrtc/api/stats/rtcstats_objects.h
+++ b/webrtc/api/stats/rtcstats_objects.h
@@ -82,7 +82,7 @@
// https://w3c.github.io/webrtc-stats/#candidatepair-dict*
// TODO(hbos): Finish implementation. Tracking bug crbug.com/633550
-class RTCIceCandidatePairStats final : public RTCStats {
+class RTCIceCandidatePairStats : public RTCStats {
public:
WEBRTC_RTCSTATS_DECL();
@@ -202,62 +202,6 @@
RTCStatsMember<uint32_t> data_channels_closed;
};
-// https://w3c.github.io/webrtc-stats/#streamstats-dict*
-// TODO(hbos): Finish implementation. Tracking bug crbug.com/657854
-class RTCRTPStreamStats : public RTCStats {
- public:
- WEBRTC_RTCSTATS_DECL();
-
- RTCRTPStreamStats(const RTCRTPStreamStats& other);
- ~RTCRTPStreamStats() override;
-
- RTCStatsMember<std::string> ssrc;
- // TODO(hbos): When the remote case is supported |RTCStatsCollector| needs to
- // set this. crbug.com/657855, 657856
- RTCStatsMember<std::string> associate_stats_id;
- // TODO(hbos): Remote case not supported by |RTCStatsCollector|.
- // crbug.com/657855, 657856
- RTCStatsMember<bool> is_remote; // = false
- RTCStatsMember<std::string> media_type;
- // TODO(hbos): Not collected by |RTCStatsCollector|. crbug.com/657854, 659137
- RTCStatsMember<std::string> media_track_id;
- RTCStatsMember<std::string> transport_id;
- // TODO(hbos): Not collected by |RTCStatsCollector|. crbug.com/657854, 659117
- RTCStatsMember<std::string> codec_id;
- // FIR and PLI counts are only defined for |media_type == "video"|.
- RTCStatsMember<uint32_t> fir_count;
- RTCStatsMember<uint32_t> pli_count;
- // TODO(hbos): NACK count should be collected by |RTCStatsCollector| for both
- // audio and video but is only defined in the "video" case. crbug.com/657856
- RTCStatsMember<uint32_t> nack_count;
- // TODO(hbos): Not collected by |RTCStatsCollector|. crbug.com/657854
- // SLI count is only defined for |media_type == "video"|.
- RTCStatsMember<uint32_t> sli_count;
-
- protected:
- RTCRTPStreamStats(const std::string& id, int64_t timestamp_us);
- RTCRTPStreamStats(std::string&& id, int64_t timestamp_us);
-};
-
-// https://w3c.github.io/webrtc-stats/#outboundrtpstats-dict*
-// TODO(hbos): Finish implementation and support the remote case
-// |is_remote = true|. Tracking bug crbug.com/657856
-class RTCOutboundRTPStreamStats final : public RTCRTPStreamStats {
- public:
- WEBRTC_RTCSTATS_DECL();
-
- RTCOutboundRTPStreamStats(const std::string& id, int64_t timestamp_us);
- RTCOutboundRTPStreamStats(std::string&& id, int64_t timestamp_us);
- RTCOutboundRTPStreamStats(const RTCOutboundRTPStreamStats& other);
- ~RTCOutboundRTPStreamStats() override;
-
- RTCStatsMember<uint32_t> packets_sent;
- RTCStatsMember<uint64_t> bytes_sent;
- // TODO(hbos): Not collected by |RTCStatsCollector|. crbug.com/657856
- RTCStatsMember<double> target_bitrate;
- RTCStatsMember<double> round_trip_time;
-};
-
// https://w3c.github.io/webrtc-stats/#transportstats-dict*
class RTCTransportStats final : public RTCStats {
public:
diff --git a/webrtc/api/stats/rtcstatsreport.h b/webrtc/api/stats/rtcstatsreport.h
index 34f0d54..beb8650 100644
--- a/webrtc/api/stats/rtcstatsreport.h
+++ b/webrtc/api/stats/rtcstatsreport.h
@@ -36,7 +36,6 @@
ConstIterator& operator++();
ConstIterator& operator++(int);
const RTCStats& operator*() const;
- const RTCStats* operator->() const;
bool operator==(const ConstIterator& other) const;
bool operator!=(const ConstIterator& other) const;
@@ -50,12 +49,11 @@
StatsMap::const_iterator it_;
};
- static rtc::scoped_refptr<RTCStatsReport> Create(uint64_t timestamp_us);
+ static rtc::scoped_refptr<RTCStatsReport> Create();
- explicit RTCStatsReport(uint64_t timestamp_us);
+ RTCStatsReport();
RTCStatsReport(const RTCStatsReport& other) = delete;
- uint64_t timestamp_us() const { return timestamp_us_; }
bool AddStats(std::unique_ptr<const RTCStats> stats);
const RTCStats* Get(const std::string& id) const;
size_t size() const { return stats_.size(); }
@@ -79,16 +77,11 @@
return stats_of_type;
}
- // Creates a human readable string representation of the report, listing all
- // of its stats objects.
- std::string ToString() const;
-
friend class rtc::RefCountedObject<RTCStatsReport>;
private:
~RTCStatsReport() override;
- uint64_t timestamp_us_;
StatsMap stats_;
};