commit 5adc2b6969843057da037e0b1dfd2f04f48d79b8
author Fredrik Hernqvist <fhernqvist@google.com> Wed Jan 25 12:49:16 2023
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Jan 25 14:30:41 2023
tree 3846581d0102b44bfbbd4ac4f6255726f1a3a4ec
parent 0c1c9720d839522a225e50770402e4ccaff62e0d

Correct RTCAudioPlayoutStats type and add kind field.

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}

api/stats/rtcstats_objects.h

diff --git a/api/stats/rtcstats_objects.h b/api/stats/rtcstats_objects.h
index 484d2d0..e5de210 100644
--- a/api/stats/rtcstats_objects.h
+++ b/api/stats/rtcstats_objects.h
@@ -709,6 +709,7 @@
   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;

pc/rtc_stats_collector_unittest.cc

diff --git a/pc/rtc_stats_collector_unittest.cc b/pc/rtc_stats_collector_unittest.cc
index 70eabfc..2a03c3b 100644
--- a/pc/rtc_stats_collector_unittest.cc
+++ b/pc/rtc_stats_collector_unittest.cc
@@ -2765,6 +2765,7 @@
   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;

pc/rtc_stats_integrationtest.cc

diff --git a/pc/rtc_stats_integrationtest.cc b/pc/rtc_stats_integrationtest.cc
index 2a65726..b1d6b545 100644
--- a/pc/rtc_stats_integrationtest.cc
+++ b/pc/rtc_stats_integrationtest.cc
@@ -418,7 +418,7 @@
             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 @@
     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>(

stats/rtcstats_objects.cc

diff --git a/stats/rtcstats_objects.cc b/stats/rtcstats_objects.cc
index f392a08..b25e2dd 100644
--- a/stats/rtcstats_objects.cc
+++ b/stats/rtcstats_objects.cc
@@ -900,6 +900,7 @@
 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() {}
 
 // 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,