am cb63fa56: (-s ours) am 9553805e: am 1d6a1e84: manta: update kernel prebuilt DO NOT MERGE
* commit 'cb63fa565034f7709746c42d8e8edccf9ec4ac49':
manta: update kernel prebuilt DO NOT MERGE
diff --git a/audio/audio_route.c b/audio/audio_route.c
index 1fc1848..89e2222 100644
--- a/audio/audio_route.c
+++ b/audio/audio_route.c
@@ -259,6 +259,8 @@
path->setting[path_index].ctl = mixer_value->ctl;
path->setting[path_index].num_values = num_values;
path->setting[path_index].value = malloc(num_values * sizeof(int));
+ path->setting[path_index].linked = true;
+ path->setting[path_index].value[0] = mixer_value->value;
}
if (mixer_value->index == -1) {
diff --git a/kernel b/kernel
index 21eeb25..77b4df2 100644
--- a/kernel
+++ b/kernel
Binary files differ
diff --git a/media_codecs.xml b/media_codecs.xml
index f381a42..5d09019 100644
--- a/media_codecs.xml
+++ b/media_codecs.xml
@@ -101,6 +101,7 @@
<MediaCodec name="OMX.google.g711.alaw.decoder" type="audio/g711-alaw" />
<MediaCodec name="OMX.google.g711.mlaw.decoder" type="audio/g711-mlaw" />
<MediaCodec name="OMX.google.vorbis.decoder" type="audio/vorbis" />
+ <MediaCodec name="OMX.google.gsm.decoder" type="audio/gsm" />
<MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-es" />
<MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" />
diff --git a/voicefx/eS305VoiceProcessing.cpp b/voicefx/eS305VoiceProcessing.cpp
index a9ec133..9a90685 100644
--- a/voicefx/eS305VoiceProcessing.cpp
+++ b/voicefx/eS305VoiceProcessing.cpp
@@ -948,35 +948,6 @@
//------------------------------------------------------------------------------
// Effect Library Interface Implementation
//------------------------------------------------------------------------------
-int adnc_query_number_effects(uint32_t *pNumEffects)
-{
- if (pNumEffects == NULL) {
- return -EINVAL;
- }
- *pNumEffects = PFX_ID_CNT;
- return sAdncBundleInitStatus;
-}
-
-int adnc_query_effect(uint32_t index, effect_descriptor_t *pDescriptor)
-{
- int status = 0;
-
- pthread_mutex_lock(&sAdncBundleLock);
-
- if (AdncBundle_Init_l() != 0) {
- status = sAdncBundleInitStatus;
- goto exit;
- }
- if (index >= PFX_ID_CNT) {
- status = -EINVAL;
- goto exit;
- }
- memcpy(pDescriptor, adnc_pfx_descriptors[index], sizeof(effect_descriptor_t));
-
-exit:
- pthread_mutex_unlock(&sAdncBundleLock);
- return status;
-}
int adnc_create(const effect_uuid_t *uuid,
int32_t sessionId,
@@ -1091,8 +1062,6 @@
version : EFFECT_LIBRARY_API_VERSION,
name : "Audience Voice Preprocessing Library",
implementor : "The Android Open Source Project",
- query_num_effects : adnc_query_number_effects,
- query_effect : adnc_query_effect,
create_effect : adnc_create,
release_effect : adnc_release,
get_descriptor : adnc_get_descriptor