stats: remove deprecated timestamp_us constructor variant

BUG=webrtc:14813

Change-Id: I56d28385f679b399cb2059f4c4c3d43e84a89b8e
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/293580
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Commit-Queue: Philipp Hancke <phancke@microsoft.com>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#39346}
This commit is contained in:
Philipp Hancke 2023-02-15 15:33:43 +01:00 committed by WebRTC LUCI CQ
parent 70429d45a6
commit e5ab6c3bb0
5 changed files with 3 additions and 131 deletions

View File

@ -58,9 +58,6 @@ class RTC_EXPORT RTCStats {
public: public:
RTCStats(const std::string& id, Timestamp timestamp) RTCStats(const std::string& id, Timestamp timestamp)
: id_(id), timestamp_(timestamp) {} : id_(id), timestamp_(timestamp) {}
ABSL_DEPRECATED("Use constructor with Timestamp instead")
RTCStats(std::string id, int64_t timestamp_us)
: RTCStats(std::move(id), Timestamp::Micros(timestamp_us)) {}
virtual ~RTCStats() {} virtual ~RTCStats() {}
@ -68,8 +65,6 @@ class RTC_EXPORT RTCStats {
const std::string& id() const { return id_; } const std::string& id() const { return id_; }
// Time relative to the UNIX epoch (Jan 1, 1970, UTC), in microseconds. // Time relative to the UNIX epoch (Jan 1, 1970, UTC), in microseconds.
ABSL_DEPRECATED("Use .timestamp().us() instead")
int64_t timestamp_us() const { return timestamp_.us(); }
Timestamp timestamp() const { return timestamp_; } Timestamp timestamp() const { return timestamp_; }
// Returns the static member variable `kType` of the implementing class. // Returns the static member variable `kType` of the implementing class.
@ -132,7 +127,7 @@ class RTC_EXPORT RTCStats {
// public: // public:
// WEBRTC_RTCSTATS_DECL(); // WEBRTC_RTCSTATS_DECL();
// //
// RTCFooStats(const std::string& id, int64_t timestamp_us); // RTCFooStats(const std::string& id, Timestamp timestamp);
// //
// RTCStatsMember<int32_t> foo; // RTCStatsMember<int32_t> foo;
// RTCStatsMember<int32_t> bar; // RTCStatsMember<int32_t> bar;
@ -143,8 +138,8 @@ class RTC_EXPORT RTCStats {
// &foo, // &foo,
// &bar); // &bar);
// //
// RTCFooStats::RTCFooStats(const std::string& id, int64_t timestamp_us) // RTCFooStats::RTCFooStats(const std::string& id, Timestamp timestamp)
// : RTCStats(id, timestamp_us), // : RTCStats(id, timestamp),
// foo("foo"), // foo("foo"),
// bar("bar") { // bar("bar") {
// } // }

View File

@ -121,8 +121,6 @@ class RTC_EXPORT RTCCertificateStats final : public RTCStats {
WEBRTC_RTCSTATS_DECL(); WEBRTC_RTCSTATS_DECL();
RTCCertificateStats(std::string id, Timestamp timestamp); RTCCertificateStats(std::string id, Timestamp timestamp);
ABSL_DEPRECATED("Use constructor with Timestamp instead")
RTCCertificateStats(std::string id, int64_t timestamp_us);
RTCCertificateStats(const RTCCertificateStats& other); RTCCertificateStats(const RTCCertificateStats& other);
~RTCCertificateStats() override; ~RTCCertificateStats() override;
@ -152,8 +150,6 @@ class RTC_EXPORT RTCCodecStats final : public RTCStats {
WEBRTC_RTCSTATS_DECL(); WEBRTC_RTCSTATS_DECL();
RTCCodecStats(std::string id, Timestamp timestamp); RTCCodecStats(std::string id, Timestamp timestamp);
ABSL_DEPRECATED("Use constructor with Timestamp instead")
RTCCodecStats(std::string id, int64_t timestamp_us);
RTCCodecStats(const RTCCodecStats& other); RTCCodecStats(const RTCCodecStats& other);
~RTCCodecStats() override; ~RTCCodecStats() override;
@ -171,8 +167,6 @@ class RTC_EXPORT RTCDataChannelStats final : public RTCStats {
WEBRTC_RTCSTATS_DECL(); WEBRTC_RTCSTATS_DECL();
RTCDataChannelStats(std::string id, Timestamp timestamp); RTCDataChannelStats(std::string id, Timestamp timestamp);
ABSL_DEPRECATED("Use constructor with Timestamp instead")
RTCDataChannelStats(std::string id, int64_t timestamp_us);
RTCDataChannelStats(const RTCDataChannelStats& other); RTCDataChannelStats(const RTCDataChannelStats& other);
~RTCDataChannelStats() override; ~RTCDataChannelStats() override;
@ -193,8 +187,6 @@ class RTC_EXPORT RTCIceCandidatePairStats final : public RTCStats {
WEBRTC_RTCSTATS_DECL(); WEBRTC_RTCSTATS_DECL();
RTCIceCandidatePairStats(std::string id, Timestamp timestamp); RTCIceCandidatePairStats(std::string id, Timestamp timestamp);
ABSL_DEPRECATED("Use constructor with Timestamp instead")
RTCIceCandidatePairStats(std::string id, int64_t timestamp_us);
RTCIceCandidatePairStats(const RTCIceCandidatePairStats& other); RTCIceCandidatePairStats(const RTCIceCandidatePairStats& other);
~RTCIceCandidatePairStats() override; ~RTCIceCandidatePairStats() override;
@ -263,8 +255,6 @@ class RTC_EXPORT RTCIceCandidateStats : public RTCStats {
protected: protected:
RTCIceCandidateStats(std::string id, Timestamp timestamp, bool is_remote); RTCIceCandidateStats(std::string id, Timestamp timestamp, bool is_remote);
ABSL_DEPRECATED("Use constructor with Timestamp instead")
RTCIceCandidateStats(std::string id, int64_t timestamp_us, bool is_remote);
}; };
// In the spec both local and remote varieties are of type RTCIceCandidateStats. // In the spec both local and remote varieties are of type RTCIceCandidateStats.
@ -276,8 +266,6 @@ class RTC_EXPORT RTCLocalIceCandidateStats final : public RTCIceCandidateStats {
public: public:
static const char kType[]; static const char kType[];
RTCLocalIceCandidateStats(std::string id, Timestamp timestamp); RTCLocalIceCandidateStats(std::string id, Timestamp timestamp);
ABSL_DEPRECATED("Use constructor with Timestamp instead")
RTCLocalIceCandidateStats(std::string id, int64_t timestamp_us);
std::unique_ptr<RTCStats> copy() const override; std::unique_ptr<RTCStats> copy() const override;
const char* type() const override; const char* type() const override;
}; };
@ -287,8 +275,6 @@ class RTC_EXPORT RTCRemoteIceCandidateStats final
public: public:
static const char kType[]; static const char kType[];
RTCRemoteIceCandidateStats(std::string id, Timestamp timestamp); RTCRemoteIceCandidateStats(std::string id, Timestamp timestamp);
ABSL_DEPRECATED("Use constructor with Timestamp instead")
RTCRemoteIceCandidateStats(std::string id, int64_t timestamp_us);
std::unique_ptr<RTCStats> copy() const override; std::unique_ptr<RTCStats> copy() const override;
const char* type() const override; const char* type() const override;
}; };
@ -299,8 +285,6 @@ class RTC_EXPORT DEPRECATED_RTCMediaStreamStats final : public RTCStats {
WEBRTC_RTCSTATS_DECL(); WEBRTC_RTCSTATS_DECL();
DEPRECATED_RTCMediaStreamStats(std::string id, Timestamp timestamp); DEPRECATED_RTCMediaStreamStats(std::string id, Timestamp timestamp);
ABSL_DEPRECATED("Use constructor with Timestamp instead")
DEPRECATED_RTCMediaStreamStats(std::string id, int64_t timestamp_us);
DEPRECATED_RTCMediaStreamStats(const DEPRECATED_RTCMediaStreamStats& other); DEPRECATED_RTCMediaStreamStats(const DEPRECATED_RTCMediaStreamStats& other);
~DEPRECATED_RTCMediaStreamStats() override; ~DEPRECATED_RTCMediaStreamStats() override;
@ -318,10 +302,6 @@ class RTC_EXPORT DEPRECATED_RTCMediaStreamTrackStats final : public RTCStats {
DEPRECATED_RTCMediaStreamTrackStats(std::string id, DEPRECATED_RTCMediaStreamTrackStats(std::string id,
Timestamp timestamp, Timestamp timestamp,
const char* kind); const char* kind);
ABSL_DEPRECATED("Use constructor with Timestamp instead")
DEPRECATED_RTCMediaStreamTrackStats(std::string id,
int64_t timestamp_us,
const char* kind);
DEPRECATED_RTCMediaStreamTrackStats( DEPRECATED_RTCMediaStreamTrackStats(
const DEPRECATED_RTCMediaStreamTrackStats& other); const DEPRECATED_RTCMediaStreamTrackStats& other);
~DEPRECATED_RTCMediaStreamTrackStats() override; ~DEPRECATED_RTCMediaStreamTrackStats() override;
@ -366,8 +346,6 @@ class RTC_EXPORT RTCPeerConnectionStats final : public RTCStats {
WEBRTC_RTCSTATS_DECL(); WEBRTC_RTCSTATS_DECL();
RTCPeerConnectionStats(std::string id, Timestamp timestamp); RTCPeerConnectionStats(std::string id, Timestamp timestamp);
ABSL_DEPRECATED("Use constructor with Timestamp instead")
RTCPeerConnectionStats(std::string id, int64_t timestamp_us);
RTCPeerConnectionStats(const RTCPeerConnectionStats& other); RTCPeerConnectionStats(const RTCPeerConnectionStats& other);
~RTCPeerConnectionStats() override; ~RTCPeerConnectionStats() override;
@ -395,8 +373,6 @@ class RTC_EXPORT RTCRTPStreamStats : public RTCStats {
protected: protected:
RTCRTPStreamStats(std::string id, Timestamp timestamp); RTCRTPStreamStats(std::string id, Timestamp timestamp);
ABSL_DEPRECATED("Use constructor with Timestamp instead")
RTCRTPStreamStats(std::string id, int64_t timestamp_us);
}; };
// https://www.w3.org/TR/webrtc-stats/#receivedrtpstats-dict* // https://www.w3.org/TR/webrtc-stats/#receivedrtpstats-dict*
@ -412,8 +388,6 @@ class RTC_EXPORT RTCReceivedRtpStreamStats : public RTCRTPStreamStats {
protected: protected:
RTCReceivedRtpStreamStats(std::string id, Timestamp timestamp); RTCReceivedRtpStreamStats(std::string id, Timestamp timestamp);
ABSL_DEPRECATED("Use constructor with Timestamp instead")
RTCReceivedRtpStreamStats(std::string id, int64_t timestamp_us);
}; };
// https://www.w3.org/TR/webrtc-stats/#sentrtpstats-dict* // https://www.w3.org/TR/webrtc-stats/#sentrtpstats-dict*
@ -429,8 +403,6 @@ class RTC_EXPORT RTCSentRtpStreamStats : public RTCRTPStreamStats {
protected: protected:
RTCSentRtpStreamStats(std::string id, Timestamp timestamp); RTCSentRtpStreamStats(std::string id, Timestamp timestamp);
ABSL_DEPRECATED("Use constructor with Timestamp instead")
RTCSentRtpStreamStats(std::string id, int64_t timestamp_us);
}; };
// https://w3c.github.io/webrtc-stats/#inboundrtpstats-dict* // https://w3c.github.io/webrtc-stats/#inboundrtpstats-dict*
@ -440,8 +412,6 @@ class RTC_EXPORT RTCInboundRTPStreamStats final
WEBRTC_RTCSTATS_DECL(); WEBRTC_RTCSTATS_DECL();
RTCInboundRTPStreamStats(std::string id, Timestamp timestamp); RTCInboundRTPStreamStats(std::string id, Timestamp timestamp);
ABSL_DEPRECATED("Use constructor with Timestamp instead")
RTCInboundRTPStreamStats(std::string id, int64_t timestamp_us);
RTCInboundRTPStreamStats(const RTCInboundRTPStreamStats& other); RTCInboundRTPStreamStats(const RTCInboundRTPStreamStats& other);
~RTCInboundRTPStreamStats() override; ~RTCInboundRTPStreamStats() override;
@ -530,8 +500,6 @@ class RTC_EXPORT RTCOutboundRTPStreamStats final : public RTCRTPStreamStats {
WEBRTC_RTCSTATS_DECL(); WEBRTC_RTCSTATS_DECL();
RTCOutboundRTPStreamStats(std::string id, Timestamp timestamp); RTCOutboundRTPStreamStats(std::string id, Timestamp timestamp);
ABSL_DEPRECATED("Use constructor with Timestamp instead")
RTCOutboundRTPStreamStats(std::string id, int64_t timestamp_us);
RTCOutboundRTPStreamStats(const RTCOutboundRTPStreamStats& other); RTCOutboundRTPStreamStats(const RTCOutboundRTPStreamStats& other);
~RTCOutboundRTPStreamStats() override; ~RTCOutboundRTPStreamStats() override;
@ -585,8 +553,6 @@ class RTC_EXPORT RTCRemoteInboundRtpStreamStats final
WEBRTC_RTCSTATS_DECL(); WEBRTC_RTCSTATS_DECL();
RTCRemoteInboundRtpStreamStats(std::string id, Timestamp timestamp); RTCRemoteInboundRtpStreamStats(std::string id, Timestamp timestamp);
ABSL_DEPRECATED("Use constructor with Timestamp instead")
RTCRemoteInboundRtpStreamStats(std::string id, int64_t timestamp_us);
RTCRemoteInboundRtpStreamStats(const RTCRemoteInboundRtpStreamStats& other); RTCRemoteInboundRtpStreamStats(const RTCRemoteInboundRtpStreamStats& other);
~RTCRemoteInboundRtpStreamStats() override; ~RTCRemoteInboundRtpStreamStats() override;
@ -604,8 +570,6 @@ class RTC_EXPORT RTCRemoteOutboundRtpStreamStats final
WEBRTC_RTCSTATS_DECL(); WEBRTC_RTCSTATS_DECL();
RTCRemoteOutboundRtpStreamStats(std::string id, Timestamp timestamp); RTCRemoteOutboundRtpStreamStats(std::string id, Timestamp timestamp);
ABSL_DEPRECATED("Use constructor with Timestamp instead")
RTCRemoteOutboundRtpStreamStats(std::string id, int64_t timestamp_us);
RTCRemoteOutboundRtpStreamStats(const RTCRemoteOutboundRtpStreamStats& other); RTCRemoteOutboundRtpStreamStats(const RTCRemoteOutboundRtpStreamStats& other);
~RTCRemoteOutboundRtpStreamStats() override; ~RTCRemoteOutboundRtpStreamStats() override;
@ -630,8 +594,6 @@ class RTC_EXPORT RTCMediaSourceStats : public RTCStats {
protected: protected:
RTCMediaSourceStats(std::string id, Timestamp timestamp); RTCMediaSourceStats(std::string id, Timestamp timestamp);
ABSL_DEPRECATED("Use constructor with Timestamp instead")
RTCMediaSourceStats(std::string id, int64_t timestamp_us);
}; };
// https://w3c.github.io/webrtc-stats/#dom-rtcaudiosourcestats // https://w3c.github.io/webrtc-stats/#dom-rtcaudiosourcestats
@ -640,8 +602,6 @@ class RTC_EXPORT RTCAudioSourceStats final : public RTCMediaSourceStats {
WEBRTC_RTCSTATS_DECL(); WEBRTC_RTCSTATS_DECL();
RTCAudioSourceStats(std::string id, Timestamp timestamp); RTCAudioSourceStats(std::string id, Timestamp timestamp);
ABSL_DEPRECATED("Use constructor with Timestamp instead")
RTCAudioSourceStats(std::string id, int64_t timestamp_us);
RTCAudioSourceStats(const RTCAudioSourceStats& other); RTCAudioSourceStats(const RTCAudioSourceStats& other);
~RTCAudioSourceStats() override; ~RTCAudioSourceStats() override;
@ -658,8 +618,6 @@ class RTC_EXPORT RTCVideoSourceStats final : public RTCMediaSourceStats {
WEBRTC_RTCSTATS_DECL(); WEBRTC_RTCSTATS_DECL();
RTCVideoSourceStats(std::string id, Timestamp timestamp); RTCVideoSourceStats(std::string id, Timestamp timestamp);
ABSL_DEPRECATED("Use constructor with Timestamp instead")
RTCVideoSourceStats(std::string id, int64_t timestamp_us);
RTCVideoSourceStats(const RTCVideoSourceStats& other); RTCVideoSourceStats(const RTCVideoSourceStats& other);
~RTCVideoSourceStats() override; ~RTCVideoSourceStats() override;
@ -675,8 +633,6 @@ class RTC_EXPORT RTCTransportStats final : public RTCStats {
WEBRTC_RTCSTATS_DECL(); WEBRTC_RTCSTATS_DECL();
RTCTransportStats(std::string id, Timestamp timestamp); RTCTransportStats(std::string id, Timestamp timestamp);
ABSL_DEPRECATED("Use constructor with Timestamp instead")
RTCTransportStats(std::string id, int64_t timestamp_us);
RTCTransportStats(const RTCTransportStats& other); RTCTransportStats(const RTCTransportStats& other);
~RTCTransportStats() override; ~RTCTransportStats() override;

View File

@ -95,8 +95,6 @@ RTCCertificateStats::RTCCertificateStats(std::string id, Timestamp timestamp)
fingerprint_algorithm("fingerprintAlgorithm"), fingerprint_algorithm("fingerprintAlgorithm"),
base64_certificate("base64Certificate"), base64_certificate("base64Certificate"),
issuer_certificate_id("issuerCertificateId") {} issuer_certificate_id("issuerCertificateId") {}
RTCCertificateStats::RTCCertificateStats(std::string id, int64_t timestamp_us)
: RTCCertificateStats(std::move(id), Timestamp::Micros(timestamp_us)) {}
RTCCertificateStats::RTCCertificateStats(const RTCCertificateStats& other) = RTCCertificateStats::RTCCertificateStats(const RTCCertificateStats& other) =
default; default;
@ -120,8 +118,6 @@ RTCCodecStats::RTCCodecStats(std::string id, Timestamp timestamp)
clock_rate("clockRate"), clock_rate("clockRate"),
channels("channels"), channels("channels"),
sdp_fmtp_line("sdpFmtpLine") {} sdp_fmtp_line("sdpFmtpLine") {}
RTCCodecStats::RTCCodecStats(std::string id, int64_t timestamp_us)
: RTCCodecStats(std::move(id), Timestamp::Micros(timestamp_us)) {}
RTCCodecStats::RTCCodecStats(const RTCCodecStats& other) = default; RTCCodecStats::RTCCodecStats(const RTCCodecStats& other) = default;
@ -149,8 +145,6 @@ RTCDataChannelStats::RTCDataChannelStats(std::string id, Timestamp timestamp)
bytes_sent("bytesSent"), bytes_sent("bytesSent"),
messages_received("messagesReceived"), messages_received("messagesReceived"),
bytes_received("bytesReceived") {} bytes_received("bytesReceived") {}
RTCDataChannelStats::RTCDataChannelStats(std::string id, int64_t timestamp_us)
: RTCDataChannelStats(std::move(id), Timestamp::Micros(timestamp_us)) {}
RTCDataChannelStats::RTCDataChannelStats(const RTCDataChannelStats& other) = RTCDataChannelStats::RTCDataChannelStats(const RTCDataChannelStats& other) =
default; default;
@ -212,10 +206,6 @@ RTCIceCandidatePairStats::RTCIceCandidatePairStats(std::string id,
bytes_discarded_on_send("bytesDiscardedOnSend"), bytes_discarded_on_send("bytesDiscardedOnSend"),
last_packet_received_timestamp("lastPacketReceivedTimestamp"), last_packet_received_timestamp("lastPacketReceivedTimestamp"),
last_packet_sent_timestamp("lastPacketSentTimestamp") {} last_packet_sent_timestamp("lastPacketSentTimestamp") {}
RTCIceCandidatePairStats::RTCIceCandidatePairStats(std::string id,
int64_t timestamp_us)
: RTCIceCandidatePairStats(std::move(id), Timestamp::Micros(timestamp_us)) {
}
RTCIceCandidatePairStats::RTCIceCandidatePairStats( RTCIceCandidatePairStats::RTCIceCandidatePairStats(
const RTCIceCandidatePairStats& other) = default; const RTCIceCandidatePairStats& other) = default;
@ -266,12 +256,6 @@ RTCIceCandidateStats::RTCIceCandidateStats(std::string id,
tcp_type("tcpType"), tcp_type("tcpType"),
vpn("vpn"), vpn("vpn"),
network_adapter_type("networkAdapterType") {} network_adapter_type("networkAdapterType") {}
RTCIceCandidateStats::RTCIceCandidateStats(std::string id,
int64_t timestamp_us,
bool is_remote)
: RTCIceCandidateStats(std::move(id),
Timestamp::Micros(timestamp_us),
is_remote) {}
RTCIceCandidateStats::RTCIceCandidateStats(const RTCIceCandidateStats& other) = RTCIceCandidateStats::RTCIceCandidateStats(const RTCIceCandidateStats& other) =
default; default;
@ -283,10 +267,6 @@ const char RTCLocalIceCandidateStats::kType[] = "local-candidate";
RTCLocalIceCandidateStats::RTCLocalIceCandidateStats(std::string id, RTCLocalIceCandidateStats::RTCLocalIceCandidateStats(std::string id,
Timestamp timestamp) Timestamp timestamp)
: RTCIceCandidateStats(std::move(id), timestamp, false) {} : RTCIceCandidateStats(std::move(id), timestamp, false) {}
RTCLocalIceCandidateStats::RTCLocalIceCandidateStats(std::string id,
int64_t timestamp_us)
: RTCLocalIceCandidateStats(std::move(id),
Timestamp::Micros(timestamp_us)) {}
std::unique_ptr<RTCStats> RTCLocalIceCandidateStats::copy() const { std::unique_ptr<RTCStats> RTCLocalIceCandidateStats::copy() const {
return std::make_unique<RTCLocalIceCandidateStats>(*this); return std::make_unique<RTCLocalIceCandidateStats>(*this);
@ -301,10 +281,6 @@ const char RTCRemoteIceCandidateStats::kType[] = "remote-candidate";
RTCRemoteIceCandidateStats::RTCRemoteIceCandidateStats(std::string id, RTCRemoteIceCandidateStats::RTCRemoteIceCandidateStats(std::string id,
Timestamp timestamp) Timestamp timestamp)
: RTCIceCandidateStats(std::move(id), timestamp, true) {} : RTCIceCandidateStats(std::move(id), timestamp, true) {}
RTCRemoteIceCandidateStats::RTCRemoteIceCandidateStats(std::string id,
int64_t timestamp_us)
: RTCRemoteIceCandidateStats(std::move(id),
Timestamp::Micros(timestamp_us)) {}
std::unique_ptr<RTCStats> RTCRemoteIceCandidateStats::copy() const { std::unique_ptr<RTCStats> RTCRemoteIceCandidateStats::copy() const {
return std::make_unique<RTCRemoteIceCandidateStats>(*this); return std::make_unique<RTCRemoteIceCandidateStats>(*this);
@ -326,11 +302,6 @@ DEPRECATED_RTCMediaStreamStats::DEPRECATED_RTCMediaStreamStats(
: RTCStats(std::move(id), timestamp), : RTCStats(std::move(id), timestamp),
stream_identifier("streamIdentifier"), stream_identifier("streamIdentifier"),
track_ids("trackIds") {} track_ids("trackIds") {}
DEPRECATED_RTCMediaStreamStats::DEPRECATED_RTCMediaStreamStats(
std::string id,
int64_t timestamp_us)
: DEPRECATED_RTCMediaStreamStats(std::move(id),
Timestamp::Micros(timestamp_us)) {}
DEPRECATED_RTCMediaStreamStats::DEPRECATED_RTCMediaStreamStats( DEPRECATED_RTCMediaStreamStats::DEPRECATED_RTCMediaStreamStats(
const DEPRECATED_RTCMediaStreamStats& other) = default; const DEPRECATED_RTCMediaStreamStats& other) = default;
@ -401,13 +372,6 @@ DEPRECATED_RTCMediaStreamTrackStats::DEPRECATED_RTCMediaStreamTrackStats(
RTC_DCHECK(kind == RTCMediaStreamTrackKind::kAudio || RTC_DCHECK(kind == RTCMediaStreamTrackKind::kAudio ||
kind == RTCMediaStreamTrackKind::kVideo); kind == RTCMediaStreamTrackKind::kVideo);
} }
DEPRECATED_RTCMediaStreamTrackStats::DEPRECATED_RTCMediaStreamTrackStats(
std::string id,
int64_t timestamp_us,
const char* kind)
: DEPRECATED_RTCMediaStreamTrackStats(std::move(id),
Timestamp::Micros(timestamp_us),
kind) {}
DEPRECATED_RTCMediaStreamTrackStats::DEPRECATED_RTCMediaStreamTrackStats( DEPRECATED_RTCMediaStreamTrackStats::DEPRECATED_RTCMediaStreamTrackStats(
const DEPRECATED_RTCMediaStreamTrackStats& other) = default; const DEPRECATED_RTCMediaStreamTrackStats& other) = default;
@ -425,9 +389,6 @@ RTCPeerConnectionStats::RTCPeerConnectionStats(std::string id,
: RTCStats(std::move(id), timestamp), : RTCStats(std::move(id), timestamp),
data_channels_opened("dataChannelsOpened"), data_channels_opened("dataChannelsOpened"),
data_channels_closed("dataChannelsClosed") {} data_channels_closed("dataChannelsClosed") {}
RTCPeerConnectionStats::RTCPeerConnectionStats(std::string id,
int64_t timestamp_us)
: RTCPeerConnectionStats(std::move(id), Timestamp::Micros(timestamp_us)) {}
RTCPeerConnectionStats::RTCPeerConnectionStats( RTCPeerConnectionStats::RTCPeerConnectionStats(
const RTCPeerConnectionStats& other) = default; const RTCPeerConnectionStats& other) = default;
@ -452,8 +413,6 @@ RTCRTPStreamStats::RTCRTPStreamStats(std::string id, Timestamp timestamp)
transport_id("transportId"), transport_id("transportId"),
codec_id("codecId"), codec_id("codecId"),
media_type("mediaType") {} media_type("mediaType") {}
RTCRTPStreamStats::RTCRTPStreamStats(std::string id, int64_t timestamp_us)
: RTCRTPStreamStats(std::move(id), Timestamp::Micros(timestamp_us)) {}
RTCRTPStreamStats::RTCRTPStreamStats(const RTCRTPStreamStats& other) = default; RTCRTPStreamStats::RTCRTPStreamStats(const RTCRTPStreamStats& other) = default;
@ -471,10 +430,6 @@ RTCReceivedRtpStreamStats::RTCReceivedRtpStreamStats(std::string id,
: RTCRTPStreamStats(std::move(id), timestamp), : RTCRTPStreamStats(std::move(id), timestamp),
jitter("jitter"), jitter("jitter"),
packets_lost("packetsLost") {} packets_lost("packetsLost") {}
RTCReceivedRtpStreamStats::RTCReceivedRtpStreamStats(std::string id,
int64_t timestamp_us)
: RTCReceivedRtpStreamStats(std::move(id),
Timestamp::Micros(timestamp_us)) {}
RTCReceivedRtpStreamStats::RTCReceivedRtpStreamStats( RTCReceivedRtpStreamStats::RTCReceivedRtpStreamStats(
const RTCReceivedRtpStreamStats& other) = default; const RTCReceivedRtpStreamStats& other) = default;
@ -493,9 +448,6 @@ RTCSentRtpStreamStats::RTCSentRtpStreamStats(std::string id,
: RTCRTPStreamStats(std::move(id), timestamp), : RTCRTPStreamStats(std::move(id), timestamp),
packets_sent("packetsSent"), packets_sent("packetsSent"),
bytes_sent("bytesSent") {} bytes_sent("bytesSent") {}
RTCSentRtpStreamStats::RTCSentRtpStreamStats(std::string(id),
int64_t timestamp_us)
: RTCSentRtpStreamStats(std::move(id), Timestamp::Micros(timestamp_us)) {}
RTCSentRtpStreamStats::RTCSentRtpStreamStats( RTCSentRtpStreamStats::RTCSentRtpStreamStats(
const RTCSentRtpStreamStats& other) = default; const RTCSentRtpStreamStats& other) = default;
@ -630,10 +582,6 @@ RTCInboundRTPStreamStats::RTCInboundRTPStreamStats(std::string id,
interruption_count("interruptionCount"), interruption_count("interruptionCount"),
total_interruption_duration("totalInterruptionDuration"), total_interruption_duration("totalInterruptionDuration"),
min_playout_delay("minPlayoutDelay") {} min_playout_delay("minPlayoutDelay") {}
RTCInboundRTPStreamStats::RTCInboundRTPStreamStats(std::string id,
int64_t timestamp_us)
: RTCInboundRTPStreamStats(std::move(id), Timestamp::Micros(timestamp_us)) {
}
RTCInboundRTPStreamStats::RTCInboundRTPStreamStats( RTCInboundRTPStreamStats::RTCInboundRTPStreamStats(
const RTCInboundRTPStreamStats& other) = default; const RTCInboundRTPStreamStats& other) = default;
@ -712,10 +660,6 @@ RTCOutboundRTPStreamStats::RTCOutboundRTPStreamStats(std::string id,
active("active"), active("active"),
power_efficient_encoder("powerEfficientEncoder"), power_efficient_encoder("powerEfficientEncoder"),
scalability_mode("scalabilityMode") {} scalability_mode("scalabilityMode") {}
RTCOutboundRTPStreamStats::RTCOutboundRTPStreamStats(std::string id,
int64_t timestamp_us)
: RTCOutboundRTPStreamStats(std::move(id),
Timestamp::Micros(timestamp_us)) {}
RTCOutboundRTPStreamStats::RTCOutboundRTPStreamStats( RTCOutboundRTPStreamStats::RTCOutboundRTPStreamStats(
const RTCOutboundRTPStreamStats& other) = default; const RTCOutboundRTPStreamStats& other) = default;
@ -742,11 +686,6 @@ RTCRemoteInboundRtpStreamStats::RTCRemoteInboundRtpStreamStats(
fraction_lost("fractionLost"), fraction_lost("fractionLost"),
total_round_trip_time("totalRoundTripTime"), total_round_trip_time("totalRoundTripTime"),
round_trip_time_measurements("roundTripTimeMeasurements") {} round_trip_time_measurements("roundTripTimeMeasurements") {}
RTCRemoteInboundRtpStreamStats::RTCRemoteInboundRtpStreamStats(
std::string id,
int64_t timestamp_us)
: RTCRemoteInboundRtpStreamStats(std::move(id),
Timestamp::Micros(timestamp_us)) {}
RTCRemoteInboundRtpStreamStats::RTCRemoteInboundRtpStreamStats( RTCRemoteInboundRtpStreamStats::RTCRemoteInboundRtpStreamStats(
const RTCRemoteInboundRtpStreamStats& other) = default; const RTCRemoteInboundRtpStreamStats& other) = default;
@ -775,11 +714,6 @@ RTCRemoteOutboundRtpStreamStats::RTCRemoteOutboundRtpStreamStats(
round_trip_time("roundTripTime"), round_trip_time("roundTripTime"),
round_trip_time_measurements("roundTripTimeMeasurements"), round_trip_time_measurements("roundTripTimeMeasurements"),
total_round_trip_time("totalRoundTripTime") {} total_round_trip_time("totalRoundTripTime") {}
RTCRemoteOutboundRtpStreamStats::RTCRemoteOutboundRtpStreamStats(
std::string id,
int64_t timestamp)
: RTCRemoteOutboundRtpStreamStats(std::move(id),
Timestamp::Micros(timestamp)) {}
RTCRemoteOutboundRtpStreamStats::RTCRemoteOutboundRtpStreamStats( RTCRemoteOutboundRtpStreamStats::RTCRemoteOutboundRtpStreamStats(
const RTCRemoteOutboundRtpStreamStats& other) = default; const RTCRemoteOutboundRtpStreamStats& other) = default;
@ -796,8 +730,6 @@ RTCMediaSourceStats::RTCMediaSourceStats(std::string id, Timestamp timestamp)
: RTCStats(std::move(id), timestamp), : RTCStats(std::move(id), timestamp),
track_identifier("trackIdentifier"), track_identifier("trackIdentifier"),
kind("kind") {} kind("kind") {}
RTCMediaSourceStats::RTCMediaSourceStats(std::string id, int64_t timestamp_us)
: RTCMediaSourceStats(std::move(id), Timestamp::Micros(timestamp_us)) {}
RTCMediaSourceStats::RTCMediaSourceStats(const RTCMediaSourceStats& other) = RTCMediaSourceStats::RTCMediaSourceStats(const RTCMediaSourceStats& other) =
default; default;
@ -820,8 +752,6 @@ RTCAudioSourceStats::RTCAudioSourceStats(std::string id, Timestamp timestamp)
total_samples_duration("totalSamplesDuration"), total_samples_duration("totalSamplesDuration"),
echo_return_loss("echoReturnLoss"), echo_return_loss("echoReturnLoss"),
echo_return_loss_enhancement("echoReturnLossEnhancement") {} echo_return_loss_enhancement("echoReturnLossEnhancement") {}
RTCAudioSourceStats::RTCAudioSourceStats(std::string id, int64_t timestamp_us)
: RTCAudioSourceStats(std::move(id), Timestamp::Micros(timestamp_us)) {}
RTCAudioSourceStats::RTCAudioSourceStats(const RTCAudioSourceStats& other) = RTCAudioSourceStats::RTCAudioSourceStats(const RTCAudioSourceStats& other) =
default; default;
@ -842,8 +772,6 @@ RTCVideoSourceStats::RTCVideoSourceStats(std::string id, Timestamp timestamp)
height("height"), height("height"),
frames("frames"), frames("frames"),
frames_per_second("framesPerSecond") {} frames_per_second("framesPerSecond") {}
RTCVideoSourceStats::RTCVideoSourceStats(std::string id, int64_t timestamp_us)
: RTCVideoSourceStats(std::move(id), Timestamp::Micros(timestamp_us)) {}
RTCVideoSourceStats::RTCVideoSourceStats(const RTCVideoSourceStats& other) = RTCVideoSourceStats::RTCVideoSourceStats(const RTCVideoSourceStats& other) =
default; default;
@ -890,8 +818,6 @@ RTCTransportStats::RTCTransportStats(std::string id, Timestamp timestamp)
ice_role("iceRole"), ice_role("iceRole"),
ice_local_username_fragment("iceLocalUsernameFragment"), ice_local_username_fragment("iceLocalUsernameFragment"),
ice_state("iceState") {} ice_state("iceState") {}
RTCTransportStats::RTCTransportStats(std::string id, int64_t timestamp_us)
: RTCTransportStats(std::move(id), Timestamp::Micros(timestamp_us)) {}
RTCTransportStats::RTCTransportStats(const RTCTransportStats& other) = default; RTCTransportStats::RTCTransportStats(const RTCTransportStats& other) = default;

View File

@ -53,9 +53,6 @@ RTCTestStats::RTCTestStats(const std::string& id, Timestamp timestamp)
m_map_string_uint64("mMapStringUint64"), m_map_string_uint64("mMapStringUint64"),
m_map_string_double("mMapStringDouble") {} m_map_string_double("mMapStringDouble") {}
RTCTestStats::RTCTestStats(const std::string& id, int64_t timestamp_us)
: RTCTestStats(id, Timestamp::Micros(timestamp_us)) {}
RTCTestStats::RTCTestStats(const RTCTestStats& other) RTCTestStats::RTCTestStats(const RTCTestStats& other)
: RTCStats(other.id(), other.timestamp()), : RTCStats(other.id(), other.timestamp()),
m_bool(other.m_bool), m_bool(other.m_bool),

View File

@ -26,8 +26,6 @@ class RTC_EXPORT RTCTestStats : public RTCStats {
WEBRTC_RTCSTATS_DECL(); WEBRTC_RTCSTATS_DECL();
RTCTestStats(const std::string& id, Timestamp timestamp); RTCTestStats(const std::string& id, Timestamp timestamp);
ABSL_DEPRECATED("Use constructor with Timestamp instead")
RTCTestStats(const std::string& id, int64_t timestamp_us);
RTCTestStats(const RTCTestStats& other); RTCTestStats(const RTCTestStats& other);
~RTCTestStats() override; ~RTCTestStats() override;