Piteball/android_device_samsung_klte-common
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

klte-common: Remove custom audio routing code

Browse source 
* There's a standard way to do this by configuration without linking a
  custom library for no real reason.

Change-Id: Iee7cebc1fad51b4a340e8a9fb0f7c10f6bd7b15b
This commit is contained in:
Ethan Chen 2014-08-27 23:54:26 -07:00
parent 01a7fbcf9e
commit 5944dfd2f9
2 changed files with 0 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
BoardConfigCommon.mk
View file

@ -36,7 +36,6 @@ TARGET_KERNEL_SOURCE := kernel/samsung/klte
# Audio
BOARD_HAVE_NEW_QCOM_CSDCLIENT := true
BOARD_HAVE_SAMSUNG_AUDIO := true
BOARD_USES_CUSTOM_AUDIO_PLATFORM_PATH := $(LOCAL_PATH)/audio/platform
BOARD_USES_FLUENCE_INCALL := true
BOARD_USES_FLUENCE_FOR_VOIP := true
BOARD_USES_SEPERATED_AUDIO_INPUT := true

117
audio/platform/customplatform.c
View file

@ -1,117 +0,0 @@
/*
* Copyright 2013, The CyanogenMod Project
* Shareef Ali
* Hashcode
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "Custom-Platform_Api.h"
#include <stdlib.h>
#include <dlfcn.h>
#include <cutils/log.h>
#include <audio_hw.h>
#include <platform_api.h>
#include "platform.h"
#include "voice_extn.h"
#include "audio_extn.h"
snd_device_t custom_platform_get_input_snd_device(void *platform, audio_devices_t out_device)
{
struct platform_data *my_data = (struct platform_data *)platform;
struct audio_device *adev = my_data->adev;
audio_source_t source = (adev->active_input == NULL) ?
AUDIO_SOURCE_DEFAULT : adev->active_input->source;
audio_mode_t mode = adev->mode;
audio_channel_mask_t channel_mask = (adev->active_input == NULL) ?
AUDIO_CHANNEL_IN_MONO : adev->active_input->channel_mask;
snd_device_t snd_device = -2;
int channel_count = popcount(channel_mask);
if ((out_device != AUDIO_DEVICE_NONE) && ((mode == AUDIO_MODE_IN_CALL) ||
voice_extn_compress_voip_is_active(adev))) {
if (adev->voice.tty_mode == TTY_MODE_OFF) {
if (out_device & AUDIO_DEVICE_OUT_EARPIECE ||
out_device & AUDIO_DEVICE_OUT_WIRED_HEADPHONE) {
if (!(out_device & AUDIO_DEVICE_OUT_EARPIECE &&
audio_extn_should_use_handset_anc(channel_count))) {
if (my_data->fluence_type == FLUENCE_NONE ||
my_data->fluence_in_voice_call == false) {
snd_device = SND_DEVICE_IN_HANDSET_STEREO_DMIC;
}
}
} else if (out_device & AUDIO_DEVICE_OUT_SPEAKER) {
if (!(my_data->fluence_type != FLUENCE_NONE &&
my_data->fluence_in_voice_call &&
my_data->fluence_in_spkr_mode)) {
snd_device = SND_DEVICE_IN_SPEAKER_STEREO_DMIC;
}
}
}
}
return snd_device;
}
void custom_init_data(){
change_acdb_data(SND_DEVICE_OUT_SPEAKER, 15);
change_acdb_data(SND_DEVICE_OUT_SPEAKER_REVERSE, 15);
change_acdb_data(SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES, 15);
change_acdb_data(SND_DEVICE_OUT_VOICE_SPEAKER, 15);
change_acdb_data(SND_DEVICE_IN_VOICE_DMIC, 4);
change_acdb_data(SND_DEVICE_IN_HANDSET_DMIC, 4);
change_acdb_data(SND_DEVICE_IN_VOICE_SPEAKER_DMIC, 11);
change_acdb_data(SND_DEVICE_IN_SPEAKER_DMIC, 11);
change_acdb_data(SND_DEVICE_IN_VOICE_REC_MIC, 53);
change_acdb_data(SND_DEVICE_IN_CAMCORDER_MIC, 56);
change_acdb_data(SND_DEVICE_OUT_USB_HEADSET, 98);
change_acdb_data(SND_DEVICE_OUT_BT_SCO, 48);
change_acdb_data(SND_DEVICE_OUT_BT_SCO_WB, 50);
change_acdb_data(SND_DEVICE_IN_BT_SCO_MIC, 49);
change_acdb_data(SND_DEVICE_IN_BT_SCO_MIC_WB, 51);
change_table_data(SND_DEVICE_OUT_HEADPHONES, "headset");
change_table_data(SND_DEVICE_OUT_VOICE_HANDSET, "voice-call-handset");
change_table_data(SND_DEVICE_OUT_VOICE_SPEAKER, "voice-call-speaker");
change_table_data(SND_DEVICE_OUT_VOICE_HEADPHONES, "voice-call-headset");
change_table_data(SND_DEVICE_OUT_VOICE_TTY_FULL_HEADPHONES, "TTY-full");
change_table_data(SND_DEVICE_OUT_VOICE_TTY_VCO_HEADPHONES, "TTY-headset");
change_table_data(SND_DEVICE_OUT_VOICE_TTY_HCO_HANDSET, "TTY-handset");
change_table_data(SND_DEVICE_IN_HANDSET_MIC, "rec-main-mic");
change_table_data(SND_DEVICE_IN_HANDSET_DMIC, "voice-call-main-mic");
change_table_data(SND_DEVICE_IN_HANDSET_DMIC_NS, "voice-call-NS-mic-handset");
change_table_data(SND_DEVICE_IN_HANDSET_DMIC_AEC, "voice-call-main-mic");
change_table_data(SND_DEVICE_IN_HANDSET_DMIC_AEC_NS, "voice-call-main-mic");
change_table_data(SND_DEVICE_IN_SPEAKER_MIC, "rec-sub-mic");
change_table_data(SND_DEVICE_IN_SPEAKER_DMIC, "voice-call-sub-mic");
change_table_data(SND_DEVICE_IN_SPEAKER_DMIC_NS, "voice-call-NS-mic-speaker");
change_table_data(SND_DEVICE_IN_SPEAKER_DMIC_AEC, "voice-call-sub-mic");
change_table_data(SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS, "voice-call-sub-mic");
change_table_data(SND_DEVICE_IN_HEADSET_MIC, "rec-headset-mic");
change_table_data(SND_DEVICE_IN_HEADSET_MIC_FLUENCE, "rec-main-mic");
change_table_data(SND_DEVICE_IN_VOICE_SPEAKER_MIC, "voice-call-sub-mic");
change_table_data(SND_DEVICE_IN_VOICE_HEADSET_MIC, "voice-call-headset-mic");
change_table_data(SND_DEVICE_IN_CAMCORDER_MIC, "rec-stereo-mic");
change_table_data(SND_DEVICE_IN_VOICE_DMIC, "voice-call-main-mic");
change_table_data(SND_DEVICE_IN_VOICE_SPEAKER_DMIC, "voice-call-sub-mic");
change_table_data(SND_DEVICE_IN_VOICE_TTY_FULL_HEADSET_MIC, "TTY-full-mic");
change_table_data(SND_DEVICE_IN_VOICE_TTY_VCO_HANDSET_MIC, "TTY-vco-mic");
change_table_data(SND_DEVICE_IN_VOICE_TTY_HCO_HEADSET_MIC, "TTY-headset-mic");
change_table_data(SND_DEVICE_IN_VOICE_REC_MIC, "vr-main-mic");
change_table_data(SND_DEVICE_IN_VOICE_REC_HEADSET_MIC, "vr-headset-mic");
change_table_data(SND_DEVICE_IN_VOICE_REC_MIC_NS, "svoice-NS-mic");
change_table_data(SND_DEVICE_IN_VOICE_REC_DMIC_STEREO, "vr-sub-mic");
change_table_data(SND_DEVICE_IN_HANDSET_STEREO_DMIC, "rec-stereo-mic");
change_table_data(SND_DEVICE_IN_SPEAKER_STEREO_DMIC, "rec-stereo-mic");
}