Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / webrtc / modules / audio_coding / main / acm2 / acm_resampler.h

diff --git a/src/third_party/webrtc/modules/audio_coding/main/acm2/acm_resampler.h b/src/third_party/webrtc/modules/audio_coding/main/acm2/acm_resampler.h
index e992955..a8fc6b6 100644 (file)
--- a/src/third_party/webrtc/modules/audio_coding/main/acm2/acm_resampler.h
+++ b/src/third_party/webrtc/modules/audio_coding/main/acm2/acm_resampler.h
@@ -11,13 +11,10 @@
 #ifndef WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_ACM_RESAMPLER_H_
 #define WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_ACM_RESAMPLER_H_
 
-#include "webrtc/common_audio/resampler/include/resampler.h"
+#include "webrtc/common_audio/resampler/include/push_resampler.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
-
-class CriticalSectionWrapper;
-
 namespace acm2 {
 
 class ACMResampler {
@@ -29,16 +26,14 @@ class ACMResampler {
                      int in_freq_hz,
                      int out_freq_hz,
                      int num_audio_channels,
+                     int out_capacity_samples,
                      int16_t* out_audio);
 
  private:
-  // Use the Resampler class.
-  Resampler resampler_;
-  CriticalSectionWrapper* resampler_crit_sect_;
+  PushResampler<int16_t> resampler_;
 };
 
 }  // namespace acm2
-
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_ACM_RESAMPLER_H_