Revert 277794 "Modifies AudioInputCallback::OnData and use media..."

trunk/src/media/audio/audio_input_controller.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_INPUT_CONTROLLER_H_
 #define MEDIA_AUDIO_AUDIO_INPUT_CONTROLLER_H_
 
 #include <string>
 #include "base/atomicops.h"
 #include "base/callback.h"
@@ skipping 99 matching lines @@
   };
 
   // An event handler that receives events from the AudioInputController. The
   // following methods are all called on the audio thread.
   class MEDIA_EXPORT EventHandler {
    public:
     virtual void OnCreated(AudioInputController* controller) = 0;
     virtual void OnRecording(AudioInputController* controller) = 0;
     virtual void OnError(AudioInputController* controller,
                          ErrorCode error_code) = 0;
-    virtual void OnData(AudioInputController* controller,
-                        const AudioBus* data) = 0;
+    virtual void OnData(AudioInputController* controller, const uint8* data,
+                        uint32 size) = 0;
     virtual void OnLog(AudioInputController* controller,
                        const std::string& message) = 0;
 
    protected:
     virtual ~EventHandler() {}
   };
 
   // A synchronous writer interface used by AudioInputController for
   // synchronous writing.
   class SyncWriter {
    public:
     virtual ~SyncWriter() {}
 
     // Notify the synchronous writer about the number of bytes in the
     // soundcard which has been recorded.
     virtual void UpdateRecordedBytes(uint32 bytes) = 0;
 
-    // Write certain amount of data from |data|.
-    virtual void Write(const AudioBus* data,
-                       double volume,
-                       bool key_pressed) = 0;
+    // Write certain amount of data from |data|. This method returns
+    // number of written bytes.
+    virtual uint32 Write(const void* data,
+                         uint32 size,
+                         double volume,
+                         bool key_pressed) = 0;
 
     // Close this synchronous writer.
     virtual void Close() = 0;
   };
 
   // AudioInputController::Create() can use the currently registered Factory
   // to create the AudioInputController. Factory is intended for testing only.
   // |user_input_monitor| is used for typing detection and can be NULL.
   class Factory {
    public:
@@ skipping 68 matching lines @@
   // Sets the capture volume of the input stream. The value 0.0 corresponds
   // to muted and 1.0 to maximum volume.
   virtual void SetVolume(double volume);
 
   // Sets the Automatic Gain Control (AGC) state of the input stream.
   // Changing the AGC state is not supported while recording is active.
   virtual void SetAutomaticGainControl(bool enabled);
 
   // AudioInputCallback implementation. Threading details depends on the
   // device-specific implementation.
-  virtual void OnData(AudioInputStream* stream,
-                      const AudioBus* source,
-                      uint32 hardware_delay_bytes,
-                      double volume) OVERRIDE;
+  virtual void OnData(AudioInputStream* stream, const uint8* src, uint32 size,
+                      uint32 hardware_delay_bytes, double volume) OVERRIDE;
   virtual void OnError(AudioInputStream* stream) OVERRIDE;
 
   bool SharedMemoryAndSyncSocketMode() const { return sync_writer_ != NULL; }
 
  protected:
   friend class base::RefCountedThreadSafe<AudioInputController>;
 
   // Internal state of the source.
   enum State {
     CREATED,
     RECORDING,
     CLOSED
   };
 
   AudioInputController(EventHandler* handler,
                        SyncWriter* sync_writer,
                        UserInputMonitor* user_input_monitor);
   virtual ~AudioInputController();
 
   // Methods called on the audio thread (owned by the AudioManager).
   void DoCreate(AudioManager* audio_manager, const AudioParameters& params,
                 const std::string& device_id);
   void DoCreateForStream(AudioInputStream* stream_to_control,
                          bool enable_nodata_timer);
   void DoRecord();
   void DoClose();
   void DoReportError();
   void DoSetVolume(double volume);
   void DoSetAutomaticGainControl(bool enabled);
-  void DoOnData(scoped_ptr<AudioBus> data);
+  void DoOnData(scoped_ptr<uint8[]> data, uint32 size);
   void DoLogAudioLevel(float level_dbfs);
 
   // Method to check if we get recorded data after a stream was started,
   // and log the result to UMA.
   void FirstCheckForNoData();
 
   // Method which ensures that OnError() is triggered when data recording
   // times out. Called on the audio thread.
   void DoCheckForNoData();
 
@@ skipping 43 matching lines @@
 
   double max_volume_;
 
   UserInputMonitor* user_input_monitor_;
 
 #if defined(AUDIO_POWER_MONITORING)
   // Scans audio samples from OnData() as input to compute audio levels.
   scoped_ptr<AudioPowerMonitor> audio_level_;
 
   // We need these to be able to feed data to the AudioPowerMonitor.
+  scoped_ptr<AudioBus> audio_bus_;
   media::AudioParameters audio_params_;
   base::TimeTicks last_audio_level_log_time_;
 #endif
 
   size_t prev_key_down_count_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioInputController);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_AUDIO_AUDIO_INPUT_CONTROLLER_H_