Moved Opus-specific payload splitting into AudioDecoderOpus.

webrtc/modules/audio_coding/neteq/neteq_network_stats_unittest.cc

 /*
  *  Copyright (c) 2015 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 21 matching lines @@
 
   MockAudioDecoder(int sample_rate_hz, size_t num_channels)
       : sample_rate_hz_(sample_rate_hz),
         num_channels_(num_channels),
         fec_enabled_(false) {}
   ~MockAudioDecoder() /* override */ { Die(); }
   MOCK_METHOD0(Die, void());
 
   MOCK_METHOD0(Reset, void());
 
-  int PacketDuration(const uint8_t* encoded,
-                     size_t encoded_len) const /* override */ {
-    return kPacketDuration;
+  class MockFrame : public AudioDecoder::EncodedAudioFrame {
+   public:
+    MockFrame(size_t num_channels) : num_channels_(num_channels) {}
+
+    size_t Duration() const /* override */ { return kPacketDuration; }

[kwiberg-webrtc, 2016/09/19 11:07:49]

Do you need to comment out the overrides when you're not using MOCK_METHOD in
this class?

[ossu, 2016/09/19 11:41:01]

No, I don't think I should have to. Wonder why they're like that.

[kwiberg-webrtc, 2016/09/19 11:55:16]

Because MOCK_METHOD0 et al. expand to method declarations without the "override"
keyword, and we compile with -Werror and -Winconsistent-missing-override.

[ossu, 2016/09/19 14:07:34]

Oh, right, now I see. I forgot why I left them in. The answer is: I don't know
but let's find out!. I'll put the overrides in and we'll see if any bots explode
on it.

+
+    rtc::Optional<DecodeResult> Decode(rtc::ArrayView<int16_t> decoded) const
+    /* override */ {
+      memset(decoded.data(), 0,

[hlundin-webrtc, 2016/09/15 09:33:30]

ASSERT_GE(decoded.size(), sizeof(int16_t) * kPacketDuration * num_channels_);

[ossu, 2016/09/15 12:22:53]

Acknowledged.

+             sizeof(int16_t) * kPacketDuration * num_channels_);
+      return rtc::Optional<DecodeResult>(
+          {kPacketDuration * num_channels_, kSpeech});
+    }
+
+   private:
+    size_t num_channels_;

[hlundin-webrtc, 2016/09/15 09:33:30]

const

[ossu, 2016/09/15 12:22:53]

Acknowledged.

+  };
+
+  std::vector<ParseResult> ParsePayload(rtc::Buffer* payload,
+                                        uint32_t timestamp) /* override */ {
+    std::vector<ParseResult> results;
+    if (fec_enabled_) {
+      std::unique_ptr<MockFrame> fec_frame(new MockFrame(num_channels_));
+      results.emplace_back(timestamp - kPacketDuration, 1,
+                           std::move(fec_frame));
+    }
+
+    std::unique_ptr<MockFrame> frame(new MockFrame(num_channels_));
+    results.emplace_back(timestamp, 0, std::move(frame));
+    return results;
   }
 
-  int PacketDurationRedundant(const uint8_t* encoded,
-                              size_t encoded_len) const /* override */ {
+  int PacketDuration(const uint8_t* encoded, size_t encoded_len) const
+  /* override */ {
+    // Since going through ParsePayload, PacketDuration should never get called.
+    RTC_DCHECK(false);
     return kPacketDuration;
   }
 
   bool PacketHasFec(
       const uint8_t* encoded, size_t encoded_len) const /* override */ {
+    // Since going through ParsePayload, PacketHasFec should never get called.
+    RTC_DCHECK(false);

[hlundin-webrtc, 2016/09/15 09:33:30]

FAIL();

[ossu, 2016/09/15 12:22:53]

Acknowledged.

     return fec_enabled_;
   }
 
   int SampleRateHz() const /* override */ { return sample_rate_hz_; }
 
   size_t Channels() const /* override */ { return num_channels_; }
 
   void set_fec_enabled(bool enable_fec) { fec_enabled_ = enable_fec; }
 
   bool fec_enabled() const { return fec_enabled_; }
 
  protected:
   // Override the following methods such that no actual payload is needed.
   int DecodeInternal(const uint8_t* encoded,
                      size_t encoded_len,
                      int /*sample_rate_hz*/,
                      int16_t* decoded,
                      SpeechType* speech_type) /* override */ {
-    *speech_type = kSpeech;
-    memset(decoded, 0, sizeof(int16_t) * kPacketDuration * Channels());
-    return kPacketDuration * Channels();
-  }
-
-  int DecodeRedundantInternal(const uint8_t* encoded,
-                              size_t encoded_len,
-                              int sample_rate_hz,
-                              int16_t* decoded,
-                              SpeechType* speech_type) /* override */ {
-    return DecodeInternal(encoded, encoded_len, sample_rate_hz, decoded,
-                          speech_type);
+    // Since going through ParsePayload, DecodeInternal should never get called.
+    RTC_DCHECK(false);

[hlundin-webrtc, 2016/09/15 09:33:30]

FAIL();

[ossu, 2016/09/15 12:22:53]

Acknowledged.

   }
 
  private:
   const int sample_rate_hz_;
   const size_t num_channels_;
   bool fec_enabled_;
 };
 
 class NetEqNetworkStatsTest : public NetEqExternalDecoderTest {
  public:
@@ skipping 203 matching lines @@
 
 TEST(NetEqNetworkStatsTest, NoiseExpansionTest) {
   MockAudioDecoder decoder(48000, 1);
   NetEqNetworkStatsTest test(NetEqDecoder::kDecoderOpus, 48000, &decoder);
   test.NoiseExpansionTest();
   EXPECT_CALL(decoder, Die()).Times(1);
 }
 
 }  // namespace test
 }  // namespace webrtc