Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / media / audio / audio_low_latency_input_output_unittest.cc

diff --git a/src/media/audio/audio_low_latency_input_output_unittest.cc b/src/media/audio/audio_low_latency_input_output_unittest.cc
index df94a3f..5632896 100644 (file)
--- a/src/media/audio/audio_low_latency_input_output_unittest.cc
+++ b/src/media/audio/audio_low_latency_input_output_unittest.cc
@@ -18,8 +18,12 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-#if defined(USE_ALSA)
+#if defined(USE_PULSEAUDIO)
+#include "media/audio/pulse/audio_manager_pulse.h"
+#elif defined(USE_ALSA)
 #include "media/audio/alsa/audio_manager_alsa.h"
+#elif defined(USE_CRAS)
+#include "media/audio/cras/audio_manager_cras.h"
 #elif defined(OS_MACOSX)
 #include "media/audio/mac/audio_manager_mac.h"
 #elif defined(OS_WIN)
@@ -33,8 +37,12 @@
 
 namespace media {
 
-#if defined(USE_ALSA)
+#if defined(USE_PULSEAUDIO)
+typedef AudioManagerPulse AudioManagerAnyPlatform;
+#elif defined(USE_ALSA)
 typedef AudioManagerAlsa AudioManagerAnyPlatform;
+#elif defined(USE_CRAS)
+typedef AudioManagerCras AudioManagerAnyPlatform;
 #elif defined(OS_MACOSX)
 typedef AudioManagerMac AudioManagerAnyPlatform;
 #elif defined(OS_WIN)
@@ -184,7 +192,7 @@ class FullDuplexAudioSinkSource
 
   // AudioInputStream::AudioInputCallback.
   virtual void OnData(AudioInputStream* stream,
-                      const uint8* src, uint32 size,
+                      const AudioBus* src,
                       uint32 hardware_delay_bytes,
                       double volume) OVERRIDE {
     base::AutoLock lock(lock_);
@@ -203,14 +211,15 @@ class FullDuplexAudioSinkSource
       ++input_elements_to_write_;
     }
 
+    // TODO(henrika): fix this and use AudioFifo instead.
     // Store the captured audio packet in a seekable media buffer.
-    if (!buffer_->Append(src, size)) {
-      // An attempt to write outside the buffer limits has been made.
-      // Double the buffer capacity to ensure that we have a buffer large
-      // enough to handle the current sample test scenario.
-      buffer_->set_forward_capacity(2 * buffer_->forward_capacity());
-      buffer_->Clear();
-    }
+    // if (!buffer_->Append(src, size)) {
+    // An attempt to write outside the buffer limits has been made.
+    // Double the buffer capacity to ensure that we have a buffer large
+    // enough to handle the current sample test scenario.
+    //   buffer_->set_forward_capacity(2 * buffer_->forward_capacity());
+    //   buffer_->Clear();
+    // }
   }
 
   virtual void OnError(AudioInputStream* stream) OVERRIDE {}
@@ -254,13 +263,6 @@ class FullDuplexAudioSinkSource
     return 0;
   }
 
-  virtual int OnMoreIOData(AudioBus* source,
-                           AudioBus* dest,
-                           AudioBuffersState buffers_state) OVERRIDE {
-    NOTREACHED();
-    return 0;
-  }
-
   virtual void OnError(AudioOutputStream* stream) OVERRIDE {}
 
  protected: