Rename discarded_primary_packets to packets_discarded.
This it what it is called in the spec:
https://w3c.github.io/webrtc-stats/#dom-rtcreceivedrtpstreamstats-packetsdiscarded
Also log the metric in neteq_rtpplay.
Bug: webrtc:8199
Change-Id: Ie0262d17b913eb6949daa703844d90327eee0aa4
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/263725
Reviewed-by: Minyue Li <minyue@webrtc.org>
Commit-Queue: Jakob Ivarsson <jakobi@webrtc.org>
Reviewed-by: Jakob Ivarsson <jakobi@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#37063}
diff --git a/modules/audio_coding/acm2/acm_receiver.cc b/modules/audio_coding/acm2/acm_receiver.cc
index aa98169..f70b37c 100644
--- a/modules/audio_coding/acm2/acm_receiver.cc
+++ b/modules/audio_coding/acm2/acm_receiver.cc
@@ -302,13 +302,12 @@
neteq_lifetime_stat.removed_samples_for_acceleration;
acm_stat->fecPacketsReceived = neteq_lifetime_stat.fec_packets_received;
acm_stat->fecPacketsDiscarded = neteq_lifetime_stat.fec_packets_discarded;
+ acm_stat->packetsDiscarded = neteq_lifetime_stat.packets_discarded;
NetEqOperationsAndState neteq_operations_and_state =
neteq_->GetOperationsAndState();
acm_stat->packetBufferFlushes =
neteq_operations_and_state.packet_buffer_flushes;
- acm_stat->packetsDiscarded =
- neteq_operations_and_state.discarded_primary_packets;
}
int AcmReceiver::EnableNack(size_t max_nack_list_size) {
diff --git a/modules/audio_coding/neteq/neteq_impl_unittest.cc b/modules/audio_coding/neteq/neteq_impl_unittest.cc
index 6e1be42..ce2be65 100644
--- a/modules/audio_coding/neteq/neteq_impl_unittest.cc
+++ b/modules/audio_coding/neteq/neteq_impl_unittest.cc
@@ -651,8 +651,8 @@
// out-of-order packet should have been discarded.
EXPECT_TRUE(packet_buffer_->Empty());
- // NetEq `discarded_primary_packets` should capture this packet discard.
- EXPECT_EQ(1u, neteq_->GetOperationsAndState().discarded_primary_packets);
+ // NetEq `packets_discarded` should capture this packet discard.
+ EXPECT_EQ(1u, neteq_->GetLifetimeStatistics().packets_discarded);
// Verify `output.packet_infos_`. Expect to only see the second packet.
ASSERT_THAT(output.packet_infos_, SizeIs(1));
diff --git a/modules/audio_coding/neteq/statistics_calculator.cc b/modules/audio_coding/neteq/statistics_calculator.cc
index a0739a9..cd5d971 100644
--- a/modules/audio_coding/neteq/statistics_calculator.cc
+++ b/modules/audio_coding/neteq/statistics_calculator.cc
@@ -235,7 +235,7 @@
}
void StatisticsCalculator::PacketsDiscarded(size_t num_packets) {
- operations_and_state_.discarded_primary_packets += num_packets;
+ lifetime_stats_.packets_discarded += num_packets;
}
void StatisticsCalculator::SecondaryPacketsDiscarded(size_t num_packets) {
diff --git a/modules/audio_coding/neteq/statistics_calculator_unittest.cc b/modules/audio_coding/neteq/statistics_calculator_unittest.cc
index a15cac4..491cd83 100644
--- a/modules/audio_coding/neteq/statistics_calculator_unittest.cc
+++ b/modules/audio_coding/neteq/statistics_calculator_unittest.cc
@@ -179,37 +179,28 @@
EXPECT_EQ(1, lts.interruption_count);
}
-// Test that |discarded_primary_packets| as reported from
-// |GetOperationsAndState| always matches the arguments to |PacketsDiscarded|
-// accumulated.
TEST(StatisticsCalculator, DiscardedPackets) {
StatisticsCalculator statistics_calculator;
- EXPECT_EQ(
- 0u,
- statistics_calculator.GetOperationsAndState().discarded_primary_packets);
+ EXPECT_EQ(0u,
+ statistics_calculator.GetLifetimeStatistics().packets_discarded);
statistics_calculator.PacketsDiscarded(1);
- EXPECT_EQ(
- 1u,
- statistics_calculator.GetOperationsAndState().discarded_primary_packets);
+ EXPECT_EQ(1u,
+ statistics_calculator.GetLifetimeStatistics().packets_discarded);
statistics_calculator.PacketsDiscarded(10);
- EXPECT_EQ(
- 11u,
- statistics_calculator.GetOperationsAndState().discarded_primary_packets);
+ EXPECT_EQ(11u,
+ statistics_calculator.GetLifetimeStatistics().packets_discarded);
- // Calling |SecondaryPacketsDiscarded| does not modify
- // |discarded_primary_packets|.
+ // Calling `SecondaryPacketsDiscarded` does not modify `packets_discarded`.
statistics_calculator.SecondaryPacketsDiscarded(1);
- EXPECT_EQ(
- 11u,
- statistics_calculator.GetOperationsAndState().discarded_primary_packets);
+ EXPECT_EQ(11u,
+ statistics_calculator.GetLifetimeStatistics().packets_discarded);
- // Calling |FlushedPacketBuffer| does not modify |discarded_primary_packets|.
+ // Calling `FlushedPacketBuffer` does not modify `packets_discarded`.
statistics_calculator.FlushedPacketBuffer();
- EXPECT_EQ(
- 11u,
- statistics_calculator.GetOperationsAndState().discarded_primary_packets);
+ EXPECT_EQ(11u,
+ statistics_calculator.GetLifetimeStatistics().packets_discarded);
}
} // namespace webrtc
diff --git a/modules/audio_coding/neteq/tools/neteq_stats_plotter.cc b/modules/audio_coding/neteq/tools/neteq_stats_plotter.cc
index db901c6..f4f2c0a 100644
--- a/modules/audio_coding/neteq/tools/neteq_stats_plotter.cc
+++ b/modules/audio_coding/neteq/tools/neteq_stats_plotter.cc
@@ -100,6 +100,8 @@
lifetime_stats.inserted_samples_for_deceleration);
printf(" generated_noise_samples: %" PRIu64 "\n",
lifetime_stats.generated_noise_samples);
+ printf(" packets_discarded: %" PRIu64 "\n",
+ lifetime_stats.packets_discarded);
}
}
diff --git a/modules/audio_coding/neteq/tools/neteq_test.cc b/modules/audio_coding/neteq/tools/neteq_test.cc
index 7902438..19b1df1 100644
--- a/modules/audio_coding/neteq/tools/neteq_test.cc
+++ b/modules/audio_coding/neteq/tools/neteq_test.cc
@@ -248,11 +248,11 @@
<< ", voice concealed: " << voice_concealed
<< ", buffer size: " << std::setw(4)
<< current_state_.current_delay_ms << std::endl;
- if (operations_state.discarded_primary_packets >
- prev_ops_state_.discarded_primary_packets) {
+ if (lifetime_stats.packets_discarded >
+ prev_lifetime_stats_.packets_discarded) {
*text_log_ << "Discarded "
- << (operations_state.discarded_primary_packets -
- prev_ops_state_.discarded_primary_packets)
+ << (lifetime_stats.packets_discarded -
+ prev_lifetime_stats_.packets_discarded)
<< " primary packets." << std::endl;
}
if (operations_state.packet_buffer_flushes >