mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 22:00:47 +01:00
7209548090
This is a reland of commit 54be7084e0
Previously reverted due to an importer issue (b/320646178) and later a
dependency on RTCStatsMember<T>::ValueToString().
In this reland, we add Attribute::ToString() but we don't delete the
RTCStatsMember<T> stringifier methods, allowing downstream to migrate
before they are deleted.
Original change's description:
> [Stats] Attribute::ToString(), to replace member ValueToString/ToJson.
>
> Delete RTCStatsMember<T>::ValueToString() and ValueToJson() in favor of
> Attribute::ToString().
>
> The difference between "ToString" and "ToJson" is that the "ToJson"
> version converts 64-bit integers and doubles to floating points with no
> more than ~15 digits of precision as to not exceed JSON's precision
> limitations. So only in edge cases of really large numbers or numbers
> with a silly number of digits will the two methods produce different
> results. Also JSON puts '\"' around map key names, e.g. "{\"foo\":123}"
> as opposed to "{foo:123}".
>
> Going forward we see no reason to maintain two different string
> converted paths that are this similar, so we only implement one
> Attribute::ToString() method which does what "ToJson" did.
>
> In the next CL we can delete RTCStatsMember<T>.
>
> Bug: webrtc:15164
> Change-Id: Iaa8cf3bf14b40dc44664f75989832469603131c5
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/334640
> Commit-Queue: Henrik Boström <hbos@webrtc.org>
> Reviewed-by: Evan Shrubsole <eshr@google.com>
> Reviewed-by: Harald Alvestrand <hta@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#41544}
Bug: webrtc:15164
Change-Id: I281ccf5b23d8f194b5ce00186a32846c757b46fc
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/334860
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Henrik Boström <hbos@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41575}
78 lines
2 KiB
C++
78 lines
2 KiB
C++
/*
|
|
* Copyright 2016 The WebRTC Project Authors. All rights reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "api/stats/rtc_stats.h"
|
|
|
|
#include <cstdio>
|
|
|
|
#include "rtc_base/strings/string_builder.h"
|
|
|
|
namespace webrtc {
|
|
|
|
RTCStats::RTCStats(const RTCStats& other)
|
|
: RTCStats(other.id_, other.timestamp_) {}
|
|
|
|
RTCStats::~RTCStats() {}
|
|
|
|
bool RTCStats::operator==(const RTCStats& other) const {
|
|
if (type() != other.type() || id() != other.id())
|
|
return false;
|
|
std::vector<Attribute> attributes = Attributes();
|
|
std::vector<Attribute> other_attributes = other.Attributes();
|
|
RTC_DCHECK_EQ(attributes.size(), other_attributes.size());
|
|
for (size_t i = 0; i < attributes.size(); ++i) {
|
|
if (attributes[i] != other_attributes[i]) {
|
|
return false;
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
bool RTCStats::operator!=(const RTCStats& other) const {
|
|
return !(*this == other);
|
|
}
|
|
|
|
std::string RTCStats::ToJson() const {
|
|
rtc::StringBuilder sb;
|
|
sb << "{\"type\":\"" << type()
|
|
<< "\","
|
|
"\"id\":\""
|
|
<< id_
|
|
<< "\","
|
|
"\"timestamp\":"
|
|
<< timestamp_.us();
|
|
for (const Attribute& attribute : Attributes()) {
|
|
if (attribute.has_value()) {
|
|
sb << ",\"" << attribute.name() << "\":";
|
|
if (attribute.holds_alternative<std::string>()) {
|
|
sb << "\"";
|
|
}
|
|
sb << attribute.ToString();
|
|
if (attribute.holds_alternative<std::string>()) {
|
|
sb << "\"";
|
|
}
|
|
}
|
|
}
|
|
sb << "}";
|
|
return sb.Release();
|
|
}
|
|
|
|
std::vector<Attribute> RTCStats::Attributes() const {
|
|
return AttributesImpl(0);
|
|
}
|
|
|
|
std::vector<Attribute> RTCStats::AttributesImpl(
|
|
size_t additional_capacity) const {
|
|
std::vector<Attribute> attributes;
|
|
attributes.reserve(additional_capacity);
|
|
return attributes;
|
|
}
|
|
|
|
} // namespace webrtc
|