[Hotword] Adding audio parameters to handle audio coming from the DSP.

media/audio/cras/cras_input.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_CRAS_CRAS_INPUT_H_
 #define MEDIA_AUDIO_CRAS_CRAS_INPUT_H_
 
 #include <cras_client.h>
 
 #include <string>
 
+#include "base/cancelable_callback.h"

[dgreid, 2014/09/17 21:16:23]

Don't need this one.

[rpetterson, 2014/09/17 21:32:00]

Done.

 #include "base/compiler_specific.h"
 #include "media/audio/agc_audio_stream.h"
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_parameters.h"
 
 namespace media {
 
 class AudioManagerCras;
 
 // Provides an input stream for audio capture based on CRAS, the ChromeOS Audio
@@ skipping 22 matching lines @@
  private:
   // Handles requests to get samples from the provided buffer.  This will be
   // called by the audio server when it has samples ready.
   static int SamplesReady(cras_client* client,
                           cras_stream_id_t stream_id,
                           uint8* samples,
                           size_t frames,
                           const timespec* sample_ts,
                           void* arg);
 
+  // Handles requests to get a sample from the provided buffer.  This will be

[dgreid, 2014/09/17 21:16:23]

I'd remove the first sentence of this comment.

[rpetterson, 2014/09/17 21:32:01]

Done.

+  // called by the audio server once after it recieves a wakeup and has data.
+  static int HotwordSampleReady(cras_client* client,
+                                cras_audio_format* fmt,
+                                uint8* hotword_phrase,
+                                size_t frames,
+                                const timespec* sample_ts,
+                                void* arg);
+
   // Handles notification that there was an error with the playback stream.
   static int StreamError(cras_client* client,
                          cras_stream_id_t stream_id,
                          int err,
                          void* arg);
 
   // Reads one or more buffers of audio from the device, passes on to the
   // registered callback. Called from SamplesReady().
   void ReadAudio(size_t frames, uint8* buffer, const timespec* sample_ts);
 
@@ skipping 35 matching lines @@
   const CRAS_STREAM_DIRECTION stream_direction_;
 
   scoped_ptr<AudioBus> audio_bus_;
 
   DISALLOW_COPY_AND_ASSIGN(CrasInputStream);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_AUDIO_CRAS_CRAS_INPUT_H_