commit 3bdc5e9a5fe42d4e0bc2f3ad4824e1d40fc9f903
author Niels Möller <nisse@webrtc.org> Tue Mar 10 08:28:33 2020
committer Commit Bot <commit-bot@chromium.org> Tue Mar 10 09:53:46 2020
tree fa30cc883ca9517da4db3b4c0a67874a355d96fe
parent a2cb93d8b9659292f7ec73db53421d481f84c22c

Delete ACMVADCallback

This callback is enabled via the method
AudioCodingModule::RegisterVADCallback, which is unused, and deleted
in this cl.

Bug: None
Change-Id: I04c8690fbb673305e69fe5b1c32d88efd6c72d1b
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/148420
Reviewed-by: Minyue Li <minyue@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30735}

modules/audio_coding/test/TestVADDTX.cc

diff --git a/modules/audio_coding/test/TestVADDTX.cc b/modules/audio_coding/test/TestVADDTX.cc
index 52b7fc3..c493e64 100644
--- a/modules/audio_coding/test/TestVADDTX.cc
+++ b/modules/audio_coding/test/TestVADDTX.cc
@@ -29,16 +29,25 @@
 
 namespace webrtc {
 
-ActivityMonitor::ActivityMonitor() {
+MonitoringAudioPacketizationCallback::MonitoringAudioPacketizationCallback(
+    AudioPacketizationCallback* next)
+    : next_(next) {
   ResetStatistics();
 }
 
-int32_t ActivityMonitor::InFrameType(AudioFrameType frame_type) {
+int32_t MonitoringAudioPacketizationCallback::SendData(
+    AudioFrameType frame_type,
+    uint8_t payload_type,
+    uint32_t timestamp,
+    const uint8_t* payload_data,
+    size_t payload_len_bytes,
+    int64_t absolute_capture_timestamp_ms) {
   counter_[static_cast<int>(frame_type)]++;
-  return 0;
+  return next_->SendData(frame_type, payload_type, timestamp, payload_data,
+                         payload_len_bytes, absolute_capture_timestamp_ms);
 }
 
-void ActivityMonitor::PrintStatistics() {
+void MonitoringAudioPacketizationCallback::PrintStatistics() {
   printf("\n");
   printf("kEmptyFrame       %u\n",
          counter_[static_cast<int>(AudioFrameType::kEmptyFrame)]);
@@ -49,11 +58,11 @@
   printf("\n\n");
 }
 
-void ActivityMonitor::ResetStatistics() {
+void MonitoringAudioPacketizationCallback::ResetStatistics() {
   memset(counter_, 0, sizeof(counter_));
 }
 
-void ActivityMonitor::GetStatistics(uint32_t* counter) {
+void MonitoringAudioPacketizationCallback::GetStatistics(uint32_t* counter) {
   memcpy(counter, counter_, sizeof(counter_));
 }
 
@@ -68,11 +77,13 @@
           AudioCodingModule::Config(decoder_factory_))),
       acm_receive_(AudioCodingModule::Create(
           AudioCodingModule::Config(decoder_factory_))),
-      channel_(new Channel),
-      monitor_(new ActivityMonitor) {
-  EXPECT_EQ(0, acm_send_->RegisterTransportCallback(channel_.get()));
+      channel_(std::make_unique<Channel>()),
+      packetization_callback_(
+          std::make_unique<MonitoringAudioPacketizationCallback>(
+              channel_.get())) {
+  EXPECT_EQ(
+      0, acm_send_->RegisterTransportCallback(packetization_callback_.get()));
   channel_->RegisterReceiverACM(acm_receive_.get());
-  EXPECT_EQ(0, acm_send_->RegisterVADCallback(monitor_.get()));
 }
 
 bool TestVadDtx::RegisterCodec(const SdpAudioFormat& codec_format,
@@ -109,7 +120,7 @@
                      std::string out_filename,
                      bool append,
                      const int* expects) {
-  monitor_->ResetStatistics();
+  packetization_callback_->ResetStatistics();
 
   PCMFile in_file;
   in_file.Open(in_filename, frequency, "rb");
@@ -144,12 +155,12 @@
   out_file.Close();
 
 #ifdef PRINT_STAT
-  monitor_->PrintStatistics();
+  packetization_callback_->PrintStatistics();
 #endif
 
   uint32_t stats[3];
-  monitor_->GetStatistics(stats);
-  monitor_->ResetStatistics();
+  packetization_callback_->GetStatistics(stats);
+  packetization_callback_->ResetStatistics();
 
   for (const auto& st : stats) {
     int i = &st - stats;  // Calculate the current position in stats.