Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / webrtc / modules / audio_processing / echo_cancellation_impl.h

diff --git a/src/third_party/webrtc/modules/audio_processing/echo_cancellation_impl.h b/src/third_party/webrtc/modules/audio_processing/echo_cancellation_impl.h
index f5572b9..b9c116a 100644 (file)
--- a/src/third_party/webrtc/modules/audio_processing/echo_cancellation_impl.h
+++ b/src/third_party/webrtc/modules/audio_processing/echo_cancellation_impl.h
@@ -31,7 +31,6 @@ class EchoCancellationImpl : public EchoCancellation,
 
   // EchoCancellation implementation.
   virtual bool is_enabled() const OVERRIDE;
-  virtual int device_sample_rate_hz() const OVERRIDE;
   virtual int stream_drift_samples() const OVERRIDE;
 
   // ProcessingComponent implementation.
@@ -43,7 +42,6 @@ class EchoCancellationImpl : public EchoCancellation,
   virtual int Enable(bool enable) OVERRIDE;
   virtual int enable_drift_compensation(bool enable) OVERRIDE;
   virtual bool is_drift_compensation_enabled() const OVERRIDE;
-  virtual int set_device_sample_rate_hz(int rate) OVERRIDE;
   virtual void set_stream_drift_samples(int drift) OVERRIDE;
   virtual int set_suppression_level(SuppressionLevel level) OVERRIDE;
   virtual SuppressionLevel suppression_level() const OVERRIDE;
@@ -60,7 +58,7 @@ class EchoCancellationImpl : public EchoCancellation,
   virtual void* CreateHandle() const OVERRIDE;
   virtual int InitializeHandle(void* handle) const OVERRIDE;
   virtual int ConfigureHandle(void* handle) const OVERRIDE;
-  virtual int DestroyHandle(void* handle) const OVERRIDE;
+  virtual void DestroyHandle(void* handle) const OVERRIDE;
   virtual int num_handles_required() const OVERRIDE;
   virtual int GetHandleError(void* handle) const OVERRIDE;
 
@@ -69,12 +67,12 @@ class EchoCancellationImpl : public EchoCancellation,
   bool drift_compensation_enabled_;
   bool metrics_enabled_;
   SuppressionLevel suppression_level_;
-  int device_sample_rate_hz_;
   int stream_drift_samples_;
   bool was_stream_drift_set_;
   bool stream_has_echo_;
   bool delay_logging_enabled_;
   bool delay_correction_enabled_;
+  bool reported_delay_enabled_;
 };
 
 }  // namespace webrtc