Adding two new stats to StatsReport.
A follow up of r8415. This is to post the data to the StatsReport.
BUG=3867
TEST=chromium + netem + apprtc + chrome://webrtc-internals
R=tommi@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/38139004
Cr-Commit-Position: refs/heads/master@{#8423}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8423 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/talk/app/webrtc/statscollector.cc b/talk/app/webrtc/statscollector.cc
index a6a2e13..968fa8f 100644
--- a/talk/app/webrtc/statscollector.cc
+++ b/talk/app/webrtc/statscollector.cc
@@ -113,6 +113,10 @@
info.delay_estimate_ms);
report->AddValue(StatsReport::kStatsValueNameExpandRate,
rtc::ToString<float>(info.expand_rate));
+ report->AddValue(StatsReport::kStatsValueNameSpeechExpandRate,
+ rtc::ToString<float>(info.speech_expand_rate));
+ report->AddValue(StatsReport::kStatsValueNameSecondaryDecodedRate,
+ rtc::ToString<float>(info.secondary_decoded_rate));
report->AddValue(StatsReport::kStatsValueNamePacketsReceived,
info.packets_rcvd);
report->AddValue(StatsReport::kStatsValueNamePacketsLost,
diff --git a/talk/app/webrtc/statscollector_unittest.cc b/talk/app/webrtc/statscollector_unittest.cc
index 96975c2..8a1dc77 100644
--- a/talk/app/webrtc/statscollector_unittest.cc
+++ b/talk/app/webrtc/statscollector_unittest.cc
@@ -321,6 +321,12 @@
report, StatsReport::kStatsValueNameExpandRate, &value_in_report));
EXPECT_EQ(rtc::ToString<float>(info.expand_rate), value_in_report);
EXPECT_TRUE(GetValue(
+ report, StatsReport::kStatsValueNameSpeechExpandRate, &value_in_report));
+ EXPECT_EQ(rtc::ToString<float>(info.speech_expand_rate), value_in_report);
+ EXPECT_TRUE(GetValue(report, StatsReport::kStatsValueNameSecondaryDecodedRate,
+ &value_in_report));
+ EXPECT_EQ(rtc::ToString<float>(info.secondary_decoded_rate), value_in_report);
+ EXPECT_TRUE(GetValue(
report, StatsReport::kStatsValueNamePacketsReceived, &value_in_report));
EXPECT_EQ(rtc::ToString<int>(info.packets_rcvd), value_in_report);
EXPECT_TRUE(GetValue(
@@ -453,6 +459,8 @@
voice_receiver_info->delay_estimate_ms = 119;
voice_receiver_info->audio_level = 120;
voice_receiver_info->expand_rate = 121;
+ voice_receiver_info->speech_expand_rate = 122;
+ voice_receiver_info->secondary_decoded_rate = 123;
}
class StatsCollectorForTest : public webrtc::StatsCollector {
diff --git a/talk/app/webrtc/statstypes.cc b/talk/app/webrtc/statstypes.cc
index 31ae740..de12d5d 100644
--- a/talk/app/webrtc/statstypes.cc
+++ b/talk/app/webrtc/statstypes.cc
@@ -416,8 +416,12 @@
return "googRetransmitBitrate";
case kStatsValueNameRtt:
return "googRtt";
+ case kStatsValueNameSecondaryDecodedRate:
+ return "googSecondaryDecodedRate";
case kStatsValueNameSendPacketsDiscarded:
return "packetsDiscardedOnSend";
+ case kStatsValueNameSpeechExpandRate:
+ return "googSpeechExpandRate";
case kStatsValueNameTargetEncBitrate:
return "googTargetEncBitrate";
case kStatsValueNameTransmitBitrate:
diff --git a/talk/app/webrtc/statstypes.h b/talk/app/webrtc/statstypes.h
index a3abc2e..ece686a 100644
--- a/talk/app/webrtc/statstypes.h
+++ b/talk/app/webrtc/statstypes.h
@@ -208,7 +208,9 @@
kStatsValueNameRenderDelayMs,
kStatsValueNameRetransmitBitrate,
kStatsValueNameRtt,
+ kStatsValueNameSecondaryDecodedRate,
kStatsValueNameSendPacketsDiscarded,
+ kStatsValueNameSpeechExpandRate,
kStatsValueNameTargetDelayMs,
kStatsValueNameTargetEncBitrate,
kStatsValueNameTrackId,
