Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(973)

Unified Diff: chrome/browser/copresence/chrome_whispernet_client.cc

Issue 940123004: Convert audio samples in Whispernet. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: test fix. Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/copresence/DEPS ('k') | chrome/browser/copresence/chrome_whispernet_client_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/copresence/chrome_whispernet_client.cc
diff --git a/chrome/browser/copresence/chrome_whispernet_client.cc b/chrome/browser/copresence/chrome_whispernet_client.cc
index fea965ca72e0a9f4143ddcb61bf70ff727dce3c8..0c2e9d63e6bb5c29c29379addebd844856aa90b6 100644
--- a/chrome/browser/copresence/chrome_whispernet_client.cc
+++ b/chrome/browser/copresence/chrome_whispernet_client.cc
@@ -14,6 +14,9 @@
#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;
@@ -42,10 +45,19 @@ 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;
@@ -54,7 +66,7 @@ AudioParamData GetDefaultAudioConfig() {
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;
}
« no previous file with comments | « chrome/browser/copresence/DEPS ('k') | chrome/browser/copresence/chrome_whispernet_client_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698