summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4748681)
raw | patch | inline | side by side (parent: 4748681)
author | Cedric Poignet <c-poignet@ti.com> | |
Fri, 11 May 2012 12:25:18 +0000 (14:25 +0200) | ||
committer | Barry Woodward <a0270655@ti.com> | |
Mon, 17 Sep 2012 14:53:36 +0000 (09:53 -0500) |
The earpiece and handset audio volume was too low on OMAP5 SEVM.
The "defaults" gains structure has been duplicated for SEVM
to increase:
+ DL1 Voice Playback Volume to 132 in the AESS and
+ Headset Playback Volume to 15, the maximum value of Phoenix.
Change-Id: Ibc4bd93cb9aa19db888f445a42cba3ff50c24bd3
Signed-off-by: Cedric Poignet <c-poignet@ti.com>
The "defaults" gains structure has been duplicated for SEVM
to increase:
+ DL1 Voice Playback Volume to 132 in the AESS and
+ Headset Playback Volume to 15, the maximum value of Phoenix.
Change-Id: Ibc4bd93cb9aa19db888f445a42cba3ff50c24bd3
Signed-off-by: Cedric Poignet <c-poignet@ti.com>
audio/audio_hw.c | patch | blob | history |
diff --git a/audio/audio_hw.c b/audio/audio_hw.c
index 70898b49813fb2b527163ac88d8b991c35cb0abd..908ae5274b5c6ab53572584fdedde930e7b6e8a5 100644 (file)
--- a/audio/audio_hw.c
+++ b/audio/audio_hw.c
},
};
+struct route_setting defaults_omap5_sevm[] = {
+ /* general */
+ {
+ .ctl_name = MIXER_DL1_EQUALIZER,
+ .strval = MIXER_FLAT_RESPONSE,
+ },
+ {
+ .ctl_name = MIXER_DL1_MEDIA_PLAYBACK_VOLUME,
+ .intval = MIXER_ABE_GAIN_0DB - 2,
+ },
+ {
+ .ctl_name = MIXER_DL1_VOICE_PLAYBACK_VOLUME,
+ .intval = MIXER_ABE_GAIN_0DB + 12,
+ },
+ {
+ .ctl_name = MIXER_SDT_DL_VOLUME,
+ .intval = MIXER_ABE_GAIN_0DB,
+ },
+ {
+ .ctl_name = MIXER_EARPHONE_PLAYBACK_VOLUME,
+ .intval = DB_TO_EARPIECE_VOLUME(6),
+ },
+ {
+ .ctl_name = MIXER_AUDUL_VOICE_UL_VOLUME,
+ .intval = MIXER_ABE_GAIN_0DB,
+ },
+ {
+ .ctl_name = MIXER_CAPTURE_PREAMPLIFIER_VOLUME,
+ .intval = DB_TO_CAPTURE_PREAMPLIFIER_VOLUME(0),
+ },
+ {
+ .ctl_name = MIXER_CAPTURE_VOLUME,
+ .intval = DB_TO_CAPTURE_VOLUME(30),
+ },
+ {
+ .ctl_name = MIXER_SDT_UL_VOLUME,
+ .intval = MIXER_ABE_GAIN_0DB - 19,
+ },
+ {
+ .ctl_name = MIXER_SIDETONE_MIXER_CAPTURE,
+ .intval = 0,
+ },
+
+ /* headset */
+ {
+ .ctl_name = MIXER_SIDETONE_MIXER_PLAYBACK,
+ .intval = 1,
+ },
+ {
+ .ctl_name = MIXER_DL1_PDM_SWITCH,
+ .intval = 1,
+ },
+ {
+ .ctl_name = MIXER_HS_POWER_MODE,
+ .strval = MIXER_HS_LOW_POWER_MODE,
+ },
+
+ /* bt */
+ {
+ .ctl_name = MIXER_BT_UL_VOLUME,
+ .intval = DB_TO_ABE_GAIN(6),
+ },
+ {
+ .ctl_name = NULL,
+ },
+};
+
struct route_setting hf_dl1[] = {
{
.ctl_name = MIXER_DL1_PDM2_SWITCH,
/* Set the default route before the PCM stream is opened */
pthread_mutex_lock(&adev->lock);
- set_route_by_array(adev->mixer, defaults, 1);
+ if(get_boardtype(adev)) {
+ pthread_mutex_unlock(&adev->lock);
+ mixer_close(adev->mixer);
+ free(adev);
+ ALOGE("Unsupported boardtype, aborting.");
+ return -EINVAL;
+ }
+ if(OMAP5_SEVM == adev->board_type) {
+ set_route_by_array(adev->mixer, defaults_omap5_sevm, 1);
+ }
+ else {
+ set_route_by_array(adev->mixer, defaults, 1);
+ }
if (adev->dl2_support) {
set_route_by_array(adev->mixer, hf_dl2, 1);
} else {
adev->pcm_modem_ul = NULL;
adev->voice_volume = 1.0f;
adev->tty_mode = TTY_MODE_OFF;
- if(get_boardtype(adev)) {
- pthread_mutex_unlock(&adev->lock);
- mixer_close(adev->mixer);
- free(adev);
- ALOGE("Unsupported boardtype, aborting.");
- return -EINVAL;
- }
adev->input_requires_stereo = 0;
adev->bluetooth_nrec = true;