Add muted_output parameter to ACM

webrtc/modules/audio_coding/acm2/acm_receiver_unittest_oldapi.cc

 /*
  *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 267 matching lines @@
                                           RentACodec::CodecId::kISACSWB};
   AddSetOfCodecs(kCodecId);
 
   AudioFrame frame;
   const int kOutSampleRateHz = 8000;  // Different than codec sample rate.
   for (const auto codec_id : kCodecId) {
     const CodecIdInst codec(codec_id);
     const int num_10ms_frames = codec.inst.pacsize / (codec.inst.plfreq / 100);
     InsertOnePacketOfSilence(codec.id);
     for (int k = 0; k < num_10ms_frames; ++k) {
-      EXPECT_EQ(0, receiver_->GetAudio(kOutSampleRateHz, &frame));
+      bool muted;
+      EXPECT_EQ(0, receiver_->GetAudio(kOutSampleRateHz, &frame, &muted));
     }
     EXPECT_EQ(codec.inst.plfreq, receiver_->last_output_sample_rate_hz());
   }
 }
 
 class AcmReceiverTestFaxModeOldApi : public AcmReceiverTestOldApi {
  protected:
   AcmReceiverTestFaxModeOldApi() {
     config_.neteq_config.playout_mode = kPlayoutFax;
   }
@@ skipping 20 matching lines @@
         output_sample_rate_hz > 16000 ? AudioFrame::kVadActive
                                       : AudioFrame::kVadPassive;
 
     // Expect the first output timestamp to be 5*fs/8000 samples before the
     // first inserted timestamp (because of NetEq's look-ahead). (This value is
     // defined in Expand::overlap_length_.)
     uint32_t expected_output_ts = last_packet_send_timestamp_ -
         rtc::CheckedDivExact(5 * output_sample_rate_hz, 8000);
 
     AudioFrame frame;
-    EXPECT_EQ(0, receiver_->GetAudio(output_sample_rate_hz, &frame));
+    bool muted;
+    EXPECT_EQ(0, receiver_->GetAudio(output_sample_rate_hz, &frame, &muted));
     // Expect timestamp = 0 before first packet is inserted.
     EXPECT_EQ(0u, frame.timestamp_);
     for (int i = 0; i < 5; ++i) {
       InsertOnePacketOfSilence(codec.id);
       for (int k = 0; k < num_10ms_frames; ++k) {
-        EXPECT_EQ(0, receiver_->GetAudio(output_sample_rate_hz, &frame));
+        EXPECT_EQ(0,
+                  receiver_->GetAudio(output_sample_rate_hz, &frame, &muted));
         EXPECT_EQ(expected_output_ts, frame.timestamp_);
         expected_output_ts += 10 * samples_per_ms;
         EXPECT_EQ(10 * samples_per_ms, frame.samples_per_channel_);
         EXPECT_EQ(output_sample_rate_hz, frame.sample_rate_hz_);
         EXPECT_EQ(output_channels, frame.num_channels_);
         EXPECT_EQ(AudioFrame::kNormalSpeech, frame.speech_type_);
         EXPECT_EQ(expected_vad_activity, frame.vad_activity_);
+        EXPECT_FALSE(muted);
       }
     }
   }
 };
 
 #if defined(WEBRTC_ANDROID)
 #define MAYBE_VerifyAudioFramePCMU DISABLED_VerifyAudioFramePCMU
 #else
 #define MAYBE_VerifyAudioFramePCMU VerifyAudioFramePCMU
 #endif
@@ skipping 28 matching lines @@
   EXPECT_TRUE(config_.neteq_config.enable_post_decode_vad);
   const CodecIdInst codec(RentACodec::CodecId::kPCM16Bwb);
   ASSERT_EQ(
       0, receiver_->AddCodec(codec.id, codec.inst.pltype, codec.inst.channels,
                              codec.inst.plfreq, nullptr, ""));
   const int kNumPackets = 5;
   const int num_10ms_frames = codec.inst.pacsize / (codec.inst.plfreq / 100);
   AudioFrame frame;
   for (int n = 0; n < kNumPackets; ++n) {
     InsertOnePacketOfSilence(codec.id);
-    for (int k = 0; k < num_10ms_frames; ++k)
-      ASSERT_EQ(0, receiver_->GetAudio(codec.inst.plfreq, &frame));
+    for (int k = 0; k < num_10ms_frames; ++k) {
+      bool muted;
+      ASSERT_EQ(0, receiver_->GetAudio(codec.inst.plfreq, &frame, &muted));
+    }
   }
   EXPECT_EQ(AudioFrame::kVadPassive, frame.vad_activity_);
 }
 
 class AcmReceiverTestPostDecodeVadPassiveOldApi : public AcmReceiverTestOldApi {
  protected:
   AcmReceiverTestPostDecodeVadPassiveOldApi() {
     config_.neteq_config.enable_post_decode_vad = false;
   }
 };
 
 #if defined(WEBRTC_ANDROID)
 #define MAYBE_PostdecodingVad DISABLED_PostdecodingVad
 #else
 #define MAYBE_PostdecodingVad PostdecodingVad
 #endif
 TEST_F(AcmReceiverTestPostDecodeVadPassiveOldApi, MAYBE_PostdecodingVad) {
   EXPECT_FALSE(config_.neteq_config.enable_post_decode_vad);
   const CodecIdInst codec(RentACodec::CodecId::kPCM16Bwb);
   ASSERT_EQ(
       0, receiver_->AddCodec(codec.id, codec.inst.pltype, codec.inst.channels,
                              codec.inst.plfreq, nullptr, ""));
   const int kNumPackets = 5;
   const int num_10ms_frames = codec.inst.pacsize / (codec.inst.plfreq / 100);
   AudioFrame frame;
   for (int n = 0; n < kNumPackets; ++n) {
     InsertOnePacketOfSilence(codec.id);
-    for (int k = 0; k < num_10ms_frames; ++k)
-      ASSERT_EQ(0, receiver_->GetAudio(codec.inst.plfreq, &frame));
+    for (int k = 0; k < num_10ms_frames; ++k) {
+      bool muted;
+      ASSERT_EQ(0, receiver_->GetAudio(codec.inst.plfreq, &frame, &muted));
+    }
   }
   EXPECT_EQ(AudioFrame::kVadUnknown, frame.vad_activity_);
 }
 
 #if defined(WEBRTC_ANDROID)
 #define MAYBE_LastAudioCodec DISABLED_LastAudioCodec
 #else
 #define MAYBE_LastAudioCodec LastAudioCodec
 #endif
 #if defined(WEBRTC_CODEC_ISAC)
@@ skipping 58 matching lines @@
               receiver_->last_packet_sample_rate_hz());
     EXPECT_EQ(0, receiver_->LastAudioCodec(&codec));
     EXPECT_TRUE(CodecsEqual(c.inst, codec));
   }
 }
 #endif
 
 }  // namespace acm2
 
 }  // namespace webrtc