Returning correct duration estimate on Opus DTX packets.

webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc

 /*
  *  Copyright (c) 2012 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 987 matching lines @@
   NetEqOutputType type;
   EXPECT_EQ(NetEq::kOK,
             neteq_->GetAudio(kMaxOutputSize, output, &samples_per_channel,
                              &num_channels, &type));
   ASSERT_EQ(kMaxOutputSize, samples_per_channel);
   EXPECT_EQ(1, num_channels);
   EXPECT_EQ(kOutputNormal, type);
 
   EXPECT_CALL(mock_decoder, Die());
 }
-}  // namespace webrtc
+
+// This test checks the behavior of NetEq when audio decoder fails.
+TEST_F(NetEqImplTest, DecodingError) {
+  UseNoMocks();
+  CreateInstance();
+
+  const uint8_t kPayloadType = 17;   // Just an arbitrary number.
+  const uint32_t kReceiveTime = 17;  // Value doesn't matter for this test.
+  const int kSampleRateHz = 8000;
+
+  // We let decoder gives 5 ms each time, and therefore, 2 packets make 10 ms.

[hlundin-webrtc, 2015/09/17 14:21:29]

gives -> return

[minyue-webrtc, 2015/09/18 13:41:16]

Done.

+  const size_t kFrameLengthSamples =
+      static_cast<size_t>(5 * kSampleRateHz / 1000);
+
+  const size_t kPayloadLengthBytes = 1;  // This can be arbitrary.
+
+  uint8_t payload[kPayloadLengthBytes] = {0};
+
+  WebRtcRTPHeader rtp_header;
+  rtp_header.header.payloadType = kPayloadType;
+  rtp_header.header.sequenceNumber = 0x1234;
+  rtp_header.header.timestamp = 0x12345678;
+  rtp_header.header.ssrc = 0x87654321;
+
+  // Create a mock decoder object.
+  MockAudioDecoder mock_decoder;
+  EXPECT_CALL(mock_decoder, Reset()).WillRepeatedly(Return());
+  EXPECT_CALL(mock_decoder, Channels()).WillRepeatedly(Return(1));
+  EXPECT_CALL(mock_decoder, IncomingPacket(_, kPayloadLengthBytes, _, _, _))
+      .WillRepeatedly(Return(0));
+  EXPECT_CALL(mock_decoder, PacketDuration(_, _))
+      .WillRepeatedly(Return(kFrameLengthSamples));
+  EXPECT_CALL(mock_decoder, ErrorCode())
+      .WillOnce(Return(NetEq::kDecoderErrorCode));

[hlundin-webrtc, 2015/09/17 14:21:30]

This is the error code returned from the decoder, not from NetEq itself. Suggest
you create a local constant kDecoderError = something.

[minyue-webrtc, 2015/09/18 13:41:16]

Done.

+  EXPECT_CALL(mock_decoder, HasDecodePlc())
+      .WillOnce(Return(false));
+  int16_t dummy_output[kFrameLengthSamples] = {0};
+
+  {
+    InSequence sequence;  // Dummy variable.
+    // Mock decoder works normally the first time.
+    EXPECT_CALL(mock_decoder,
+                Decode(_, kPayloadLengthBytes, kSampleRateHz, _, _, _))
+        .Times(3)
+        .WillRepeatedly(
+            DoAll(SetArrayArgument<4>(dummy_output,
+                                      dummy_output + kFrameLengthSamples),
+                  SetArgPointee<5>(AudioDecoder::kSpeech),
+                  Return(kFrameLengthSamples)))
+        .RetiresOnSaturation();
+
+    // Then mock decoder fails. A common reason for failure can be buffer being
+    // too short
+    EXPECT_CALL(mock_decoder,
+                Decode(_, kPayloadLengthBytes, kSampleRateHz, _, _, _))
+        .WillOnce(Return(-1))
+        .RetiresOnSaturation();
+
+    // Mock decoder finally returns to normal.
+    EXPECT_CALL(mock_decoder,
+                Decode(_, kPayloadLengthBytes, kSampleRateHz, _, _, _))
+        .Times(2)
+        .WillRepeatedly(
+            DoAll(SetArrayArgument<4>(dummy_output,
+                                  dummy_output + kFrameLengthSamples),
+                  SetArgPointee<5>(AudioDecoder::kSpeech),
+                  Return(kFrameLengthSamples)));
+  }
+
+  EXPECT_EQ(NetEq::kOK,
+            neteq_->RegisterExternalDecoder(&mock_decoder, kDecoderPCM16B,
+                                            kPayloadType, kSampleRateHz));
+
+  // Insert packets.
+  for (int i = 0; i < 6; ++i) {
+    rtp_header.header.sequenceNumber += 1;
+    rtp_header.header.timestamp += kFrameLengthSamples;
+    EXPECT_EQ(NetEq::kOK,
+              neteq_->InsertPacket(rtp_header, payload, kPayloadLengthBytes,
+                                   kReceiveTime));
+  }
+
+  // Pull audio.
+  const size_t kMaxOutputSize = static_cast<size_t>(10 * kSampleRateHz / 1000);
+  int16_t output[kMaxOutputSize];
+  size_t samples_per_channel;
+  int num_channels;
+  NetEqOutputType type;
+  EXPECT_EQ(NetEq::kOK,
+            neteq_->GetAudio(kMaxOutputSize, output, &samples_per_channel,
+                             &num_channels, &type));
+  EXPECT_EQ(kMaxOutputSize, samples_per_channel);
+  EXPECT_EQ(1, num_channels);
+  EXPECT_EQ(kOutputNormal, type);
+
+  // Pull audio again. Decoder fails.
+  EXPECT_EQ(NetEq::kFail,
+            neteq_->GetAudio(kMaxOutputSize, output, &samples_per_channel,
+                             &num_channels, &type));
+  EXPECT_EQ(kMaxOutputSize, samples_per_channel);
+  EXPECT_EQ(1, num_channels);
+  // TODO(minyue): should NetEq better give kOutputPLC, since it is actually an
+  // expansion.
+  EXPECT_EQ(kOutputNormal, type);
+

[hlundin-webrtc, 2015/09/17 14:21:30]

Here you should first verify that neteq_->LastError() returns
NetEq::kDecoderErrorCode. Then, you should verify that
neteq_->LastDecoderError() return kDecoderError (the local constant suggested
above).

[minyue-webrtc, 2015/09/18 13:41:16]

Done.

+  // Pull audio again, should continue an expansion.
+  EXPECT_EQ(NetEq::kOK,
+            neteq_->GetAudio(kMaxOutputSize, output, &samples_per_channel,
+                             &num_channels, &type));
+  EXPECT_EQ(kMaxOutputSize, samples_per_channel);
+  EXPECT_EQ(1, num_channels);
+  EXPECT_EQ(kOutputPLC, type);
+
+  // Pull audio again, should behave normal.
+  EXPECT_EQ(NetEq::kOK,
+            neteq_->GetAudio(kMaxOutputSize, output, &samples_per_channel,
+                             &num_channels, &type));
+  EXPECT_EQ(kMaxOutputSize, samples_per_channel);
+  EXPECT_EQ(1, num_channels);
+  EXPECT_EQ(kOutputNormal, type);
+
+  EXPECT_CALL(mock_decoder, Die());
+}
+
+// This test checks the behavior of NetEq when audio decoder fails.

[hlundin-webrtc, 2015/09/17 14:21:30]

More specific: when it fails during internal CNG.

[minyue-webrtc, 2015/09/18 13:41:16]

Done.

+TEST_F(NetEqImplTest, DecodingErrorDuringInternalCng) {
+  UseNoMocks();
+  CreateInstance();
+
+  const uint8_t kPayloadType = 17;   // Just an arbitrary number.
+  const uint32_t kReceiveTime = 17;  // Value doesn't matter for this test.
+  const int kSampleRateHz = 8000;
+
+  // We let decoder gives 5 ms each time.
+  const size_t kFrameLengthSamples =
+      static_cast<size_t>(5 * kSampleRateHz / 1000);
+
+  const size_t kPayloadLengthBytes = 1;  // This can be arbitrary.
+
+  uint8_t payload[kPayloadLengthBytes] = {0};
+
+  WebRtcRTPHeader rtp_header;
+  rtp_header.header.payloadType = kPayloadType;
+  rtp_header.header.sequenceNumber = 0x1234;
+  rtp_header.header.timestamp = 0x12345678;
+  rtp_header.header.ssrc = 0x87654321;
+
+  // Create a mock decoder object.
+  MockAudioDecoder mock_decoder;
+  EXPECT_CALL(mock_decoder, Reset()).WillRepeatedly(Return());
+  EXPECT_CALL(mock_decoder, Channels()).WillRepeatedly(Return(1));
+  EXPECT_CALL(mock_decoder, IncomingPacket(_, kPayloadLengthBytes, _, _, _))
+      .WillRepeatedly(Return(0));
+  EXPECT_CALL(mock_decoder, PacketDuration(_, _))
+      .WillRepeatedly(Return(kFrameLengthSamples));
+  EXPECT_CALL(mock_decoder, ErrorCode())
+      .WillOnce(Return(NetEq::kDecoderErrorCode));
+  int16_t dummy_output[kFrameLengthSamples] = {0};
+
+  {
+    InSequence sequence;  // Dummy variable.
+    // Mock decoder works normally the first 2 times.
+    EXPECT_CALL(mock_decoder,
+                Decode(_, kPayloadLengthBytes, kSampleRateHz, _, _, _))
+        .Times(2)
+        .WillRepeatedly(
+            DoAll(SetArrayArgument<4>(dummy_output,
+                                      dummy_output + kFrameLengthSamples),
+                  SetArgPointee<5>(AudioDecoder::kComfortNoise),
+                  Return(kFrameLengthSamples)))
+        .RetiresOnSaturation();
+
+    // Then mock decoder fails. A common reason for failure can be buffer being
+    // too short
+    EXPECT_CALL(mock_decoder,
+                Decode(nullptr, 0, kSampleRateHz, _, _, _))
+        .WillOnce(Return(-1))
+        .RetiresOnSaturation();
+
+    // Mock decoder finally returns to normal.
+    EXPECT_CALL(mock_decoder,
+                Decode(nullptr, 0, kSampleRateHz, _, _, _))
+        .Times(2)
+        .WillRepeatedly(
+            DoAll(SetArrayArgument<4>(dummy_output,
+                                  dummy_output + kFrameLengthSamples),
+                  SetArgPointee<5>(AudioDecoder::kComfortNoise),
+                  Return(kFrameLengthSamples)));
+  }
+
+  EXPECT_EQ(NetEq::kOK,
+            neteq_->RegisterExternalDecoder(&mock_decoder, kDecoderPCM16B,
+                                            kPayloadType, kSampleRateHz));
+
+  // Insert 2 packets. This will make netEq into codec internal CNG mode.
+  for (int i = 0; i < 2; ++i) {
+    rtp_header.header.sequenceNumber += 1;
+    rtp_header.header.timestamp += kFrameLengthSamples;
+    EXPECT_EQ(NetEq::kOK,
+              neteq_->InsertPacket(rtp_header, payload, kPayloadLengthBytes,
+                                   kReceiveTime));
+  }
+
+  // Pull audio.
+  const size_t kMaxOutputSize = static_cast<size_t>(10 * kSampleRateHz / 1000);
+  int16_t output[kMaxOutputSize];
+  size_t samples_per_channel;
+  int num_channels;
+  NetEqOutputType type;
+  EXPECT_EQ(NetEq::kOK,
+            neteq_->GetAudio(kMaxOutputSize, output, &samples_per_channel,
+                             &num_channels, &type));
+  EXPECT_EQ(kMaxOutputSize, samples_per_channel);
+  EXPECT_EQ(1, num_channels);
+  EXPECT_EQ(kOutputCNG, type);
+
+  // Pull audio again. Decoder fails.
+  EXPECT_EQ(NetEq::kFail,
+            neteq_->GetAudio(kMaxOutputSize, output, &samples_per_channel,
+                             &num_channels, &type));
+  EXPECT_EQ(kMaxOutputSize, samples_per_channel);
+  EXPECT_EQ(1, num_channels);
+  // TODO(minyue): should NetEq better give kOutputPLC, since it is actually an
+  // expansion.
+  EXPECT_EQ(kOutputCNG, type);
+

[hlundin-webrtc, 2015/09/17 14:21:30]

Again, verify output error codes.

[minyue-webrtc, 2015/09/18 13:41:16]

Done.

+  // Pull audio again, should behave normal.
+  EXPECT_EQ(NetEq::kOK,
+            neteq_->GetAudio(kMaxOutputSize, output, &samples_per_channel,
+                             &num_channels, &type));
+  EXPECT_EQ(kMaxOutputSize, samples_per_channel);
+  EXPECT_EQ(1, num_channels);
+  EXPECT_EQ(kOutputCNG, type);
+
+  EXPECT_CALL(mock_decoder, Die());
+}
+
+}// namespace webrtc