Fold AudioEncoderMutable into AudioEncoder

webrtc/common_audio/vad/include/vad.h

 /*
  *  Copyright (c) 2014 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 19 matching lines @@
   enum Activity { kPassive = 0, kActive = 1, kError = -1 };
 
   explicit Vad(enum Aggressiveness mode);
 
   virtual ~Vad();
 
   virtual Activity VoiceActivity(const int16_t* audio,
                                  size_t num_samples,
                                  int sample_rate_hz);
 
+  // Reset VAD state.
+  virtual void Reset();
+
  private:
   VadInst* handle_;
+  Aggressiveness aggressiveness_;
 };
 
 }  // namespace webrtc
 #endif  // WEBRTC_COMMON_AUDIO_VAD_INCLUDE_VAD_H_