aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFranco <frapeti@gmail.com>2015-02-25 15:55:28 -0300
committerSergiu Cozma <lssjbrolli@gmail.com>2015-03-28 12:03:23 +0200
commit3d91a8975340b2b3ef82092b7d6cfc51fc93111b (patch)
treead0322adb382b858f54ffa2f7986afe26d598bac
parent7c438ae69805b34fcb6e8ccc70aaaf951a43d2ee (diff)
audio: set es325 presets for voice and media scenarios
Change-Id: I51a9e71b59f7c6abe0ca9c44066633bb8768902b
-rw-r--r--audio/routing.h55
1 files changed, 27 insertions, 28 deletions
diff --git a/audio/routing.h b/audio/routing.h
index ffb68b0..0307e1c 100644
--- a/audio/routing.h
+++ b/audio/routing.h
@@ -57,68 +57,67 @@ struct route_config {
// -1 means es325 bypass
};
-/* TODO: Figure out whether voice routes need to set ES325 presets */
const struct route_config voice_speaker = {
"voice-speaker",
"voice-speaker-main-mic",
- { ES325_PRESET_OFF,
- ES325_PRESET_OFF }
+ { ES325_PRESET_VOIP_DESKTOP,
+ ES325_PRESET_VOIP_DESKTOP }
};
const struct route_config voice_speaker_wb = {
"voice-speaker-wb",
"voice-speaker-main-mic",
- { ES325_PRESET_OFF,
- ES325_PRESET_OFF }
+ { ES325_PRESET_VOIP_DESKTOP,
+ ES325_PRESET_VOIP_DESKTOP }
};
const struct route_config voice_earpiece = {
"voice-earpiece",
"voice-main-mic",
- { ES325_PRESET_OFF,
- ES325_PRESET_OFF }
+ { ES325_PRESET_VOIP_HANDHELD,
+ ES325_PRESET_VOIP_HANDHELD }
};
const struct route_config voice_earpiece_wb = {
"voice-earpiece-wb",
"voice-main-mic-wb",
- { ES325_PRESET_OFF,
- ES325_PRESET_OFF }
+ { ES325_PRESET_VOIP_HANDHELD,
+ ES325_PRESET_VOIP_HANDHELD }
};
const struct route_config voice_headphones = {
"voice-headphones",
"voice-main-mic",
- { ES325_PRESET_OFF,
- ES325_PRESET_OFF }
+ { ES325_PRESET_VOIP_HEADPHONES,
+ ES325_PRESET_VOIP_HEADPHONES }
};
const struct route_config voice_headphones_wb = {
"voice-headphones-wb",
"voice-main-mic-wb",
- { ES325_PRESET_OFF,
- ES325_PRESET_OFF }
+ { ES325_PRESET_VOIP_HEADPHONES,
+ ES325_PRESET_VOIP_HEADPHONES }
};
const struct route_config voice_headset = {
"voice-headphones",
"voice-headset-mic",
- { ES325_PRESET_OFF,
- ES325_PRESET_OFF }
+ { ES325_PRESET_VOIP_HEADSET,
+ ES325_PRESET_VOIP_HEADSET }
};
const struct route_config voice_headset_wb = {
"voice-headphones-wb",
"voice-headset-mic-wb",
- { ES325_PRESET_OFF,
- ES325_PRESET_OFF }
+ { ES325_PRESET_VOIP_HEADSET,
+ ES325_PRESET_VOIP_HEADSET }
};
const struct route_config media_speaker = {
"media-speaker",
"media-main-mic",
- { ES325_PRESET_OFF,
- ES325_PRESET_OFF }
+ { ES325_PRESET_ASRA_HANDHELD,
+ ES325_PRESET_ASRA_DESKTOP }
};
const struct route_config bluetooth_sco_wb = {
@@ -131,22 +130,22 @@ const struct route_config bluetooth_sco_wb = {
const struct route_config media_earpiece = {
"media-earpiece",
"media-main-mic",
- { ES325_PRESET_OFF,
- ES325_PRESET_OFF }
+ { ES325_PRESET_VOIP_HANDHELD,
+ ES325_PRESET_VOIP_HANDHELD }
};
const struct route_config media_headphones = {
"media-headphones",
"media-main-mic",
- { ES325_PRESET_OFF,
- ES325_PRESET_OFF }
+ { ES325_PRESET_VOIP_HEADPHONES,
+ ES325_PRESET_VOIP_HEADPHONES }
};
const struct route_config media_headset = {
"media-headphones",
"media-headset-mic",
- { ES325_PRESET_OFF,
- ES325_PRESET_OFF }
+ { ES325_PRESET_VOIP_HEADSET,
+ ES325_PRESET_ASRA_HEADSET }
};
const struct route_config camcorder_speaker = {
@@ -187,15 +186,15 @@ const struct route_config voice_rec_headset = {
const struct route_config communication_speaker = {
"communication-speaker",
"communication-main-mic",
- { ES325_PRESET_VOIP_HANDHELD,
+ { ES325_PRESET_VOIP_DESKTOP,
ES325_PRESET_VOIP_DESKTOP }
};
const struct route_config communication_earpiece = {
"communication-earpiece",
"communication-main-mic",
- { ES325_PRESET_OFF,
- ES325_PRESET_OFF }
+ { ES325_PRESET_VOIP_HANDHELD,
+ ES325_PRESET_VOIP_HANDHELD }
};
const struct route_config communication_headphones = {