Revert 157503 - Pass through small buffer sizes without FIFO on Linux.

It broke ChromeOS build:
http://build.chromium.org/p/chromium.chromiumos/builders/ChromiumOS%20%28x86%29/builds/8475/steps/BuildTarget/logs/stdio
The real root cause seems to be the weird header in ChromeOS tree, though...
(#define min!)
http://git.chromium.org/gitweb/?p=chromiumos/third_party/adhd.git;a=blob;f=cras/src/common/cras_util.h;h=2bfd975ee21c4408e855401a5113404d9e48deb0;hb=HEAD


BUG=150570
TEST=WebRTC on linux works fine.


Review URL: https://chromiumcodereview.appspot.com/10952007

TBR=dalecurtis@chromium.org
Review URL: https://codereview.chromium.org/10948031

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157507 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 1 insertions, 21 deletions

diff --git a/media/audio/linux/audio_manager_linux.cc b/media/audio/linux/audio_manager_linux.cc
index 815195ee..b126ed1 100644
--- a/media/audio/linux/audio_manager_linux.cc
+++ b/media/audio/linux/audio_manager_linux.cc
@@ -11,7 +11,6 @@
 #include "base/process_util.h"
 #include "base/stl_util.h"
 #include "media/audio/audio_output_dispatcher.h"
-#include "media/audio/audio_util.h"
 #include "media/audio/linux/alsa_input.h"
 #include "media/audio/linux/alsa_output.h"
 #include "media/audio/linux/alsa_wrapper.h"
@@ -343,22 +342,4 @@ AudioManager* CreateAudioManager() {
   return new AudioManagerLinux();
 }
 
-AudioParameters AudioManagerLinux::GetPreferredLowLatencyOutputStreamParameters(
-    const AudioParameters& input_params) {
-  // Since Linux doesn't actually have a low latency path the hardware buffer
-  // size is quite large in order to prevent glitches with general usage.  Some
-  // clients, such as WebRTC, have a more limited use case and work acceptably
-  // with a smaller buffer size.  The check below allows clients which want to
-  // try a smaller buffer size on Linux to do so.
-  int buffer_size = std::min(
-      static_cast<size_t>(input_params.frames_per_buffer()),
-      GetAudioHardwareBufferSize());
-
-  // TODO(dalecurtis): This should include bits per channel and channel layout
-  // eventually.
-  return AudioParameters(
-      AudioParameters::AUDIO_PCM_LOW_LATENCY, input_params.channel_layout(),
-      GetAudioHardwareSampleRate(), 16, buffer_size);
-}
-
 }  // namespace media
diff --git a/media/audio/linux/audio_manager_linux.h b/media/audio/linux/audio_manager_linux.h
index 2d71605..bfa3655 100644
--- a/media/audio/linux/audio_manager_linux.h
+++ b/media/audio/linux/audio_manager_linux.h
@@ -39,8 +39,6 @@ class MEDIA_EXPORT AudioManagerLinux : public AudioManagerBase {
       const AudioParameters& params, const std::string& device_id) OVERRIDE;
   virtual AudioInputStream* MakeLowLatencyInputStream(
       const AudioParameters& params, const std::string& device_id) OVERRIDE;
-  virtual AudioParameters GetPreferredLowLatencyOutputStreamParameters(
-      const AudioParameters& input_params) OVERRIDE;
 
  protected:
   virtual ~AudioManagerLinux();
diff --git a/media/audio/win/audio_manager_win.h b/media/audio/win/audio_manager_win.h
index 6a4efcb..ffe79a3e 100644
--- a/media/audio/win/audio_manager_win.h
+++ b/media/audio/win/audio_manager_win.h
@@ -39,6 +39,7 @@ class MEDIA_EXPORT AudioManagerWin : public AudioManagerBase {
       const AudioParameters& params, const std::string& device_id) OVERRIDE;
   virtual AudioInputStream* MakeLowLatencyInputStream(
       const AudioParameters& params, const std::string& device_id) OVERRIDE;
+
   virtual AudioParameters GetPreferredLowLatencyOutputStreamParameters(
       const AudioParameters& input_params) OVERRIDE;