Moved AudioUtil static functions to AudioManager interfaces

media/audio/audio_manager_base.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_AUDIO_AUDIO_MANAGER_BASE_H_
 #define MEDIA_AUDIO_AUDIO_MANAGER_BASE_H_
 
 #include <map>
 #include <string>
 #include <utility>
@@ skipping 65 matching lines @@
 
   // Creates the input stream for the |AUDIO_PCM_LINEAR| format. The legacy
   // name is also from |AUDIO_PCM_LINEAR|.
   virtual AudioInputStream* MakeLinearInputStream(
       const AudioParameters& params, const std::string& device_id) = 0;
 
   // Creates the input stream for the |AUDIO_PCM_LOW_LATENCY| format.
   virtual AudioInputStream* MakeLowLatencyInputStream(
       const AudioParameters& params, const std::string& device_id) = 0;
 
-  // Returns the preferred hardware audio output parameters for opening output
-  // streams in the |AUDIO_PCM_LOW_LATENCY| format.
-  // TODO(dalecurtis): Retrieve the |channel_layout| value from hardware instead
-  // of accepting the value.
-  // TODO(dalecurtis): Each AudioManager should implement their own version, see
-  // http://crbug.com/137326
-  virtual AudioParameters GetPreferredLowLatencyOutputStreamParameters(
-      const AudioParameters& input_params);
-
   // Listeners will be notified on the AudioManager::GetMessageLoop() loop.
   virtual void AddOutputDeviceChangeListener(
       AudioDeviceListener* listener) OVERRIDE;
   virtual void RemoveOutputDeviceChangeListener(
       AudioDeviceListener* listener) OVERRIDE;
 
+  virtual AudioParameters GetDefaultOutputStreamParameters() OVERRIDE;
+  virtual AudioParameters GetInputStreamParameters(
+      const std::string& device_id) OVERRIDE;
+
  protected:
   AudioManagerBase();
 
   // TODO(dalecurtis): This must change to map both input and output parameters
   // to a single dispatcher, otherwise on a device state change we'll just get
   // the exact same invalid dispatcher.
   typedef std::map<std::pair<AudioParameters, AudioParameters>,
                    scoped_refptr<AudioOutputDispatcher> >
       AudioOutputDispatchersMap;
 
   // Shuts down the audio thread and releases all the audio output dispatchers
   // on the audio thread.  All audio streams should be freed before Shutdown()
   // is called.  This must be called in the destructor of every AudioManagerBase
   // implementation.
   void Shutdown();
 
   void SetMaxOutputStreamsAllowed(int max) { max_num_output_streams_ = max; }
 
   // Called by each platform specific AudioManager to notify output state change
   // listeners that a state change has occurred.  Must be called from the audio
   // thread.
   void NotifyAllOutputDeviceChangeListeners();
 
+  // Returns the preferred hardware audio output parameters for opening output
+  // streams. If the users inject a valid |input_params|, each AudioManager
+  // will decide if they should return the values from |input_params| or the
+  // default hardware values. If the |input_params| is invalid, it will return
+  // the default hardware audio parameters.
+  virtual AudioParameters GetPreferredOutputStreamParameters(
+      const AudioParameters& input_params) = 0;
+
   // Map of cached AudioOutputDispatcher instances.  Must only be touched
   // from the audio thread (no locking).
   AudioOutputDispatchersMap output_dispatchers_;
 
  private:
   // Called by Shutdown().
   void ShutdownOnAudioThread();
 
   // Counts the number of active input streams to find out if something else
   // is currently recording in Chrome.
@@ skipping 23 matching lines @@
   // tasks which run on the audio thread even after Shutdown() has been started
   // and GetMessageLoop() starts returning NULL.
   scoped_refptr<base::MessageLoopProxy> message_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioManagerBase);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_AUDIO_AUDIO_MANAGER_BASE_H_