Convert audio samples in Whispernet.

chrome/browser/copresence/chrome_whispernet_client.cc

 // Copyright 2014 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 "chrome/browser/copresence/chrome_whispernet_client.h"
 
 #include "base/stl_util.h"
 #include "chrome/browser/copresence/chrome_whispernet_config.h"
 #include "chrome/browser/extensions/api/copresence_private/copresence_private_api.h"
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/common/extensions/api/copresence_private.h"
 #include "content/public/browser/browser_context.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_system.h"
 #include "grit/browser_resources.h"
+#include "media/audio/audio_manager.h"
+#include "media/audio/audio_manager_base.h"
+#include "media/audio/audio_parameters.h"
 
 using audio_modem::AUDIBLE;
 using audio_modem::AudioType;
 using audio_modem::BOTH;
 using audio_modem::INAUDIBLE;
 using audio_modem::SamplesCallback;
 using audio_modem::SuccessCallback;
 using audio_modem::TokensCallback;
 using audio_modem::TokenParameters;
 
 using extensions::api::copresence_private::AudioParameters;
 using extensions::api::copresence_private::DecodeSamplesParameters;
 using extensions::api::copresence_private::EncodeTokenParameters;
 using ApiTokenParams = extensions::api::copresence_private::TokenParameters;
 
 namespace OnConfigAudio =
     extensions::api::copresence_private::OnConfigAudio;
 namespace OnDecodeSamplesRequest =
     extensions::api::copresence_private::OnDecodeSamplesRequest;
 namespace OnEncodeTokenRequest =
     extensions::api::copresence_private::OnEncodeTokenRequest;
 
 using extensions::Event;
 using extensions::copresence_private::RegisterWhispernetClient;
 
 namespace {
 
 AudioParamData GetDefaultAudioConfig() {
+  media::AudioParameters params =
+      media::AudioManager::Get()->GetInputStreamParameters(
+          media::AudioManagerBase::kDefaultDeviceId);
+
   AudioParamData config_data = {};
+
   config_data.audio_dtmf.coder_sample_rate =
       config_data.audio_dsss.coder_sample_rate =
           audio_modem::kDefaultSampleRate;
+
+  config_data.audio_dtmf.recording_sample_rate =
+      config_data.audio_dsss.recording_sample_rate = params.sample_rate();
+
   config_data.audio_dtmf.num_repetitions_to_play =
       config_data.audio_dsss.num_repetitions_to_play =
           audio_modem::kDefaultRepetitions;
 
   config_data.audio_dsss.upsampling_factor = audio_modem::kDefaultBitsPerSample;
   config_data.audio_dsss.desired_carrier_frequency =
       audio_modem::kDefaultCarrierFrequency;
 
-  config_data.recording_channels = audio_modem::kDefaultChannels;
+  config_data.recording_channels = params.channels();
 
   return config_data;
 }
 
 // ApiTokenParams is not copyable, so we must take it as an output argument.
 // TODO(ckehoe): Pass protos to Whispernet to avoid all these conversions.
 void ConvertTokenParams(const TokenParameters& in, ApiTokenParams* out) {
   out->length = in.length;
   out->crc = in.crc;
   out->parity = in.parity;
@@ skipping 142 matching lines @@
   // Thus we can just discard the pointers at the end.
   DCHECK(event_router_);
   for (Event* event : queued_events_) {
     event_router_->DispatchEventToExtension(kWhispernetProxyExtensionId,
                                             make_scoped_ptr(event));
   }
   queued_events_.weak_clear();
 
   extension_loaded_ = true;
 }