| Index: webrtc/modules/audio_coding/acm2/acm_receiver.h
|
| diff --git a/webrtc/modules/audio_coding/acm2/acm_receiver.h b/webrtc/modules/audio_coding/acm2/acm_receiver.h
|
| index ae3969bda049fdce890dfa21782a9b2a3a7d39d1..77eb563972377197c5d61c635248e04db209c4a1 100644
|
| --- a/webrtc/modules/audio_coding/acm2/acm_receiver.h
|
| +++ b/webrtc/modules/audio_coding/acm2/acm_receiver.h
|
| @@ -175,21 +175,6 @@ class AcmReceiver {
|
| void GetNetworkStatistics(NetworkStatistics* statistics);
|
|
|
| //
|
| - // Enable post-decoding VAD.
|
| - //
|
| - void EnableVad();
|
| -
|
| - //
|
| - // Disable post-decoding VAD.
|
| - //
|
| - void DisableVad();
|
| -
|
| - //
|
| - // Returns whether post-decoding VAD is enabled (true) or disabled (false).
|
| - //
|
| - bool vad_enabled() const { return vad_enabled_; }
|
| -
|
| - //
|
| // Flushes the NetEq packet and speech buffers.
|
| //
|
| void FlushBuffers();
|
| @@ -278,14 +263,12 @@ class AcmReceiver {
|
|
|
| rtc::CriticalSection crit_sect_;
|
| const Decoder* last_audio_decoder_ GUARDED_BY(crit_sect_);
|
| - AudioFrame::VADActivity previous_audio_activity_ GUARDED_BY(crit_sect_);
|
| ACMResampler resampler_ GUARDED_BY(crit_sect_);
|
| std::unique_ptr<int16_t[]> last_audio_buffer_ GUARDED_BY(crit_sect_);
|
| CallStatistics call_stats_ GUARDED_BY(crit_sect_);
|
| NetEq* neteq_;
|
| // Decoders map is keyed by payload type
|
| std::map<uint8_t, Decoder> decoders_ GUARDED_BY(crit_sect_);
|
| - bool vad_enabled_;
|
| Clock* clock_; // TODO(henrik.lundin) Make const if possible.
|
| bool resampled_last_output_frame_ GUARDED_BY(crit_sect_);
|
| rtc::Optional<int> last_packet_sample_rate_hz_ GUARDED_BY(crit_sect_);
|
|
|