aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@qualcomm.com>2010-10-19 05:04:33 -0700
committerQuIC Gerrit Code Review <code-review@quicinc.com>2010-10-19 05:04:34 -0700
commit825d70eaefbc5e6bfd3bd0101c26b19e6897c876 (patch)
treeca2bddafc2360ba730a76a87c8c089de7b0faf9f
parentc2581bd36b6df1b30f25c049a5b83f7983cfce48 (diff)
parentbc5d06c5cc3be0ef6add0664d09a93cfd2e450d1 (diff)
downloadandroid_bionic-825d70eaefbc5e6bfd3bd0101c26b19e6897c876.tar.gz
android_bionic-825d70eaefbc5e6bfd3bd0101c26b19e6897c876.tar.bz2
android_bionic-825d70eaefbc5e6bfd3bd0101c26b19e6897c876.zip
Merge "bionic: Add EVRC support." into froyo
-rw-r--r--libc/kernel/common/linux/msm_audio_mvs.h11
1 files changed, 10 insertions, 1 deletions
diff --git a/libc/kernel/common/linux/msm_audio_mvs.h b/libc/kernel/common/linux/msm_audio_mvs.h
index 01140e67a..e5508b9cd 100644
--- a/libc/kernel/common/linux/msm_audio_mvs.h
+++ b/libc/kernel/common/linux/msm_audio_mvs.h
@@ -17,6 +17,7 @@
#define AUDIO_GET_MVS_CONFIG _IOW(AUDIO_IOCTL_MAGIC, (AUDIO_MAX_COMMON_IOCTL_NUM + 0), unsigned)
#define AUDIO_SET_MVS_CONFIG _IOR(AUDIO_IOCTL_MAGIC, (AUDIO_MAX_COMMON_IOCTL_NUM + 1), unsigned)
+#define MVS_MODE_IS127 2
#define MVS_MODE_AMR 5
#define MVS_MODE_LINEAR_PCM 9
#define MVS_MODE_PCM 12
@@ -43,6 +44,14 @@ enum msm_audio_amr_mode {
MVS_AMR_MODE_UNDEF
};
+enum msm_audio_voc_rate {
+ MVS_VOC_0_RATE,
+ MVS_VOC_8_RATE,
+ MVS_VOC_4_RATE,
+ MVS_VOC_2_RATE,
+ MVS_VOC_1_RATE
+};
+
enum msm_audio_amr_frame_type {
MVS_AMR_SPEECH_GOOD,
MVS_AMR_SPEECH_DEGRADED,
@@ -52,7 +61,7 @@ enum msm_audio_amr_frame_type {
MVS_AMR_SID_UPDATE,
MVS_AMR_SID_BAD,
MVS_AMR_NO_DATA,
- MVS_AMR_SPEECH_LOST,
+ MVS_AMR_SPEECH_LOST
};
struct msm_audio_mvs_config {