Fold AudioEncoderMutable into AudioEncoder

webrtc/modules/audio_coding/codecs/ilbc/interface/audio_encoder_ilbc.h

Index: webrtc/modules/audio_coding/codecs/ilbc/interface/audio_encoder_ilbc.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/interface/audio_encoder_ilbc.h b/webrtc/modules/audio_coding/codecs/ilbc/interface/audio_encoder_ilbc.h
index c3cf4d8a1edb543e6ffaad920fbe6671e8240cc5..1f36a82cf4d4a5e35d25ae34492e28f6d904dbe7 100644
--- a/webrtc/modules/audio_coding/codecs/ilbc/interface/audio_encoder_ilbc.h
+++ b/webrtc/modules/audio_coding/codecs/ilbc/interface/audio_encoder_ilbc.h
@@ -13,29 +13,30 @@
 
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/modules/audio_coding/codecs/audio_encoder.h"
-#include "webrtc/modules/audio_coding/codecs/audio_encoder_mutable_impl.h"
 #include "webrtc/modules/audio_coding/codecs/ilbc/interface/ilbc.h"
 
 namespace webrtc {
 
+struct CodecInst;
+
 class AudioEncoderIlbc final : public AudioEncoder {
  public:
   struct Config {
-    Config() : payload_type(102), frame_size_ms(30) {}
     bool IsOk() const;
 
-    int payload_type;
-    int frame_size_ms;  // Valid values are 20, 30, 40, and 60 ms.
+    int payload_type = 102;
+    int frame_size_ms = 30;  // Valid values are 20, 30, 40, and 60 ms.
     // Note that frame size 40 ms produces encodings with two 20 ms frames in
     // them, and frame size 60 ms consists of two 30 ms frames.
   };
 
   explicit AudioEncoderIlbc(const Config& config);
+  explicit AudioEncoderIlbc(const CodecInst& codec_inst);
   ~AudioEncoderIlbc() override;
 
+  size_t MaxEncodedBytes() const override;
   int SampleRateHz() const override;
   int NumChannels() const override;
-  size_t MaxEncodedBytes() const override;
   size_t Num10MsFramesInNextPacket() const override;
   size_t Max10MsFramesInAPacket() const override;
   int GetTargetBitrate() const override;
@@ -43,26 +44,19 @@ class AudioEncoderIlbc final : public AudioEncoder {
                              const int16_t* audio,
                              size_t max_encoded_bytes,
                              uint8_t* encoded) override;
+  void Reset() override;
 
  private:
   size_t RequiredOutputSizeBytes() const;
 
   static const size_t kMaxSamplesPerPacket = 480;
-  const int payload_type_;
   const size_t num_10ms_frames_per_packet_;
   size_t num_10ms_frames_buffered_;
   uint32_t first_timestamp_in_buffer_;
   int16_t input_buffer_[kMaxSamplesPerPacket];
+  Config config_;

[hlundin-webrtc, 2015/09/07 20:00:01]

const

[kwiberg-webrtc, 2015/09/08 10:47:45]

Done.

   IlbcEncoderInstance* encoder_;
 };
 
-struct CodecInst;
-
-class AudioEncoderMutableIlbc
-    : public AudioEncoderMutableImpl<AudioEncoderIlbc> {
- public:
-  explicit AudioEncoderMutableIlbc(const CodecInst& codec_inst);
-};
-
 }  // namespace webrtc
 #endif  // WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_INTERFACE_AUDIO_ENCODER_ILBC_H_