Remove the type parameter to NetEq::GetAudio

webrtc/modules/audio_coding/neteq/neteq_impl.h

Index: webrtc/modules/audio_coding/neteq/neteq_impl.h
diff --git a/webrtc/modules/audio_coding/neteq/neteq_impl.h b/webrtc/modules/audio_coding/neteq/neteq_impl.h
index 12cb6f45aeb6bc5093777765b368aedf4183ff41..3f9ad46effd6ddd322a9743200fe12f1f20e76c9 100644
--- a/webrtc/modules/audio_coding/neteq/neteq_impl.h
+++ b/webrtc/modules/audio_coding/neteq/neteq_impl.h
@@ -57,6 +57,14 @@ struct PreemptiveExpandFactory;
 
 class NetEqImpl : public webrtc::NetEq {
  public:
+  enum OutputType {
+    kOutputNormal,

[ivoc, 2016/03/07 16:26:22]

Do you think it would make sense to change these to match the naming that is
used in the AudioFrame enum (or change the naming in AudioFrame to match this)?

[hlundin-webrtc, 2016/03/08 08:05:33]

Done, as far as possible, since this enum does not have a 1:1 mapping to
AudioFrame::SpeechType.

I also made it an enum class now, to avoid mismatches now that the names are the
same across two enums.

+    kOutputPLC,
+    kOutputCNG,
+    kOutputPLCtoCNG,
+    kOutputVADPassive
+  };
+
   // Creates a new NetEqImpl object. The object will assume ownership of all
   // injected dependencies, and will delete them when done.
   NetEqImpl(const NetEq::Config& config,
@@ -96,7 +104,7 @@ class NetEqImpl : public webrtc::NetEq {
   int InsertSyncPacket(const WebRtcRTPHeader& rtp_header,
                        uint32_t receive_timestamp) override;
 
-  int GetAudio(AudioFrame* audio_frame, NetEqOutputType* type) override;
+  int GetAudio(AudioFrame* audio_frame) override;
 
   int RegisterPayloadType(NetEqDecoder codec,
                           const std::string& codec_name,
@@ -310,7 +318,7 @@ class NetEqImpl : public webrtc::NetEq {
 
   // Returns the output type for the audio produced by the latest call to
   // GetAudio().
-  NetEqOutputType LastOutputType() EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);
+  OutputType LastOutputType() EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);
 
   // Updates Expand and Merge.
   virtual void UpdatePlcComponents(int fs_hz, size_t channels)