Improve logging related to start/stop and failure of audio input streams in Chrome

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 66 matching lines @@
 
 // Only do power monitoring for non-mobile platforms to save resources.
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
 #define AUDIO_POWER_MONITORING
 #endif
 
 class UserInputMonitor;
 
 class MEDIA_EXPORT AudioInputController
     : public base::RefCountedThreadSafe<AudioInputController>,
-      public AudioInputStream::AudioInputCallback {
+      public AudioInputStream::AudioInputCallback,
+      public AudioManager::StateChangeListener {
  public:
 
   // Error codes to make native loggin more clear. These error codes are added
   // to generic error strings to provide a higher degree of details.
   // Changing these values can lead to problems when matching native debug
   // logs with the actual cause of error.
   enum ErrorCode {
     // An unspecified error occured.
     UNKNOWN_ERROR = 0,
 
@@ skipping 129 matching lines @@
   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 OnError(AudioInputStream* stream) OVERRIDE;
 
+  virtual void OnStateChange(const std::string& state) OVERRIDE;

[tommi (sloooow) - chröme, 2014/08/26 11:42:31]

having |state| be a string is a bit strange...

[henrika (OOO until Aug 14), 2014/08/27 13:44:05]

Removed.

+
   bool SharedMemoryAndSyncSocketMode() const { return sync_writer_ != NULL; }
 
  protected:
   friend class base::RefCountedThreadSafe<AudioInputController>;
 
   // Internal state of the source.
   enum State {
     CREATED,
     RECORDING,
     CLOSED
@@ skipping 12 matching lines @@
   //            SILENCE_STATE_NO_MEASUREMENT
   enum SilenceState {
     SILENCE_STATE_NO_MEASUREMENT = 0,
     SILENCE_STATE_ONLY_AUDIO = 1,
     SILENCE_STATE_ONLY_SILENCE = 2,
     SILENCE_STATE_AUDIO_AND_SILENCE = 3,
     SILENCE_STATE_MAX = SILENCE_STATE_AUDIO_AND_SILENCE
   };
 #endif
 
-  AudioInputController(EventHandler* handler,
+  AudioInputController(AudioManager* audio_manager,
+                       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 DoCreateForLowLatency(AudioManager* audio_manager,
-                             const AudioParameters& params,
-                             const std::string& device_id);
+  void DoCreate(const AudioParameters& params, const std::string& device_id);
   void DoCreateForStream(AudioInputStream* stream_to_control);
   void DoRecord();
   void DoClose();
   void DoReportError();
   void DoSetVolume(double volume);
   void DoSetAutomaticGainControl(bool enabled);
   void DoOnData(scoped_ptr<AudioBus> data);
   void DoLogAudioLevel(float level_dbfs);
 
   // Method to check if we get recorded data after a stream was started,
@@ skipping 22 matching lines @@
   // Gives access to the task runner of the creating thread.
   scoped_refptr<base::SingleThreadTaskRunner> creator_task_runner_;
 
   // The task runner of audio-manager thread that this object runs on.
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 
   // Contains the AudioInputController::EventHandler which receives state
   // notifications from this class.
   EventHandler* handler_;
 
+  media::AudioManager* const audio_manager_;
+
   // Pointer to the audio input stream object.
   AudioInputStream* stream_;
 
   // |no_data_timer_| is used to call OnError() when we stop receiving
   // OnData() calls. This can occur when an audio input device is unplugged
   // whilst recording on Windows.
   // See http://crbug.com/79936 for details.
   // This member is only touched by the audio thread.
   scoped_ptr<base::Timer> no_data_timer_;
 
@@ skipping 35 matching lines @@
 #endif
 
   size_t prev_key_down_count_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioInputController);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_AUDIO_AUDIO_INPUT_CONTROLLER_H_