mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 05:40:42 +01:00
Reland "[Stats] Move metric names to Attribute, constructed via AttributeInit."
This is a reland of commit 84c48ae751
Original change's description:
> [Stats] Move metric names to Attribute, constructed via AttributeInit.
>
> As of this CL, Attribute no longer implements RTCStatsMemberInterface
> and a member no longer owns knowing its own name. The attribute knows
> the name because we pass it down at construction time.
>
> To achieve this, the WEBRTC_RTCSTATS_IMPL() macro is updated to take
> AttributeInits instead of raw member pointers, i.e. (name, ptr) pairs.
>
> By constructing RTCStatsMember<T> without a name parameter, it does the
> same thing as the absl::optional<T> constructor. So RTCStatsMember<T>'s
> days are numbered!
>
> Bug: webrtc:15164
> Change-Id: I560c0134bae1c2d7218426a1576425ecc1b677a7
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/334203
> Commit-Queue: Henrik Boström <hbos@webrtc.org>
> Reviewed-by: Evan Shrubsole <eshr@google.com>
> Cr-Commit-Position: refs/heads/main@{#41540}
Bug: webrtc:15164
Change-Id: I28f3d588004ff185e5820347ad9513f2f7a6cc66
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/335020
Auto-Submit: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Henrik Boström <hbos@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41556}
This commit is contained in:
Henrik Boström
WebRTC LUCI CQ
parent
0f1b9a9589
commit
c0ac4df7a5
11 changed files with 356 additions and 718 deletions
|
|
@ -23,7 +23,7 @@
|
|||
namespace webrtc {
|
||||
|
||||
// A light-weight wrapper of an RTCStats attribute (an individual metric).
|
||||
class RTC_EXPORT Attribute : public RTCStatsMemberInterface {
|
||||
class RTC_EXPORT Attribute {
|
||||
public:
|
||||
// TODO(https://crbug.com/webrtc/15164): Replace uses of RTCStatsMember<T>
|
||||
// with absl::optional<T> and update these pointer types.
|
||||
|
|
@ -46,9 +46,8 @@ class RTC_EXPORT Attribute : public RTCStatsMemberInterface {
|
|||
StatVariant;
|
||||
|
||||
template <typename T>
|
||||
explicit Attribute(const RTCStatsMember<T>* attribute)
|
||||
: RTCStatsMemberInterface(attribute->name()), attribute_(attribute) {}
|
||||
~Attribute() override;
|
||||
explicit Attribute(const char* name, const RTCStatsMember<T>* attribute)
|
||||
: name_(name), attribute_(attribute) {}
|
||||
|
||||
const char* name() const;
|
||||
const StatVariant& as_variant() const;
|
||||
|
|
@ -59,32 +58,39 @@ class RTC_EXPORT Attribute : public RTCStatsMemberInterface {
|
|||
return absl::holds_alternative<const RTCStatsMember<T>*>(attribute_);
|
||||
}
|
||||
template <typename T>
|
||||
absl::optional<T> as_optional() const {
|
||||
RTC_CHECK(holds_alternative<T>());
|
||||
if (!has_value()) {
|
||||
return absl::nullopt;
|
||||
}
|
||||
return absl::optional<T>(get<T>());
|
||||
}
|
||||
template <typename T>
|
||||
const T& get() const {
|
||||
RTC_CHECK(holds_alternative<T>());
|
||||
RTC_CHECK(has_value());
|
||||
return absl::get<const RTCStatsMember<T>*>(attribute_)->value();
|
||||
}
|
||||
|
||||
static Attribute FromMemberInterface(const RTCStatsMemberInterface* member);
|
||||
// RTCStatsMemberInterface implementation.
|
||||
// TODO(https://crbug.com/webrtc/15164): Delete RTCStatsMemberInterface in
|
||||
// favor of absl::optional<T>.
|
||||
RTCStatsMemberInterface::Type type() const override;
|
||||
bool is_sequence() const override;
|
||||
bool is_string() const override;
|
||||
bool is_defined() const override;
|
||||
std::string ValueToString() const override;
|
||||
std::string ValueToJson() const override;
|
||||
bool is_sequence() const;
|
||||
bool is_string() const;
|
||||
std::string ValueToString() const;
|
||||
std::string ValueToJson() const;
|
||||
|
||||
protected:
|
||||
const RTCStatsMemberInterface* member_ptr() const override;
|
||||
bool IsEqual(const RTCStatsMemberInterface& other) const override;
|
||||
bool operator==(const Attribute& other) const;
|
||||
bool operator!=(const Attribute& other) const;
|
||||
|
||||
private:
|
||||
const char* name_;
|
||||
StatVariant attribute_;
|
||||
};
|
||||
|
||||
Attribute MemberToAttribute(const RTCStatsMemberInterface* member);
|
||||
struct RTC_EXPORT AttributeInit {
|
||||
AttributeInit(const char* name, const Attribute::StatVariant& variant);
|
||||
|
||||
const char* name;
|
||||
Attribute::StatVariant variant;
|
||||
};
|
||||
|
||||
} // namespace webrtc
|
||||
|
||||
|
|
|
|||
|
|
@ -175,13 +175,17 @@ class RTC_EXPORT RTCStats {
|
|||
\
|
||||
std::vector<webrtc::Attribute> this_class::AttributesImpl( \
|
||||
size_t additional_capacity) const { \
|
||||
const webrtc::RTCStatsMemberInterface* this_members[] = {__VA_ARGS__}; \
|
||||
size_t this_members_size = sizeof(this_members) / sizeof(this_members[0]); \
|
||||
std::vector<webrtc::Attribute> attributes = \
|
||||
parent_class::AttributesImpl(this_members_size + additional_capacity); \
|
||||
for (size_t i = 0; i < this_members_size; ++i) { \
|
||||
attributes.push_back( \
|
||||
webrtc::Attribute::FromMemberInterface(this_members[i])); \
|
||||
webrtc::AttributeInit attribute_inits[] = {__VA_ARGS__}; \
|
||||
size_t attribute_inits_size = \
|
||||
sizeof(attribute_inits) / sizeof(attribute_inits[0]); \
|
||||
std::vector<webrtc::Attribute> attributes = parent_class::AttributesImpl( \
|
||||
attribute_inits_size + additional_capacity); \
|
||||
for (size_t i = 0; i < attribute_inits_size; ++i) { \
|
||||
attributes.push_back(absl::visit( \
|
||||
[&](const auto* field) { \
|
||||
return Attribute(attribute_inits[i].name, field); \
|
||||
}, \
|
||||
attribute_inits[i].variant)); \
|
||||
} \
|
||||
return attributes; \
|
||||
}
|
||||
|
|
|
|||
|
|
@ -53,7 +53,6 @@ class RTCStatsMemberInterface {
|
|||
|
||||
virtual ~RTCStatsMemberInterface() {}
|
||||
|
||||
const char* name() const { return name_; }
|
||||
virtual Type type() const = 0;
|
||||
virtual bool is_sequence() const = 0;
|
||||
virtual bool is_string() const = 0;
|
||||
|
|
@ -82,11 +81,7 @@ class RTCStatsMemberInterface {
|
|||
}
|
||||
|
||||
protected:
|
||||
explicit RTCStatsMemberInterface(const char* name) : name_(name) {}
|
||||
|
||||
virtual bool IsEqual(const RTCStatsMemberInterface& other) const = 0;
|
||||
|
||||
const char* const name_;
|
||||
};
|
||||
|
||||
// Template implementation of `RTCStatsMemberInterface`.
|
||||
|
|
@ -95,16 +90,8 @@ class RTCStatsMemberInterface {
|
|||
template <typename T>
|
||||
class RTCStatsMember : public RTCStatsMemberInterface {
|
||||
public:
|
||||
explicit RTCStatsMember(const char* name)
|
||||
: RTCStatsMemberInterface(name), value_() {}
|
||||
RTCStatsMember(const char* name, const T& value)
|
||||
: RTCStatsMemberInterface(name), value_(value) {}
|
||||
RTCStatsMember(const char* name, T&& value)
|
||||
: RTCStatsMemberInterface(name), value_(std::move(value)) {}
|
||||
explicit RTCStatsMember(const RTCStatsMember<T>& other)
|
||||
: RTCStatsMemberInterface(other.name_), value_(other.value_) {}
|
||||
explicit RTCStatsMember(RTCStatsMember<T>&& other)
|
||||
: RTCStatsMemberInterface(other.name_), value_(std::move(other.value_)) {}
|
||||
RTCStatsMember() {}
|
||||
explicit RTCStatsMember(const T& value) : value_(value) {}
|
||||
|
||||
static Type StaticType();
|
||||
Type type() const override { return StaticType(); }
|
||||
|
|
|
|||
|
|
@ -27,9 +27,7 @@ namespace webrtc {
|
|||
class RTC_EXPORT RTCCertificateStats final : public RTCStats {
|
||||
public:
|
||||
WEBRTC_RTCSTATS_DECL();
|
||||
|
||||
RTCCertificateStats(std::string id, Timestamp timestamp);
|
||||
RTCCertificateStats(const RTCCertificateStats& other);
|
||||
~RTCCertificateStats() override;
|
||||
|
||||
RTCStatsMember<std::string> fingerprint;
|
||||
|
|
@ -42,9 +40,7 @@ class RTC_EXPORT RTCCertificateStats final : public RTCStats {
|
|||
class RTC_EXPORT RTCCodecStats final : public RTCStats {
|
||||
public:
|
||||
WEBRTC_RTCSTATS_DECL();
|
||||
|
||||
RTCCodecStats(std::string id, Timestamp timestamp);
|
||||
RTCCodecStats(const RTCCodecStats& other);
|
||||
~RTCCodecStats() override;
|
||||
|
||||
RTCStatsMember<std::string> transport_id;
|
||||
|
|
@ -59,9 +55,7 @@ class RTC_EXPORT RTCCodecStats final : public RTCStats {
|
|||
class RTC_EXPORT RTCDataChannelStats final : public RTCStats {
|
||||
public:
|
||||
WEBRTC_RTCSTATS_DECL();
|
||||
|
||||
RTCDataChannelStats(std::string id, Timestamp timestamp);
|
||||
RTCDataChannelStats(const RTCDataChannelStats& other);
|
||||
~RTCDataChannelStats() override;
|
||||
|
||||
RTCStatsMember<std::string> label;
|
||||
|
|
@ -78,9 +72,7 @@ class RTC_EXPORT RTCDataChannelStats final : public RTCStats {
|
|||
class RTC_EXPORT RTCIceCandidatePairStats final : public RTCStats {
|
||||
public:
|
||||
WEBRTC_RTCSTATS_DECL();
|
||||
|
||||
RTCIceCandidatePairStats(std::string id, Timestamp timestamp);
|
||||
RTCIceCandidatePairStats(const RTCIceCandidatePairStats& other);
|
||||
~RTCIceCandidatePairStats() override;
|
||||
|
||||
RTCStatsMember<std::string> transport_id;
|
||||
|
|
@ -118,8 +110,6 @@ class RTC_EXPORT RTCIceCandidatePairStats final : public RTCStats {
|
|||
class RTC_EXPORT RTCIceCandidateStats : public RTCStats {
|
||||
public:
|
||||
WEBRTC_RTCSTATS_DECL();
|
||||
|
||||
RTCIceCandidateStats(const RTCIceCandidateStats& other);
|
||||
~RTCIceCandidateStats() override;
|
||||
|
||||
RTCStatsMember<std::string> transport_id;
|
||||
|
|
@ -175,9 +165,7 @@ class RTC_EXPORT RTCRemoteIceCandidateStats final
|
|||
class RTC_EXPORT RTCPeerConnectionStats final : public RTCStats {
|
||||
public:
|
||||
WEBRTC_RTCSTATS_DECL();
|
||||
|
||||
RTCPeerConnectionStats(std::string id, Timestamp timestamp);
|
||||
RTCPeerConnectionStats(const RTCPeerConnectionStats& other);
|
||||
~RTCPeerConnectionStats() override;
|
||||
|
||||
RTCStatsMember<uint32_t> data_channels_opened;
|
||||
|
|
@ -188,8 +176,6 @@ class RTC_EXPORT RTCPeerConnectionStats final : public RTCStats {
|
|||
class RTC_EXPORT RTCRtpStreamStats : public RTCStats {
|
||||
public:
|
||||
WEBRTC_RTCSTATS_DECL();
|
||||
|
||||
RTCRtpStreamStats(const RTCRtpStreamStats& other);
|
||||
~RTCRtpStreamStats() override;
|
||||
|
||||
RTCStatsMember<uint32_t> ssrc;
|
||||
|
|
@ -205,8 +191,6 @@ class RTC_EXPORT RTCRtpStreamStats : public RTCStats {
|
|||
class RTC_EXPORT RTCReceivedRtpStreamStats : public RTCRtpStreamStats {
|
||||
public:
|
||||
WEBRTC_RTCSTATS_DECL();
|
||||
|
||||
RTCReceivedRtpStreamStats(const RTCReceivedRtpStreamStats& other);
|
||||
~RTCReceivedRtpStreamStats() override;
|
||||
|
||||
RTCStatsMember<double> jitter;
|
||||
|
|
@ -220,8 +204,6 @@ class RTC_EXPORT RTCReceivedRtpStreamStats : public RTCRtpStreamStats {
|
|||
class RTC_EXPORT RTCSentRtpStreamStats : public RTCRtpStreamStats {
|
||||
public:
|
||||
WEBRTC_RTCSTATS_DECL();
|
||||
|
||||
RTCSentRtpStreamStats(const RTCSentRtpStreamStats& other);
|
||||
~RTCSentRtpStreamStats() override;
|
||||
|
||||
RTCStatsMember<uint64_t> packets_sent;
|
||||
|
|
@ -236,9 +218,7 @@ class RTC_EXPORT RTCInboundRtpStreamStats final
|
|||
: public RTCReceivedRtpStreamStats {
|
||||
public:
|
||||
WEBRTC_RTCSTATS_DECL();
|
||||
|
||||
RTCInboundRtpStreamStats(std::string id, Timestamp timestamp);
|
||||
RTCInboundRtpStreamStats(const RTCInboundRtpStreamStats& other);
|
||||
~RTCInboundRtpStreamStats() override;
|
||||
|
||||
RTCStatsMember<std::string> playout_id;
|
||||
|
|
@ -341,9 +321,7 @@ class RTC_EXPORT RTCOutboundRtpStreamStats final
|
|||
: public RTCSentRtpStreamStats {
|
||||
public:
|
||||
WEBRTC_RTCSTATS_DECL();
|
||||
|
||||
RTCOutboundRtpStreamStats(std::string id, Timestamp timestamp);
|
||||
RTCOutboundRtpStreamStats(const RTCOutboundRtpStreamStats& other);
|
||||
~RTCOutboundRtpStreamStats() override;
|
||||
|
||||
RTCStatsMember<std::string> media_source_id;
|
||||
|
|
@ -393,9 +371,7 @@ class RTC_EXPORT RTCRemoteInboundRtpStreamStats final
|
|||
: public RTCReceivedRtpStreamStats {
|
||||
public:
|
||||
WEBRTC_RTCSTATS_DECL();
|
||||
|
||||
RTCRemoteInboundRtpStreamStats(std::string id, Timestamp timestamp);
|
||||
RTCRemoteInboundRtpStreamStats(const RTCRemoteInboundRtpStreamStats& other);
|
||||
~RTCRemoteInboundRtpStreamStats() override;
|
||||
|
||||
RTCStatsMember<std::string> local_id;
|
||||
|
|
@ -410,9 +386,7 @@ class RTC_EXPORT RTCRemoteOutboundRtpStreamStats final
|
|||
: public RTCSentRtpStreamStats {
|
||||
public:
|
||||
WEBRTC_RTCSTATS_DECL();
|
||||
|
||||
RTCRemoteOutboundRtpStreamStats(std::string id, Timestamp timestamp);
|
||||
RTCRemoteOutboundRtpStreamStats(const RTCRemoteOutboundRtpStreamStats& other);
|
||||
~RTCRemoteOutboundRtpStreamStats() override;
|
||||
|
||||
RTCStatsMember<std::string> local_id;
|
||||
|
|
@ -427,8 +401,6 @@ class RTC_EXPORT RTCRemoteOutboundRtpStreamStats final
|
|||
class RTC_EXPORT RTCMediaSourceStats : public RTCStats {
|
||||
public:
|
||||
WEBRTC_RTCSTATS_DECL();
|
||||
|
||||
RTCMediaSourceStats(const RTCMediaSourceStats& other);
|
||||
~RTCMediaSourceStats() override;
|
||||
|
||||
RTCStatsMember<std::string> track_identifier;
|
||||
|
|
@ -442,9 +414,7 @@ class RTC_EXPORT RTCMediaSourceStats : public RTCStats {
|
|||
class RTC_EXPORT RTCAudioSourceStats final : public RTCMediaSourceStats {
|
||||
public:
|
||||
WEBRTC_RTCSTATS_DECL();
|
||||
|
||||
RTCAudioSourceStats(std::string id, Timestamp timestamp);
|
||||
RTCAudioSourceStats(const RTCAudioSourceStats& other);
|
||||
~RTCAudioSourceStats() override;
|
||||
|
||||
RTCStatsMember<double> audio_level;
|
||||
|
|
@ -458,9 +428,7 @@ class RTC_EXPORT RTCAudioSourceStats final : public RTCMediaSourceStats {
|
|||
class RTC_EXPORT RTCVideoSourceStats final : public RTCMediaSourceStats {
|
||||
public:
|
||||
WEBRTC_RTCSTATS_DECL();
|
||||
|
||||
RTCVideoSourceStats(std::string id, Timestamp timestamp);
|
||||
RTCVideoSourceStats(const RTCVideoSourceStats& other);
|
||||
~RTCVideoSourceStats() override;
|
||||
|
||||
RTCStatsMember<uint32_t> width;
|
||||
|
|
@ -473,9 +441,7 @@ class RTC_EXPORT RTCVideoSourceStats final : public RTCMediaSourceStats {
|
|||
class RTC_EXPORT RTCTransportStats final : public RTCStats {
|
||||
public:
|
||||
WEBRTC_RTCSTATS_DECL();
|
||||
|
||||
RTCTransportStats(std::string id, Timestamp timestamp);
|
||||
RTCTransportStats(const RTCTransportStats& other);
|
||||
~RTCTransportStats() override;
|
||||
|
||||
RTCStatsMember<uint64_t> bytes_sent;
|
||||
|
|
@ -501,9 +467,7 @@ class RTC_EXPORT RTCTransportStats final : public RTCStats {
|
|||
class RTC_EXPORT RTCAudioPlayoutStats final : public RTCStats {
|
||||
public:
|
||||
WEBRTC_RTCSTATS_DECL();
|
||||
|
||||
RTCAudioPlayoutStats(const std::string& id, Timestamp timestamp);
|
||||
RTCAudioPlayoutStats(const RTCAudioPlayoutStats& other);
|
||||
~RTCAudioPlayoutStats() override;
|
||||
|
||||
RTCStatsMember<std::string> kind;
|
||||
|
|
|
|||
|
|
@ -3721,12 +3721,15 @@ class RTCTestStats : public RTCStats {
|
|||
WEBRTC_RTCSTATS_DECL();
|
||||
|
||||
RTCTestStats(const std::string& id, Timestamp timestamp)
|
||||
: RTCStats(id, timestamp), dummy_stat("dummyStat") {}
|
||||
: RTCStats(id, timestamp) {}
|
||||
|
||||
RTCStatsMember<int32_t> dummy_stat;
|
||||
};
|
||||
|
||||
WEBRTC_RTCSTATS_IMPL(RTCTestStats, RTCStats, "test-stats", &dummy_stat)
|
||||
WEBRTC_RTCSTATS_IMPL(RTCTestStats,
|
||||
RTCStats,
|
||||
"test-stats",
|
||||
AttributeInit("dummyStat", &dummy_stat))
|
||||
|
||||
// Overrides the stats collection to verify thread usage and that the resulting
|
||||
// partial reports are merged.
|
||||
|
|
|
|||
|
|
@ -33,66 +33,22 @@ struct VisitIsSequence {
|
|||
struct VisitIsEqual {
|
||||
template <typename T>
|
||||
bool operator()(const RTCStatsMember<T>* attribute) {
|
||||
return attribute->IsEqual(other);
|
||||
if (!other.holds_alternative<T>()) {
|
||||
return false;
|
||||
}
|
||||
absl::optional<T> attribute_as_optional =
|
||||
attribute->has_value() ? absl::optional<T>(attribute->value())
|
||||
: absl::nullopt;
|
||||
return attribute_as_optional == other.as_optional<T>();
|
||||
}
|
||||
|
||||
const RTCStatsMemberInterface& other;
|
||||
const Attribute& other;
|
||||
};
|
||||
|
||||
} // namespace
|
||||
|
||||
Attribute::~Attribute() {}
|
||||
|
||||
// static
|
||||
Attribute Attribute::FromMemberInterface(
|
||||
const RTCStatsMemberInterface* member) {
|
||||
switch (member->type()) {
|
||||
case RTCStatsMemberInterface::Type::kBool:
|
||||
return Attribute(&member->cast_to<RTCStatsMember<bool>>());
|
||||
case RTCStatsMemberInterface::Type::kInt32:
|
||||
return Attribute(&member->cast_to<RTCStatsMember<int32_t>>());
|
||||
case RTCStatsMemberInterface::Type::kUint32:
|
||||
return Attribute(&member->cast_to<RTCStatsMember<uint32_t>>());
|
||||
case RTCStatsMemberInterface::Type::kInt64:
|
||||
return Attribute(&member->cast_to<RTCStatsMember<int64_t>>());
|
||||
case RTCStatsMemberInterface::Type::kUint64:
|
||||
return Attribute(&member->cast_to<RTCStatsMember<uint64_t>>());
|
||||
case RTCStatsMemberInterface::Type::kDouble:
|
||||
return Attribute(&member->cast_to<RTCStatsMember<double>>());
|
||||
case RTCStatsMemberInterface::Type::kString:
|
||||
return Attribute(&member->cast_to<RTCStatsMember<std::string>>());
|
||||
case RTCStatsMemberInterface::Type::kSequenceBool:
|
||||
return Attribute(&member->cast_to<RTCStatsMember<std::vector<bool>>>());
|
||||
case RTCStatsMemberInterface::Type::kSequenceInt32:
|
||||
return Attribute(
|
||||
&member->cast_to<RTCStatsMember<std::vector<int32_t>>>());
|
||||
case RTCStatsMemberInterface::Type::kSequenceUint32:
|
||||
return Attribute(
|
||||
&member->cast_to<RTCStatsMember<std::vector<uint32_t>>>());
|
||||
case RTCStatsMemberInterface::Type::kSequenceInt64:
|
||||
return Attribute(
|
||||
&member->cast_to<RTCStatsMember<std::vector<int64_t>>>());
|
||||
case RTCStatsMemberInterface::Type::kSequenceUint64:
|
||||
return Attribute(
|
||||
&member->cast_to<RTCStatsMember<std::vector<uint64_t>>>());
|
||||
case RTCStatsMemberInterface::Type::kSequenceDouble:
|
||||
return Attribute(&member->cast_to<RTCStatsMember<std::vector<double>>>());
|
||||
case RTCStatsMemberInterface::Type::kSequenceString:
|
||||
return Attribute(
|
||||
&member->cast_to<RTCStatsMember<std::vector<std::string>>>());
|
||||
case RTCStatsMemberInterface::Type::kMapStringUint64:
|
||||
return Attribute(
|
||||
&member->cast_to<RTCStatsMember<std::map<std::string, uint64_t>>>());
|
||||
case RTCStatsMemberInterface::Type::kMapStringDouble:
|
||||
return Attribute(
|
||||
&member->cast_to<RTCStatsMember<std::map<std::string, double>>>());
|
||||
default:
|
||||
RTC_CHECK_NOTREACHED();
|
||||
}
|
||||
}
|
||||
|
||||
const char* Attribute::name() const {
|
||||
return absl::visit([](const auto* attr) { return attr->name(); }, attribute_);
|
||||
return name_;
|
||||
}
|
||||
|
||||
const Attribute::StatVariant& Attribute::as_variant() const {
|
||||
|
|
@ -104,18 +60,6 @@ bool Attribute::has_value() const {
|
|||
attribute_);
|
||||
}
|
||||
|
||||
RTCStatsMemberInterface::Type Attribute::type() const {
|
||||
return absl::visit([](const auto* attr) { return attr->type(); }, attribute_);
|
||||
}
|
||||
|
||||
const RTCStatsMemberInterface* Attribute::member_ptr() const {
|
||||
return absl::visit(
|
||||
[](const auto* attr) {
|
||||
return static_cast<const RTCStatsMemberInterface*>(attr);
|
||||
},
|
||||
attribute_);
|
||||
}
|
||||
|
||||
bool Attribute::is_sequence() const {
|
||||
return absl::visit(VisitIsSequence(), attribute_);
|
||||
}
|
||||
|
|
@ -125,11 +69,6 @@ bool Attribute::is_string() const {
|
|||
attribute_);
|
||||
}
|
||||
|
||||
bool Attribute::is_defined() const {
|
||||
return absl::visit([](const auto* attr) { return attr->is_defined(); },
|
||||
attribute_);
|
||||
}
|
||||
|
||||
std::string Attribute::ValueToString() const {
|
||||
return absl::visit([](const auto* attr) { return attr->ValueToString(); },
|
||||
attribute_);
|
||||
|
|
@ -140,8 +79,16 @@ std::string Attribute::ValueToJson() const {
|
|||
attribute_);
|
||||
}
|
||||
|
||||
bool Attribute::IsEqual(const RTCStatsMemberInterface& other) const {
|
||||
return absl::visit(VisitIsEqual{.other = *other.member_ptr()}, attribute_);
|
||||
bool Attribute::operator==(const Attribute& other) const {
|
||||
return absl::visit(VisitIsEqual{.other = other}, attribute_);
|
||||
}
|
||||
|
||||
bool Attribute::operator!=(const Attribute& other) const {
|
||||
return !(*this == other);
|
||||
}
|
||||
|
||||
AttributeInit::AttributeInit(const char* name,
|
||||
const Attribute::StatVariant& variant)
|
||||
: name(name), variant(variant) {}
|
||||
|
||||
} // namespace webrtc
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
|
||||
#include "api/stats/rtc_stats_report.h"
|
||||
|
||||
#include "api/stats/attribute.h"
|
||||
#include "api/stats/rtc_stats.h"
|
||||
#include "rtc_base/checks.h"
|
||||
#include "test/gtest.h"
|
||||
|
|
@ -21,36 +22,45 @@ class RTCTestStats1 : public RTCStats {
|
|||
WEBRTC_RTCSTATS_DECL();
|
||||
|
||||
RTCTestStats1(const std::string& id, Timestamp timestamp)
|
||||
: RTCStats(id, timestamp), integer("integer") {}
|
||||
: RTCStats(id, timestamp) {}
|
||||
|
||||
RTCStatsMember<int32_t> integer;
|
||||
};
|
||||
|
||||
WEBRTC_RTCSTATS_IMPL(RTCTestStats1, RTCStats, "test-stats-1", &integer)
|
||||
WEBRTC_RTCSTATS_IMPL(RTCTestStats1,
|
||||
RTCStats,
|
||||
"test-stats-1",
|
||||
AttributeInit("integer", &integer))
|
||||
|
||||
class RTCTestStats2 : public RTCStats {
|
||||
public:
|
||||
WEBRTC_RTCSTATS_DECL();
|
||||
|
||||
RTCTestStats2(const std::string& id, Timestamp timestamp)
|
||||
: RTCStats(id, timestamp), number("number") {}
|
||||
: RTCStats(id, timestamp) {}
|
||||
|
||||
RTCStatsMember<double> number;
|
||||
};
|
||||
|
||||
WEBRTC_RTCSTATS_IMPL(RTCTestStats2, RTCStats, "test-stats-2", &number)
|
||||
WEBRTC_RTCSTATS_IMPL(RTCTestStats2,
|
||||
RTCStats,
|
||||
"test-stats-2",
|
||||
AttributeInit("number", &number))
|
||||
|
||||
class RTCTestStats3 : public RTCStats {
|
||||
public:
|
||||
WEBRTC_RTCSTATS_DECL();
|
||||
|
||||
RTCTestStats3(const std::string& id, Timestamp timestamp)
|
||||
: RTCStats(id, timestamp), string("string") {}
|
||||
: RTCStats(id, timestamp) {}
|
||||
|
||||
RTCStatsMember<std::string> string;
|
||||
};
|
||||
|
||||
WEBRTC_RTCSTATS_IMPL(RTCTestStats3, RTCStats, "test-stats-3", &string)
|
||||
WEBRTC_RTCSTATS_IMPL(RTCTestStats3,
|
||||
RTCStats,
|
||||
"test-stats-3",
|
||||
AttributeInit("string", &string))
|
||||
|
||||
TEST(RTCStatsReport, AddAndGetStats) {
|
||||
rtc::scoped_refptr<RTCStatsReport> report =
|
||||
|
|
|
|||
|
|
@ -44,19 +44,22 @@ class RTCChildStats : public RTCStats {
|
|||
WEBRTC_RTCSTATS_DECL();
|
||||
|
||||
RTCChildStats(const std::string& id, Timestamp timestamp)
|
||||
: RTCStats(id, timestamp), child_int("childInt") {}
|
||||
: RTCStats(id, timestamp) {}
|
||||
|
||||
RTCStatsMember<int32_t> child_int;
|
||||
};
|
||||
|
||||
WEBRTC_RTCSTATS_IMPL(RTCChildStats, RTCStats, "child-stats", &child_int)
|
||||
WEBRTC_RTCSTATS_IMPL(RTCChildStats,
|
||||
RTCStats,
|
||||
"child-stats",
|
||||
AttributeInit("childInt", &child_int))
|
||||
|
||||
class RTCGrandChildStats : public RTCChildStats {
|
||||
public:
|
||||
WEBRTC_RTCSTATS_DECL();
|
||||
|
||||
RTCGrandChildStats(const std::string& id, Timestamp timestamp)
|
||||
: RTCChildStats(id, timestamp), grandchild_int("grandchildInt") {}
|
||||
: RTCChildStats(id, timestamp) {}
|
||||
|
||||
RTCStatsMember<int32_t> grandchild_int;
|
||||
};
|
||||
|
|
@ -64,7 +67,7 @@ class RTCGrandChildStats : public RTCChildStats {
|
|||
WEBRTC_RTCSTATS_IMPL(RTCGrandChildStats,
|
||||
RTCChildStats,
|
||||
"grandchild-stats",
|
||||
&grandchild_int)
|
||||
AttributeInit("grandchildInt", &grandchild_int))
|
||||
|
||||
TEST(RTCStatsTest, RTCStatsAndAttributes) {
|
||||
RTCTestStats stats("testId", Timestamp::Micros(42));
|
||||
|
|
|
|||
|
|
@ -20,182 +20,110 @@ namespace webrtc {
|
|||
|
||||
// clang-format off
|
||||
WEBRTC_RTCSTATS_IMPL(RTCCertificateStats, RTCStats, "certificate",
|
||||
&fingerprint,
|
||||
&fingerprint_algorithm,
|
||||
&base64_certificate,
|
||||
&issuer_certificate_id)
|
||||
AttributeInit("fingerprint", &fingerprint),
|
||||
AttributeInit("fingerprintAlgorithm", &fingerprint_algorithm),
|
||||
AttributeInit("base64Certificate", &base64_certificate),
|
||||
AttributeInit("issuerCertificateId", &issuer_certificate_id))
|
||||
// clang-format on
|
||||
|
||||
RTCCertificateStats::RTCCertificateStats(std::string id, Timestamp timestamp)
|
||||
: RTCStats(std::move(id), timestamp),
|
||||
fingerprint("fingerprint"),
|
||||
fingerprint_algorithm("fingerprintAlgorithm"),
|
||||
base64_certificate("base64Certificate"),
|
||||
issuer_certificate_id("issuerCertificateId") {}
|
||||
: RTCStats(std::move(id), timestamp) {}
|
||||
|
||||
RTCCertificateStats::RTCCertificateStats(const RTCCertificateStats& other) =
|
||||
default;
|
||||
RTCCertificateStats::~RTCCertificateStats() {}
|
||||
|
||||
// clang-format off
|
||||
WEBRTC_RTCSTATS_IMPL(RTCCodecStats, RTCStats, "codec",
|
||||
&transport_id,
|
||||
&payload_type,
|
||||
&mime_type,
|
||||
&clock_rate,
|
||||
&channels,
|
||||
&sdp_fmtp_line)
|
||||
AttributeInit("transportId", &transport_id),
|
||||
AttributeInit("payloadType", &payload_type),
|
||||
AttributeInit("mimeType", &mime_type),
|
||||
AttributeInit("clockRate", &clock_rate),
|
||||
AttributeInit("channels", &channels),
|
||||
AttributeInit("sdpFmtpLine", &sdp_fmtp_line))
|
||||
// clang-format on
|
||||
|
||||
RTCCodecStats::RTCCodecStats(std::string id, Timestamp timestamp)
|
||||
: RTCStats(std::move(id), timestamp),
|
||||
transport_id("transportId"),
|
||||
payload_type("payloadType"),
|
||||
mime_type("mimeType"),
|
||||
clock_rate("clockRate"),
|
||||
channels("channels"),
|
||||
sdp_fmtp_line("sdpFmtpLine") {}
|
||||
|
||||
RTCCodecStats::RTCCodecStats(const RTCCodecStats& other) = default;
|
||||
: RTCStats(std::move(id), timestamp) {}
|
||||
|
||||
RTCCodecStats::~RTCCodecStats() {}
|
||||
|
||||
// clang-format off
|
||||
WEBRTC_RTCSTATS_IMPL(RTCDataChannelStats, RTCStats, "data-channel",
|
||||
&label,
|
||||
&protocol,
|
||||
&data_channel_identifier,
|
||||
&state,
|
||||
&messages_sent,
|
||||
&bytes_sent,
|
||||
&messages_received,
|
||||
&bytes_received)
|
||||
AttributeInit("label", &label),
|
||||
AttributeInit("protocol", &protocol),
|
||||
AttributeInit("dataChannelIdentifier", &data_channel_identifier),
|
||||
AttributeInit("state", &state),
|
||||
AttributeInit("messagesSent", &messages_sent),
|
||||
AttributeInit("bytesSent", &bytes_sent),
|
||||
AttributeInit("messagesReceived", &messages_received),
|
||||
AttributeInit("bytesReceived", &bytes_received))
|
||||
// clang-format on
|
||||
|
||||
RTCDataChannelStats::RTCDataChannelStats(std::string id, Timestamp timestamp)
|
||||
: RTCStats(std::move(id), timestamp),
|
||||
label("label"),
|
||||
protocol("protocol"),
|
||||
data_channel_identifier("dataChannelIdentifier"),
|
||||
state("state"),
|
||||
messages_sent("messagesSent"),
|
||||
bytes_sent("bytesSent"),
|
||||
messages_received("messagesReceived"),
|
||||
bytes_received("bytesReceived") {}
|
||||
|
||||
RTCDataChannelStats::RTCDataChannelStats(const RTCDataChannelStats& other) =
|
||||
default;
|
||||
: RTCStats(std::move(id), timestamp) {}
|
||||
|
||||
RTCDataChannelStats::~RTCDataChannelStats() {}
|
||||
|
||||
// clang-format off
|
||||
WEBRTC_RTCSTATS_IMPL(RTCIceCandidatePairStats, RTCStats, "candidate-pair",
|
||||
&transport_id,
|
||||
&local_candidate_id,
|
||||
&remote_candidate_id,
|
||||
&state,
|
||||
&priority,
|
||||
&nominated,
|
||||
&writable,
|
||||
&packets_sent,
|
||||
&packets_received,
|
||||
&bytes_sent,
|
||||
&bytes_received,
|
||||
&total_round_trip_time,
|
||||
¤t_round_trip_time,
|
||||
&available_outgoing_bitrate,
|
||||
&available_incoming_bitrate,
|
||||
&requests_received,
|
||||
&requests_sent,
|
||||
&responses_received,
|
||||
&responses_sent,
|
||||
&consent_requests_sent,
|
||||
&packets_discarded_on_send,
|
||||
&bytes_discarded_on_send,
|
||||
&last_packet_received_timestamp,
|
||||
&last_packet_sent_timestamp)
|
||||
AttributeInit("transportId", &transport_id),
|
||||
AttributeInit("localCandidateId", &local_candidate_id),
|
||||
AttributeInit("remoteCandidateId", &remote_candidate_id),
|
||||
AttributeInit("state", &state),
|
||||
AttributeInit("priority", &priority),
|
||||
AttributeInit("nominated", &nominated),
|
||||
AttributeInit("writable", &writable),
|
||||
AttributeInit("packetsSent", &packets_sent),
|
||||
AttributeInit("packetsReceived", &packets_received),
|
||||
AttributeInit("bytesSent", &bytes_sent),
|
||||
AttributeInit("bytesReceived", &bytes_received),
|
||||
AttributeInit("totalRoundTripTime", &total_round_trip_time),
|
||||
AttributeInit("currentRoundTripTime", ¤t_round_trip_time),
|
||||
AttributeInit("availableOutgoingBitrate", &available_outgoing_bitrate),
|
||||
AttributeInit("availableIncomingBitrate", &available_incoming_bitrate),
|
||||
AttributeInit("requestsReceived", &requests_received),
|
||||
AttributeInit("requestsSent", &requests_sent),
|
||||
AttributeInit("responsesReceived", &responses_received),
|
||||
AttributeInit("responsesSent", &responses_sent),
|
||||
AttributeInit("consentRequestsSent", &consent_requests_sent),
|
||||
AttributeInit("packetsDiscardedOnSend", &packets_discarded_on_send),
|
||||
AttributeInit("bytesDiscardedOnSend", &bytes_discarded_on_send),
|
||||
AttributeInit("lastPacketReceivedTimestamp",
|
||||
&last_packet_received_timestamp),
|
||||
AttributeInit("lastPacketSentTimestamp", &last_packet_sent_timestamp))
|
||||
// clang-format on
|
||||
|
||||
RTCIceCandidatePairStats::RTCIceCandidatePairStats(std::string id,
|
||||
Timestamp timestamp)
|
||||
: RTCStats(std::move(id), timestamp),
|
||||
transport_id("transportId"),
|
||||
local_candidate_id("localCandidateId"),
|
||||
remote_candidate_id("remoteCandidateId"),
|
||||
state("state"),
|
||||
priority("priority"),
|
||||
nominated("nominated"),
|
||||
writable("writable"),
|
||||
packets_sent("packetsSent"),
|
||||
packets_received("packetsReceived"),
|
||||
bytes_sent("bytesSent"),
|
||||
bytes_received("bytesReceived"),
|
||||
total_round_trip_time("totalRoundTripTime"),
|
||||
current_round_trip_time("currentRoundTripTime"),
|
||||
available_outgoing_bitrate("availableOutgoingBitrate"),
|
||||
available_incoming_bitrate("availableIncomingBitrate"),
|
||||
requests_received("requestsReceived"),
|
||||
requests_sent("requestsSent"),
|
||||
responses_received("responsesReceived"),
|
||||
responses_sent("responsesSent"),
|
||||
consent_requests_sent("consentRequestsSent"),
|
||||
packets_discarded_on_send("packetsDiscardedOnSend"),
|
||||
bytes_discarded_on_send("bytesDiscardedOnSend"),
|
||||
last_packet_received_timestamp("lastPacketReceivedTimestamp"),
|
||||
last_packet_sent_timestamp("lastPacketSentTimestamp") {}
|
||||
|
||||
RTCIceCandidatePairStats::RTCIceCandidatePairStats(
|
||||
const RTCIceCandidatePairStats& other) = default;
|
||||
: RTCStats(std::move(id), timestamp) {}
|
||||
|
||||
RTCIceCandidatePairStats::~RTCIceCandidatePairStats() {}
|
||||
|
||||
// clang-format off
|
||||
WEBRTC_RTCSTATS_IMPL(RTCIceCandidateStats, RTCStats, "abstract-ice-candidate",
|
||||
&transport_id,
|
||||
&is_remote,
|
||||
&network_type,
|
||||
&ip,
|
||||
&address,
|
||||
&port,
|
||||
&protocol,
|
||||
&relay_protocol,
|
||||
&candidate_type,
|
||||
&priority,
|
||||
&url,
|
||||
&foundation,
|
||||
&related_address,
|
||||
&related_port,
|
||||
&username_fragment,
|
||||
&tcp_type,
|
||||
&vpn,
|
||||
&network_adapter_type)
|
||||
AttributeInit("transportId", &transport_id),
|
||||
AttributeInit("isRemote", &is_remote),
|
||||
AttributeInit("networkType", &network_type),
|
||||
AttributeInit("ip", &ip),
|
||||
AttributeInit("address", &address),
|
||||
AttributeInit("port", &port),
|
||||
AttributeInit("protocol", &protocol),
|
||||
AttributeInit("relayProtocol", &relay_protocol),
|
||||
AttributeInit("candidateType", &candidate_type),
|
||||
AttributeInit("priority", &priority),
|
||||
AttributeInit("url", &url),
|
||||
AttributeInit("foundation", &foundation),
|
||||
AttributeInit("relatedAddress", &related_address),
|
||||
AttributeInit("relatedPort", &related_port),
|
||||
AttributeInit("usernameFragment", &username_fragment),
|
||||
AttributeInit("tcpType", &tcp_type),
|
||||
AttributeInit("vpn", &vpn),
|
||||
AttributeInit("networkAdapterType", &network_adapter_type))
|
||||
// clang-format on
|
||||
|
||||
RTCIceCandidateStats::RTCIceCandidateStats(std::string id,
|
||||
Timestamp timestamp,
|
||||
bool is_remote)
|
||||
: RTCStats(std::move(id), timestamp),
|
||||
transport_id("transportId"),
|
||||
is_remote("isRemote", is_remote),
|
||||
network_type("networkType"),
|
||||
ip("ip"),
|
||||
address("address"),
|
||||
port("port"),
|
||||
protocol("protocol"),
|
||||
relay_protocol("relayProtocol"),
|
||||
candidate_type("candidateType"),
|
||||
priority("priority"),
|
||||
url("url"),
|
||||
foundation("foundation"),
|
||||
related_address("relatedAddress"),
|
||||
related_port("relatedPort"),
|
||||
username_fragment("usernameFragment"),
|
||||
tcp_type("tcpType"),
|
||||
vpn("vpn"),
|
||||
network_adapter_type("networkAdapterType") {}
|
||||
|
||||
RTCIceCandidateStats::RTCIceCandidateStats(const RTCIceCandidateStats& other) =
|
||||
default;
|
||||
: RTCStats(std::move(id), timestamp), is_remote(is_remote) {}
|
||||
|
||||
RTCIceCandidateStats::~RTCIceCandidateStats() {}
|
||||
|
||||
|
|
@ -229,286 +157,172 @@ const char* RTCRemoteIceCandidateStats::type() const {
|
|||
|
||||
// clang-format off
|
||||
WEBRTC_RTCSTATS_IMPL(RTCPeerConnectionStats, RTCStats, "peer-connection",
|
||||
&data_channels_opened,
|
||||
&data_channels_closed)
|
||||
AttributeInit("dataChannelsOpened", &data_channels_opened),
|
||||
AttributeInit("dataChannelsClosed", &data_channels_closed))
|
||||
// clang-format on
|
||||
|
||||
RTCPeerConnectionStats::RTCPeerConnectionStats(std::string id,
|
||||
Timestamp timestamp)
|
||||
: RTCStats(std::move(id), timestamp),
|
||||
data_channels_opened("dataChannelsOpened"),
|
||||
data_channels_closed("dataChannelsClosed") {}
|
||||
|
||||
RTCPeerConnectionStats::RTCPeerConnectionStats(
|
||||
const RTCPeerConnectionStats& other) = default;
|
||||
: RTCStats(std::move(id), timestamp) {}
|
||||
|
||||
RTCPeerConnectionStats::~RTCPeerConnectionStats() {}
|
||||
|
||||
// clang-format off
|
||||
WEBRTC_RTCSTATS_IMPL(RTCRtpStreamStats, RTCStats, "rtp",
|
||||
&ssrc,
|
||||
&kind,
|
||||
&transport_id,
|
||||
&codec_id)
|
||||
AttributeInit("ssrc", &ssrc),
|
||||
AttributeInit("kind", &kind),
|
||||
AttributeInit("transportId", &transport_id),
|
||||
AttributeInit("codecId", &codec_id))
|
||||
// clang-format on
|
||||
|
||||
RTCRtpStreamStats::RTCRtpStreamStats(std::string id, Timestamp timestamp)
|
||||
: RTCStats(std::move(id), timestamp),
|
||||
ssrc("ssrc"),
|
||||
kind("kind"),
|
||||
transport_id("transportId"),
|
||||
codec_id("codecId") {}
|
||||
|
||||
RTCRtpStreamStats::RTCRtpStreamStats(const RTCRtpStreamStats& other) = default;
|
||||
: RTCStats(std::move(id), timestamp) {}
|
||||
|
||||
RTCRtpStreamStats::~RTCRtpStreamStats() {}
|
||||
|
||||
// clang-format off
|
||||
WEBRTC_RTCSTATS_IMPL(
|
||||
RTCReceivedRtpStreamStats, RTCRtpStreamStats, "received-rtp",
|
||||
&jitter,
|
||||
&packets_lost)
|
||||
AttributeInit("jitter", &jitter),
|
||||
AttributeInit("packetsLost", &packets_lost))
|
||||
// clang-format on
|
||||
|
||||
RTCReceivedRtpStreamStats::RTCReceivedRtpStreamStats(std::string id,
|
||||
Timestamp timestamp)
|
||||
: RTCRtpStreamStats(std::move(id), timestamp),
|
||||
jitter("jitter"),
|
||||
packets_lost("packetsLost") {}
|
||||
|
||||
RTCReceivedRtpStreamStats::RTCReceivedRtpStreamStats(
|
||||
const RTCReceivedRtpStreamStats& other) = default;
|
||||
: RTCRtpStreamStats(std::move(id), timestamp) {}
|
||||
|
||||
RTCReceivedRtpStreamStats::~RTCReceivedRtpStreamStats() {}
|
||||
|
||||
// clang-format off
|
||||
WEBRTC_RTCSTATS_IMPL(
|
||||
RTCSentRtpStreamStats, RTCRtpStreamStats, "sent-rtp",
|
||||
&packets_sent,
|
||||
&bytes_sent)
|
||||
WEBRTC_RTCSTATS_IMPL(RTCSentRtpStreamStats, RTCRtpStreamStats, "sent-rtp",
|
||||
AttributeInit("packetsSent", &packets_sent),
|
||||
AttributeInit("bytesSent", &bytes_sent))
|
||||
// clang-format on
|
||||
|
||||
RTCSentRtpStreamStats::RTCSentRtpStreamStats(std::string id,
|
||||
Timestamp timestamp)
|
||||
: RTCRtpStreamStats(std::move(id), timestamp),
|
||||
packets_sent("packetsSent"),
|
||||
bytes_sent("bytesSent") {}
|
||||
|
||||
RTCSentRtpStreamStats::RTCSentRtpStreamStats(
|
||||
const RTCSentRtpStreamStats& other) = default;
|
||||
: RTCRtpStreamStats(std::move(id), timestamp) {}
|
||||
|
||||
RTCSentRtpStreamStats::~RTCSentRtpStreamStats() {}
|
||||
|
||||
// clang-format off
|
||||
WEBRTC_RTCSTATS_IMPL(
|
||||
RTCInboundRtpStreamStats, RTCReceivedRtpStreamStats, "inbound-rtp",
|
||||
&track_identifier,
|
||||
&mid,
|
||||
&remote_id,
|
||||
&packets_received,
|
||||
&packets_discarded,
|
||||
&fec_packets_received,
|
||||
&fec_bytes_received,
|
||||
&fec_packets_discarded,
|
||||
&fec_ssrc,
|
||||
&bytes_received,
|
||||
&header_bytes_received,
|
||||
&retransmitted_packets_received,
|
||||
&retransmitted_bytes_received,
|
||||
&rtx_ssrc,
|
||||
&last_packet_received_timestamp,
|
||||
&jitter_buffer_delay,
|
||||
&jitter_buffer_target_delay,
|
||||
&jitter_buffer_minimum_delay,
|
||||
&jitter_buffer_emitted_count,
|
||||
&total_samples_received,
|
||||
&concealed_samples,
|
||||
&silent_concealed_samples,
|
||||
&concealment_events,
|
||||
&inserted_samples_for_deceleration,
|
||||
&removed_samples_for_acceleration,
|
||||
&audio_level,
|
||||
&total_audio_energy,
|
||||
&total_samples_duration,
|
||||
&playout_id,
|
||||
&frames_received,
|
||||
&frame_width,
|
||||
&frame_height,
|
||||
&frames_per_second,
|
||||
&frames_decoded,
|
||||
&key_frames_decoded,
|
||||
&frames_dropped,
|
||||
&total_decode_time,
|
||||
&total_processing_delay,
|
||||
&total_assembly_time,
|
||||
&frames_assembled_from_multiple_packets,
|
||||
&total_inter_frame_delay,
|
||||
&total_squared_inter_frame_delay,
|
||||
&pause_count,
|
||||
&total_pauses_duration,
|
||||
&freeze_count,
|
||||
&total_freezes_duration,
|
||||
&content_type,
|
||||
&estimated_playout_timestamp,
|
||||
&decoder_implementation,
|
||||
&fir_count,
|
||||
&pli_count,
|
||||
&nack_count,
|
||||
&qp_sum,
|
||||
&goog_timing_frame_info,
|
||||
&power_efficient_decoder,
|
||||
&jitter_buffer_flushes,
|
||||
&delayed_packet_outage_samples,
|
||||
&relative_packet_arrival_delay,
|
||||
&interruption_count,
|
||||
&total_interruption_duration,
|
||||
&min_playout_delay)
|
||||
AttributeInit("playoutId", &playout_id),
|
||||
AttributeInit("trackIdentifier", &track_identifier),
|
||||
AttributeInit("mid", &mid),
|
||||
AttributeInit("remoteId", &remote_id),
|
||||
AttributeInit("packetsReceived", &packets_received),
|
||||
AttributeInit("packetsDiscarded", &packets_discarded),
|
||||
AttributeInit("fecPacketsReceived", &fec_packets_received),
|
||||
AttributeInit("fecBytesReceived", &fec_bytes_received),
|
||||
AttributeInit("fecPacketsDiscarded", &fec_packets_discarded),
|
||||
AttributeInit("fecSsrc", &fec_ssrc),
|
||||
AttributeInit("bytesReceived", &bytes_received),
|
||||
AttributeInit("headerBytesReceived", &header_bytes_received),
|
||||
AttributeInit("retransmittedPacketsReceived",
|
||||
&retransmitted_packets_received),
|
||||
AttributeInit("retransmittedBytesReceived", &retransmitted_bytes_received),
|
||||
AttributeInit("rtxSsrc", &rtx_ssrc),
|
||||
AttributeInit("lastPacketReceivedTimestamp",
|
||||
&last_packet_received_timestamp),
|
||||
AttributeInit("jitterBufferDelay", &jitter_buffer_delay),
|
||||
AttributeInit("jitterBufferTargetDelay", &jitter_buffer_target_delay),
|
||||
AttributeInit("jitterBufferMinimumDelay", &jitter_buffer_minimum_delay),
|
||||
AttributeInit("jitterBufferEmittedCount", &jitter_buffer_emitted_count),
|
||||
AttributeInit("totalSamplesReceived", &total_samples_received),
|
||||
AttributeInit("concealedSamples", &concealed_samples),
|
||||
AttributeInit("silentConcealedSamples", &silent_concealed_samples),
|
||||
AttributeInit("concealmentEvents", &concealment_events),
|
||||
AttributeInit("insertedSamplesForDeceleration",
|
||||
&inserted_samples_for_deceleration),
|
||||
AttributeInit("removedSamplesForAcceleration",
|
||||
&removed_samples_for_acceleration),
|
||||
AttributeInit("audioLevel", &audio_level),
|
||||
AttributeInit("totalAudioEnergy", &total_audio_energy),
|
||||
AttributeInit("totalSamplesDuration", &total_samples_duration),
|
||||
AttributeInit("framesReceived", &frames_received),
|
||||
AttributeInit("frameWidth", &frame_width),
|
||||
AttributeInit("frameHeight", &frame_height),
|
||||
AttributeInit("framesPerSecond", &frames_per_second),
|
||||
AttributeInit("framesDecoded", &frames_decoded),
|
||||
AttributeInit("keyFramesDecoded", &key_frames_decoded),
|
||||
AttributeInit("framesDropped", &frames_dropped),
|
||||
AttributeInit("totalDecodeTime", &total_decode_time),
|
||||
AttributeInit("totalProcessingDelay", &total_processing_delay),
|
||||
AttributeInit("totalAssemblyTime", &total_assembly_time),
|
||||
AttributeInit("framesAssembledFromMultiplePackets",
|
||||
&frames_assembled_from_multiple_packets),
|
||||
AttributeInit("totalInterFrameDelay", &total_inter_frame_delay),
|
||||
AttributeInit("totalSquaredInterFrameDelay",
|
||||
&total_squared_inter_frame_delay),
|
||||
AttributeInit("pauseCount", &pause_count),
|
||||
AttributeInit("totalPausesDuration", &total_pauses_duration),
|
||||
AttributeInit("freezeCount", &freeze_count),
|
||||
AttributeInit("totalFreezesDuration", &total_freezes_duration),
|
||||
AttributeInit("contentType", &content_type),
|
||||
AttributeInit("estimatedPlayoutTimestamp", &estimated_playout_timestamp),
|
||||
AttributeInit("decoderImplementation", &decoder_implementation),
|
||||
AttributeInit("firCount", &fir_count),
|
||||
AttributeInit("pliCount", &pli_count),
|
||||
AttributeInit("nackCount", &nack_count),
|
||||
AttributeInit("qpSum", &qp_sum),
|
||||
AttributeInit("googTimingFrameInfo", &goog_timing_frame_info),
|
||||
AttributeInit("powerEfficientDecoder", &power_efficient_decoder),
|
||||
AttributeInit("jitterBufferFlushes", &jitter_buffer_flushes),
|
||||
AttributeInit("delayedPacketOutageSamples", &delayed_packet_outage_samples),
|
||||
AttributeInit("relativePacketArrivalDelay", &relative_packet_arrival_delay),
|
||||
AttributeInit("interruptionCount", &interruption_count),
|
||||
AttributeInit("totalInterruptionDuration", &total_interruption_duration),
|
||||
AttributeInit("minPlayoutDelay", &min_playout_delay))
|
||||
// clang-format on
|
||||
|
||||
RTCInboundRtpStreamStats::RTCInboundRtpStreamStats(std::string id,
|
||||
Timestamp timestamp)
|
||||
: RTCReceivedRtpStreamStats(std::move(id), timestamp),
|
||||
playout_id("playoutId"),
|
||||
track_identifier("trackIdentifier"),
|
||||
mid("mid"),
|
||||
remote_id("remoteId"),
|
||||
packets_received("packetsReceived"),
|
||||
packets_discarded("packetsDiscarded"),
|
||||
fec_packets_received("fecPacketsReceived"),
|
||||
fec_bytes_received("fecBytesReceived"),
|
||||
fec_packets_discarded("fecPacketsDiscarded"),
|
||||
fec_ssrc("fecSsrc"),
|
||||
bytes_received("bytesReceived"),
|
||||
header_bytes_received("headerBytesReceived"),
|
||||
retransmitted_packets_received("retransmittedPacketsReceived"),
|
||||
retransmitted_bytes_received("retransmittedBytesReceived"),
|
||||
rtx_ssrc("rtxSsrc"),
|
||||
last_packet_received_timestamp("lastPacketReceivedTimestamp"),
|
||||
jitter_buffer_delay("jitterBufferDelay"),
|
||||
jitter_buffer_target_delay("jitterBufferTargetDelay"),
|
||||
jitter_buffer_minimum_delay("jitterBufferMinimumDelay"),
|
||||
jitter_buffer_emitted_count("jitterBufferEmittedCount"),
|
||||
total_samples_received("totalSamplesReceived"),
|
||||
concealed_samples("concealedSamples"),
|
||||
silent_concealed_samples("silentConcealedSamples"),
|
||||
concealment_events("concealmentEvents"),
|
||||
inserted_samples_for_deceleration("insertedSamplesForDeceleration"),
|
||||
removed_samples_for_acceleration("removedSamplesForAcceleration"),
|
||||
audio_level("audioLevel"),
|
||||
total_audio_energy("totalAudioEnergy"),
|
||||
total_samples_duration("totalSamplesDuration"),
|
||||
frames_received("framesReceived"),
|
||||
frame_width("frameWidth"),
|
||||
frame_height("frameHeight"),
|
||||
frames_per_second("framesPerSecond"),
|
||||
frames_decoded("framesDecoded"),
|
||||
key_frames_decoded("keyFramesDecoded"),
|
||||
frames_dropped("framesDropped"),
|
||||
total_decode_time("totalDecodeTime"),
|
||||
total_processing_delay("totalProcessingDelay"),
|
||||
total_assembly_time("totalAssemblyTime"),
|
||||
frames_assembled_from_multiple_packets(
|
||||
"framesAssembledFromMultiplePackets"),
|
||||
total_inter_frame_delay("totalInterFrameDelay"),
|
||||
total_squared_inter_frame_delay("totalSquaredInterFrameDelay"),
|
||||
pause_count("pauseCount"),
|
||||
total_pauses_duration("totalPausesDuration"),
|
||||
freeze_count("freezeCount"),
|
||||
total_freezes_duration("totalFreezesDuration"),
|
||||
content_type("contentType"),
|
||||
estimated_playout_timestamp("estimatedPlayoutTimestamp"),
|
||||
decoder_implementation("decoderImplementation"),
|
||||
fir_count("firCount"),
|
||||
pli_count("pliCount"),
|
||||
nack_count("nackCount"),
|
||||
qp_sum("qpSum"),
|
||||
goog_timing_frame_info("googTimingFrameInfo"),
|
||||
power_efficient_decoder("powerEfficientDecoder"),
|
||||
jitter_buffer_flushes("jitterBufferFlushes"),
|
||||
delayed_packet_outage_samples("delayedPacketOutageSamples"),
|
||||
relative_packet_arrival_delay("relativePacketArrivalDelay"),
|
||||
interruption_count("interruptionCount"),
|
||||
total_interruption_duration("totalInterruptionDuration"),
|
||||
min_playout_delay("minPlayoutDelay") {}
|
||||
: RTCReceivedRtpStreamStats(std::move(id), timestamp) {}
|
||||
|
||||
RTCInboundRtpStreamStats::RTCInboundRtpStreamStats(
|
||||
const RTCInboundRtpStreamStats& other) = default;
|
||||
RTCInboundRtpStreamStats::~RTCInboundRtpStreamStats() {}
|
||||
|
||||
// clang-format off
|
||||
WEBRTC_RTCSTATS_IMPL(
|
||||
RTCOutboundRtpStreamStats, RTCSentRtpStreamStats, "outbound-rtp",
|
||||
&media_source_id,
|
||||
&remote_id,
|
||||
&mid,
|
||||
&rid,
|
||||
&retransmitted_packets_sent,
|
||||
&header_bytes_sent,
|
||||
&retransmitted_bytes_sent,
|
||||
&target_bitrate,
|
||||
&frames_encoded,
|
||||
&key_frames_encoded,
|
||||
&total_encode_time,
|
||||
&total_encoded_bytes_target,
|
||||
&frame_width,
|
||||
&frame_height,
|
||||
&frames_per_second,
|
||||
&frames_sent,
|
||||
&huge_frames_sent,
|
||||
&total_packet_send_delay,
|
||||
&quality_limitation_reason,
|
||||
&quality_limitation_durations,
|
||||
&quality_limitation_resolution_changes,
|
||||
&content_type,
|
||||
&encoder_implementation,
|
||||
&fir_count,
|
||||
&pli_count,
|
||||
&nack_count,
|
||||
&qp_sum,
|
||||
&active,
|
||||
&power_efficient_encoder,
|
||||
&scalability_mode,
|
||||
&rtx_ssrc)
|
||||
AttributeInit("mediaSourceId", &media_source_id),
|
||||
AttributeInit("remoteId", &remote_id),
|
||||
AttributeInit("mid", &mid),
|
||||
AttributeInit("rid", &rid),
|
||||
AttributeInit("retransmittedPacketsSent", &retransmitted_packets_sent),
|
||||
AttributeInit("headerBytesSent", &header_bytes_sent),
|
||||
AttributeInit("retransmittedBytesSent", &retransmitted_bytes_sent),
|
||||
AttributeInit("targetBitrate", &target_bitrate),
|
||||
AttributeInit("framesEncoded", &frames_encoded),
|
||||
AttributeInit("keyFramesEncoded", &key_frames_encoded),
|
||||
AttributeInit("totalEncodeTime", &total_encode_time),
|
||||
AttributeInit("totalEncodedBytesTarget", &total_encoded_bytes_target),
|
||||
AttributeInit("frameWidth", &frame_width),
|
||||
AttributeInit("frameHeight", &frame_height),
|
||||
AttributeInit("framesPerSecond", &frames_per_second),
|
||||
AttributeInit("framesSent", &frames_sent),
|
||||
AttributeInit("hugeFramesSent", &huge_frames_sent),
|
||||
AttributeInit("totalPacketSendDelay", &total_packet_send_delay),
|
||||
AttributeInit("qualityLimitationReason", &quality_limitation_reason),
|
||||
AttributeInit("qualityLimitationDurations", &quality_limitation_durations),
|
||||
AttributeInit("qualityLimitationResolutionChanges",
|
||||
&quality_limitation_resolution_changes),
|
||||
AttributeInit("contentType", &content_type),
|
||||
AttributeInit("encoderImplementation", &encoder_implementation),
|
||||
AttributeInit("firCount", &fir_count),
|
||||
AttributeInit("pliCount", &pli_count),
|
||||
AttributeInit("nackCount", &nack_count),
|
||||
AttributeInit("qpSum", &qp_sum),
|
||||
AttributeInit("active", &active),
|
||||
AttributeInit("powerEfficientEncoder", &power_efficient_encoder),
|
||||
AttributeInit("scalabilityMode", &scalability_mode),
|
||||
AttributeInit("rtxSsrc", &rtx_ssrc))
|
||||
// clang-format on
|
||||
|
||||
RTCOutboundRtpStreamStats::RTCOutboundRtpStreamStats(std::string id,
|
||||
Timestamp timestamp)
|
||||
: RTCSentRtpStreamStats(std::move(id), timestamp),
|
||||
media_source_id("mediaSourceId"),
|
||||
remote_id("remoteId"),
|
||||
mid("mid"),
|
||||
rid("rid"),
|
||||
retransmitted_packets_sent("retransmittedPacketsSent"),
|
||||
header_bytes_sent("headerBytesSent"),
|
||||
retransmitted_bytes_sent("retransmittedBytesSent"),
|
||||
target_bitrate("targetBitrate"),
|
||||
frames_encoded("framesEncoded"),
|
||||
key_frames_encoded("keyFramesEncoded"),
|
||||
total_encode_time("totalEncodeTime"),
|
||||
total_encoded_bytes_target("totalEncodedBytesTarget"),
|
||||
frame_width("frameWidth"),
|
||||
frame_height("frameHeight"),
|
||||
frames_per_second("framesPerSecond"),
|
||||
frames_sent("framesSent"),
|
||||
huge_frames_sent("hugeFramesSent"),
|
||||
total_packet_send_delay("totalPacketSendDelay"),
|
||||
quality_limitation_reason("qualityLimitationReason"),
|
||||
quality_limitation_durations("qualityLimitationDurations"),
|
||||
quality_limitation_resolution_changes(
|
||||
"qualityLimitationResolutionChanges"),
|
||||
content_type("contentType"),
|
||||
encoder_implementation("encoderImplementation"),
|
||||
fir_count("firCount"),
|
||||
pli_count("pliCount"),
|
||||
nack_count("nackCount"),
|
||||
qp_sum("qpSum"),
|
||||
active("active"),
|
||||
power_efficient_encoder("powerEfficientEncoder"),
|
||||
scalability_mode("scalabilityMode"),
|
||||
rtx_ssrc("rtxSsrc") {}
|
||||
|
||||
RTCOutboundRtpStreamStats::RTCOutboundRtpStreamStats(
|
||||
const RTCOutboundRtpStreamStats& other) = default;
|
||||
: RTCSentRtpStreamStats(std::move(id), timestamp) {}
|
||||
|
||||
RTCOutboundRtpStreamStats::~RTCOutboundRtpStreamStats() {}
|
||||
|
||||
|
|
@ -516,25 +330,17 @@ RTCOutboundRtpStreamStats::~RTCOutboundRtpStreamStats() {}
|
|||
WEBRTC_RTCSTATS_IMPL(
|
||||
RTCRemoteInboundRtpStreamStats, RTCReceivedRtpStreamStats,
|
||||
"remote-inbound-rtp",
|
||||
&local_id,
|
||||
&round_trip_time,
|
||||
&fraction_lost,
|
||||
&total_round_trip_time,
|
||||
&round_trip_time_measurements)
|
||||
AttributeInit("localId", &local_id),
|
||||
AttributeInit("roundTripTime", &round_trip_time),
|
||||
AttributeInit("fractionLost", &fraction_lost),
|
||||
AttributeInit("totalRoundTripTime", &total_round_trip_time),
|
||||
AttributeInit("roundTripTimeMeasurements", &round_trip_time_measurements))
|
||||
// clang-format on
|
||||
|
||||
RTCRemoteInboundRtpStreamStats::RTCRemoteInboundRtpStreamStats(
|
||||
std::string id,
|
||||
Timestamp timestamp)
|
||||
: RTCReceivedRtpStreamStats(std::move(id), timestamp),
|
||||
local_id("localId"),
|
||||
round_trip_time("roundTripTime"),
|
||||
fraction_lost("fractionLost"),
|
||||
total_round_trip_time("totalRoundTripTime"),
|
||||
round_trip_time_measurements("roundTripTimeMeasurements") {}
|
||||
|
||||
RTCRemoteInboundRtpStreamStats::RTCRemoteInboundRtpStreamStats(
|
||||
const RTCRemoteInboundRtpStreamStats& other) = default;
|
||||
: RTCReceivedRtpStreamStats(std::move(id), timestamp) {}
|
||||
|
||||
RTCRemoteInboundRtpStreamStats::~RTCRemoteInboundRtpStreamStats() {}
|
||||
|
||||
|
|
@ -542,156 +348,100 @@ RTCRemoteInboundRtpStreamStats::~RTCRemoteInboundRtpStreamStats() {}
|
|||
WEBRTC_RTCSTATS_IMPL(
|
||||
RTCRemoteOutboundRtpStreamStats, RTCSentRtpStreamStats,
|
||||
"remote-outbound-rtp",
|
||||
&local_id,
|
||||
&remote_timestamp,
|
||||
&reports_sent,
|
||||
&round_trip_time,
|
||||
&round_trip_time_measurements,
|
||||
&total_round_trip_time)
|
||||
AttributeInit("localId", &local_id),
|
||||
AttributeInit("remoteTimestamp", &remote_timestamp),
|
||||
AttributeInit("reportsSent", &reports_sent),
|
||||
AttributeInit("roundTripTime", &round_trip_time),
|
||||
AttributeInit("roundTripTimeMeasurements", &round_trip_time_measurements),
|
||||
AttributeInit("totalRoundTripTime", &total_round_trip_time))
|
||||
// clang-format on
|
||||
|
||||
RTCRemoteOutboundRtpStreamStats::RTCRemoteOutboundRtpStreamStats(
|
||||
std::string id,
|
||||
Timestamp timestamp)
|
||||
: RTCSentRtpStreamStats(std::move(id), timestamp),
|
||||
local_id("localId"),
|
||||
remote_timestamp("remoteTimestamp"),
|
||||
reports_sent("reportsSent"),
|
||||
round_trip_time("roundTripTime"),
|
||||
round_trip_time_measurements("roundTripTimeMeasurements"),
|
||||
total_round_trip_time("totalRoundTripTime") {}
|
||||
|
||||
RTCRemoteOutboundRtpStreamStats::RTCRemoteOutboundRtpStreamStats(
|
||||
const RTCRemoteOutboundRtpStreamStats& other) = default;
|
||||
: RTCSentRtpStreamStats(std::move(id), timestamp) {}
|
||||
|
||||
RTCRemoteOutboundRtpStreamStats::~RTCRemoteOutboundRtpStreamStats() {}
|
||||
|
||||
// clang-format off
|
||||
WEBRTC_RTCSTATS_IMPL(RTCMediaSourceStats, RTCStats, "parent-media-source",
|
||||
&track_identifier,
|
||||
&kind)
|
||||
AttributeInit("trackIdentifier", &track_identifier),
|
||||
AttributeInit("kind", &kind))
|
||||
// clang-format on
|
||||
|
||||
RTCMediaSourceStats::RTCMediaSourceStats(std::string id, Timestamp timestamp)
|
||||
: RTCStats(std::move(id), timestamp),
|
||||
track_identifier("trackIdentifier"),
|
||||
kind("kind") {}
|
||||
|
||||
RTCMediaSourceStats::RTCMediaSourceStats(const RTCMediaSourceStats& other) =
|
||||
default;
|
||||
: RTCStats(std::move(id), timestamp) {}
|
||||
|
||||
RTCMediaSourceStats::~RTCMediaSourceStats() {}
|
||||
|
||||
// clang-format off
|
||||
WEBRTC_RTCSTATS_IMPL(RTCAudioSourceStats, RTCMediaSourceStats, "media-source",
|
||||
&audio_level,
|
||||
&total_audio_energy,
|
||||
&total_samples_duration,
|
||||
&echo_return_loss,
|
||||
&echo_return_loss_enhancement)
|
||||
AttributeInit("audioLevel", &audio_level),
|
||||
AttributeInit("totalAudioEnergy", &total_audio_energy),
|
||||
AttributeInit("totalSamplesDuration", &total_samples_duration),
|
||||
AttributeInit("echoReturnLoss", &echo_return_loss),
|
||||
AttributeInit("echoReturnLossEnhancement", &echo_return_loss_enhancement))
|
||||
// clang-format on
|
||||
|
||||
RTCAudioSourceStats::RTCAudioSourceStats(std::string id, Timestamp timestamp)
|
||||
: RTCMediaSourceStats(std::move(id), timestamp),
|
||||
audio_level("audioLevel"),
|
||||
total_audio_energy("totalAudioEnergy"),
|
||||
total_samples_duration("totalSamplesDuration"),
|
||||
echo_return_loss("echoReturnLoss"),
|
||||
echo_return_loss_enhancement("echoReturnLossEnhancement") {}
|
||||
|
||||
RTCAudioSourceStats::RTCAudioSourceStats(const RTCAudioSourceStats& other) =
|
||||
default;
|
||||
: RTCMediaSourceStats(std::move(id), timestamp) {}
|
||||
|
||||
RTCAudioSourceStats::~RTCAudioSourceStats() {}
|
||||
|
||||
// clang-format off
|
||||
WEBRTC_RTCSTATS_IMPL(RTCVideoSourceStats, RTCMediaSourceStats, "media-source",
|
||||
&width,
|
||||
&height,
|
||||
&frames,
|
||||
&frames_per_second)
|
||||
AttributeInit("width", &width),
|
||||
AttributeInit("height", &height),
|
||||
AttributeInit("frames", &frames),
|
||||
AttributeInit("framesPerSecond", &frames_per_second))
|
||||
// clang-format on
|
||||
|
||||
RTCVideoSourceStats::RTCVideoSourceStats(std::string id, Timestamp timestamp)
|
||||
: RTCMediaSourceStats(std::move(id), timestamp),
|
||||
width("width"),
|
||||
height("height"),
|
||||
frames("frames"),
|
||||
frames_per_second("framesPerSecond") {}
|
||||
|
||||
RTCVideoSourceStats::RTCVideoSourceStats(const RTCVideoSourceStats& other) =
|
||||
default;
|
||||
: RTCMediaSourceStats(std::move(id), timestamp) {}
|
||||
|
||||
RTCVideoSourceStats::~RTCVideoSourceStats() {}
|
||||
|
||||
// clang-format off
|
||||
WEBRTC_RTCSTATS_IMPL(RTCTransportStats, RTCStats, "transport",
|
||||
&bytes_sent,
|
||||
&packets_sent,
|
||||
&bytes_received,
|
||||
&packets_received,
|
||||
&rtcp_transport_stats_id,
|
||||
&dtls_state,
|
||||
&selected_candidate_pair_id,
|
||||
&local_certificate_id,
|
||||
&remote_certificate_id,
|
||||
&tls_version,
|
||||
&dtls_cipher,
|
||||
&dtls_role,
|
||||
&srtp_cipher,
|
||||
&selected_candidate_pair_changes,
|
||||
&ice_role,
|
||||
&ice_local_username_fragment,
|
||||
&ice_state)
|
||||
AttributeInit("bytesSent", &bytes_sent),
|
||||
AttributeInit("packetsSent", &packets_sent),
|
||||
AttributeInit("bytesReceived", &bytes_received),
|
||||
AttributeInit("packetsReceived", &packets_received),
|
||||
AttributeInit("rtcpTransportStatsId", &rtcp_transport_stats_id),
|
||||
AttributeInit("dtlsState", &dtls_state),
|
||||
AttributeInit("selectedCandidatePairId", &selected_candidate_pair_id),
|
||||
AttributeInit("localCertificateId", &local_certificate_id),
|
||||
AttributeInit("remoteCertificateId", &remote_certificate_id),
|
||||
AttributeInit("tlsVersion", &tls_version),
|
||||
AttributeInit("dtlsCipher", &dtls_cipher),
|
||||
AttributeInit("dtlsRole", &dtls_role),
|
||||
AttributeInit("srtpCipher", &srtp_cipher),
|
||||
AttributeInit("selectedCandidatePairChanges",
|
||||
&selected_candidate_pair_changes),
|
||||
AttributeInit("iceRole", &ice_role),
|
||||
AttributeInit("iceLocalUsernameFragment", &ice_local_username_fragment),
|
||||
AttributeInit("iceState", &ice_state))
|
||||
// clang-format on
|
||||
|
||||
RTCTransportStats::RTCTransportStats(std::string id, Timestamp timestamp)
|
||||
: RTCStats(std::move(id), timestamp),
|
||||
bytes_sent("bytesSent"),
|
||||
packets_sent("packetsSent"),
|
||||
bytes_received("bytesReceived"),
|
||||
packets_received("packetsReceived"),
|
||||
rtcp_transport_stats_id("rtcpTransportStatsId"),
|
||||
dtls_state("dtlsState"),
|
||||
selected_candidate_pair_id("selectedCandidatePairId"),
|
||||
local_certificate_id("localCertificateId"),
|
||||
remote_certificate_id("remoteCertificateId"),
|
||||
tls_version("tlsVersion"),
|
||||
dtls_cipher("dtlsCipher"),
|
||||
dtls_role("dtlsRole"),
|
||||
srtp_cipher("srtpCipher"),
|
||||
selected_candidate_pair_changes("selectedCandidatePairChanges"),
|
||||
ice_role("iceRole"),
|
||||
ice_local_username_fragment("iceLocalUsernameFragment"),
|
||||
ice_state("iceState") {}
|
||||
|
||||
RTCTransportStats::RTCTransportStats(const RTCTransportStats& other) = default;
|
||||
: RTCStats(std::move(id), timestamp) {}
|
||||
|
||||
RTCTransportStats::~RTCTransportStats() {}
|
||||
|
||||
// clang-format off
|
||||
WEBRTC_RTCSTATS_IMPL(RTCAudioPlayoutStats, RTCStats, "media-playout",
|
||||
AttributeInit("kind", &kind),
|
||||
AttributeInit("synthesizedSamplesDuration", &synthesized_samples_duration),
|
||||
AttributeInit("synthesizedSamplesEvents", &synthesized_samples_events),
|
||||
AttributeInit("totalSamplesDuration", &total_samples_duration),
|
||||
AttributeInit("totalPlayoutDelay", &total_playout_delay),
|
||||
AttributeInit("totalSamplesCount", &total_samples_count))
|
||||
// clang-format on
|
||||
|
||||
RTCAudioPlayoutStats::RTCAudioPlayoutStats(const std::string& id,
|
||||
Timestamp timestamp)
|
||||
: RTCStats(std::move(id), timestamp),
|
||||
kind("kind", "audio"),
|
||||
synthesized_samples_duration("synthesizedSamplesDuration"),
|
||||
synthesized_samples_events("synthesizedSamplesEvents"),
|
||||
total_samples_duration("totalSamplesDuration"),
|
||||
total_playout_delay("totalPlayoutDelay"),
|
||||
total_samples_count("totalSamplesCount") {}
|
||||
|
||||
RTCAudioPlayoutStats::RTCAudioPlayoutStats(const RTCAudioPlayoutStats& other) =
|
||||
default;
|
||||
: RTCStats(std::move(id), timestamp), kind("audio") {}
|
||||
|
||||
RTCAudioPlayoutStats::~RTCAudioPlayoutStats() {}
|
||||
|
||||
// clang-format off
|
||||
WEBRTC_RTCSTATS_IMPL(RTCAudioPlayoutStats, RTCStats, "media-playout",
|
||||
&kind,
|
||||
&synthesized_samples_duration,
|
||||
&synthesized_samples_events,
|
||||
&total_samples_duration,
|
||||
&total_playout_delay,
|
||||
&total_samples_count)
|
||||
// clang-format on
|
||||
|
||||
} // namespace webrtc
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
|
||||
#include "stats/test/rtc_test_stats.h"
|
||||
|
||||
#include "api/stats/attribute.h"
|
||||
#include "rtc_base/checks.h"
|
||||
|
||||
namespace webrtc {
|
||||
|
|
@ -17,60 +18,25 @@ namespace webrtc {
|
|||
WEBRTC_RTCSTATS_IMPL(RTCTestStats,
|
||||
RTCStats,
|
||||
"test-stats",
|
||||
&m_bool,
|
||||
&m_int32,
|
||||
&m_uint32,
|
||||
&m_int64,
|
||||
&m_uint64,
|
||||
&m_double,
|
||||
&m_string,
|
||||
&m_sequence_bool,
|
||||
&m_sequence_int32,
|
||||
&m_sequence_uint32,
|
||||
&m_sequence_int64,
|
||||
&m_sequence_uint64,
|
||||
&m_sequence_double,
|
||||
&m_sequence_string,
|
||||
&m_map_string_uint64,
|
||||
&m_map_string_double)
|
||||
AttributeInit("mBool", &m_bool),
|
||||
AttributeInit("mInt32", &m_int32),
|
||||
AttributeInit("mUint32", &m_uint32),
|
||||
AttributeInit("mInt64", &m_int64),
|
||||
AttributeInit("mUint64", &m_uint64),
|
||||
AttributeInit("mDouble", &m_double),
|
||||
AttributeInit("mString", &m_string),
|
||||
AttributeInit("mSequenceBool", &m_sequence_bool),
|
||||
AttributeInit("mSequenceInt32", &m_sequence_int32),
|
||||
AttributeInit("mSequenceUint32", &m_sequence_uint32),
|
||||
AttributeInit("mSequenceInt64", &m_sequence_int64),
|
||||
AttributeInit("mSequenceUint64", &m_sequence_uint64),
|
||||
AttributeInit("mSequenceDouble", &m_sequence_double),
|
||||
AttributeInit("mSequenceString", &m_sequence_string),
|
||||
AttributeInit("mMapStringUint64", &m_map_string_uint64),
|
||||
AttributeInit("mMapStringDouble", &m_map_string_double))
|
||||
|
||||
RTCTestStats::RTCTestStats(const std::string& id, Timestamp timestamp)
|
||||
: RTCStats(id, timestamp),
|
||||
m_bool("mBool"),
|
||||
m_int32("mInt32"),
|
||||
m_uint32("mUint32"),
|
||||
m_int64("mInt64"),
|
||||
m_uint64("mUint64"),
|
||||
m_double("mDouble"),
|
||||
m_string("mString"),
|
||||
m_sequence_bool("mSequenceBool"),
|
||||
m_sequence_int32("mSequenceInt32"),
|
||||
m_sequence_uint32("mSequenceUint32"),
|
||||
m_sequence_int64("mSequenceInt64"),
|
||||
m_sequence_uint64("mSequenceUint64"),
|
||||
m_sequence_double("mSequenceDouble"),
|
||||
m_sequence_string("mSequenceString"),
|
||||
m_map_string_uint64("mMapStringUint64"),
|
||||
m_map_string_double("mMapStringDouble") {}
|
||||
|
||||
RTCTestStats::RTCTestStats(const RTCTestStats& other)
|
||||
: RTCStats(other.id(), other.timestamp()),
|
||||
m_bool(other.m_bool),
|
||||
m_int32(other.m_int32),
|
||||
m_uint32(other.m_uint32),
|
||||
m_int64(other.m_int64),
|
||||
m_uint64(other.m_uint64),
|
||||
m_double(other.m_double),
|
||||
m_string(other.m_string),
|
||||
m_sequence_bool(other.m_sequence_bool),
|
||||
m_sequence_int32(other.m_sequence_int32),
|
||||
m_sequence_uint32(other.m_sequence_uint32),
|
||||
m_sequence_int64(other.m_sequence_int64),
|
||||
m_sequence_uint64(other.m_sequence_uint64),
|
||||
m_sequence_double(other.m_sequence_double),
|
||||
m_sequence_string(other.m_sequence_string),
|
||||
m_map_string_uint64(other.m_map_string_uint64),
|
||||
m_map_string_double(other.m_map_string_double) {}
|
||||
: RTCStats(id, timestamp) {}
|
||||
|
||||
RTCTestStats::~RTCTestStats() {}
|
||||
|
||||
|
|
|
|||
|
|
@ -24,9 +24,7 @@ namespace webrtc {
|
|||
class RTC_EXPORT RTCTestStats : public RTCStats {
|
||||
public:
|
||||
WEBRTC_RTCSTATS_DECL();
|
||||
|
||||
RTCTestStats(const std::string& id, Timestamp timestamp);
|
||||
RTCTestStats(const RTCTestStats& other);
|
||||
~RTCTestStats() override;
|
||||
|
||||
RTCStatsMember<bool> m_bool;
|
||||
|
|
|
|||
Loading…
Reference in a new issue