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

media/audio/cras/cras_input.cc

 // 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.
 
 #include "media/audio/cras/cras_input.h"
 
+#include <cras_input.h>
 #include <math.h>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/time/time.h"
 #include "media/audio/audio_manager.h"
 #include "media/audio/cras/audio_manager_cras.h"
 
 namespace media {
 
@@ skipping 135 matching lines @@
   for (size_t i = 0; i < arraysize(kChannelMap); ++i) {
     layout[kChannelMap[i]] = ChannelOrder(params_.channel_layout(),
                                           static_cast<Channels>(i));
   }
   if (cras_audio_format_set_channel_layout(audio_format, layout) != 0) {
     DLOG(WARNING) << "Error setting channel layout.";
     callback->OnError(this);
     return;
   }
 
+  uint32_t flags = 0;
+  if (params_.effects() & AudioParameters::PlatformEffectsMask::HOTWORD)
+    flags = HOTWORD_STREAM;

[Steve McKay, 2014/12/17 17:41:29]

This is still broken for me. Where is this value defined?

[dgreid, 2014/12/17 17:44:20]

in cras_types.h, you'll need an up to date libcras from a recent chromeos
checkout.

+
   unsigned int frames_per_packet = params_.frames_per_buffer();
   cras_stream_params* stream_params = cras_client_stream_params_create(
       stream_direction_,
       frames_per_packet,  // Total latency.
       frames_per_packet,  // Call back when this many ready.
       frames_per_packet,  // Minimum Callback level ignored for capture streams.
       CRAS_STREAM_TYPE_DEFAULT,
-      0,  // Unused flags.
+      flags,
       this,
       CrasInputStream::SamplesReady,
       CrasInputStream::StreamError,
       audio_format);
   if (!stream_params) {
     DLOG(WARNING) << "Error setting up stream parameters.";
     callback_->OnError(this);
     callback_ = NULL;
     cras_audio_format_destroy(audio_format);
     return;
@@ skipping 127 matching lines @@
 
 double CrasInputStream::GetVolumeRatioFromDecibels(double dB) const {
   return pow(10, dB / 20.0);
 }
 
 double CrasInputStream::GetDecibelsFromVolumeRatio(double volume_ratio) const {
   return 20 * log10(volume_ratio);
 }
 
 }  // namespace media