admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correct RTCAudioPlayoutStats type and add kind field.

Browse Source 
Bug: webrtc:14653
Change-Id: Idb85ce440620fc5b818a3b23a63ac062a443cc81
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/291330
Commit-Queue: Fredrik Hernqvist <fhernqvist@google.com>
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#39196}
This commit is contained in:
Fredrik Hernqvist 2023-01-25 13:49:16 +01:00 committed by WebRTC LUCI CQ
parent 0c1c9720d8
commit 5adc2b6969
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/stats/rtcstats_objects.h
View File

@ -709,6 +709,7 @@ class RTC_EXPORT RTCAudioPlayoutStats final : public RTCStats {
RTCAudioPlayoutStats(const RTCAudioPlayoutStats& other);
~RTCAudioPlayoutStats() override;
RTCStatsMember<std::string> kind;
RTCStatsMember<double> synthesized_samples_duration;
RTCStatsMember<uint64_t> synthesized_samples_events;
RTCStatsMember<double> total_samples_duration;

1
pc/rtc_stats_collector_unittest.cc
View File

@ -2765,6 +2765,7 @@ TEST_F(RTCStatsCollectorTest, CollectRTCAudioPlayoutStats) {
ASSERT_EQ(1U, stats_of_track_type.size());
RTCAudioPlayoutStats expected_stats("AP", report->timestamp());
expected_stats.kind = "audio";
expected_stats.synthesized_samples_duration = 1;
expected_stats.synthesized_samples_events = 2;
expected_stats.total_samples_count = 3;

8
pc/rtc_stats_integrationtest.cc
View File

@ -418,7 +418,7 @@ class RTCStatsReportVerifier {
VerifyRTCTransportStats(stats.cast_to<RTCTransportStats>());
} else if (stats.type() == RTCAudioPlayoutStats::kType) {
verify_successful &=
VerifyRTCAudioPlayoutSTats(stats.cast_to<RTCAudioPlayoutStats>());
VerifyRTCAudioPlayoutStats(stats.cast_to<RTCAudioPlayoutStats>());
} else {
EXPECT_TRUE(false) << "Unrecognized stats type: " << stats.type();
verify_successful = false;
@ -1128,8 +1128,12 @@ class RTCStatsReportVerifier {
return verifier.ExpectAllMembersSuccessfullyTested();
}
bool VerifyRTCAudioPlayoutSTats(const RTCAudioPlayoutStats& audio_playout) {
bool VerifyRTCAudioPlayoutStats(const RTCAudioPlayoutStats& audio_playout) {
RTCStatsVerifier verifier(report_.get(), &audio_playout);
verifier.TestMemberIsDefined(audio_playout.kind);
if (audio_playout.kind.is_defined()) {
EXPECT_EQ(*audio_playout.kind, "audio");
}
verifier.TestMemberIsNonNegative<uint64_t>(
audio_playout.synthesized_samples_events);
verifier.TestMemberIsNonNegative<double>(

4
stats/rtcstats_objects.cc
View File

@ -900,6 +900,7 @@ RTCTransportStats::~RTCTransportStats() {}
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"),
@ -912,7 +913,8 @@ RTCAudioPlayoutStats::RTCAudioPlayoutStats(const RTCAudioPlayoutStats& other) =
RTCAudioPlayoutStats::~RTCAudioPlayoutStats() {}
// clang-format off
WEBRTC_RTCSTATS_IMPL(RTCAudioPlayoutStats, RTCStats, "audio-playout",
WEBRTC_RTCSTATS_IMPL(RTCAudioPlayoutStats, RTCStats, "media-playout",
&kind,
&synthesized_samples_duration,
&synthesized_samples_events,
&total_samples_duration,