summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZeng, Helen <xiaoyunz@quicinc.com>2009-06-12 17:40:49 -0700
committerShylender Gaddamwar <c_shylen@quicinc.com>2009-06-24 10:50:56 -0700
commitc83cf4229cec58e0bf2665f3b040bc2998b20471 (patch)
treea2d04590fdc2f087dadf2972ae65dad48204699b
parent3c0ff1a1375100df87c74c5614ab5e3c41454be7 (diff)
downloadbionic-c83cf4229cec58e0bf2665f3b040bc2998b20471.zip
bionic-c83cf4229cec58e0bf2665f3b040bc2998b20471.tar.gz
bionic-c83cf4229cec58e0bf2665f3b040bc2998b20471.tar.bz2
Bionic: Updating msm_audio.h to support NT2 Stream Info
This corresponds to kernel gerrit ID: 2230 This patch should be merged to mainline after 2544 (Gerrit ID) is merged first.
-rw-r--r--libc/kernel/common/linux/msm_audio.h17
1 files changed, 16 insertions, 1 deletions
diff --git a/libc/kernel/common/linux/msm_audio.h b/libc/kernel/common/linux/msm_audio.h
index a5b29d8..14e4a8b 100644
--- a/libc/kernel/common/linux/msm_audio.h
+++ b/libc/kernel/common/linux/msm_audio.h
@@ -41,6 +41,7 @@
#define AUDIO_SET_PCM_CONFIG _IOW(AUDIO_IOCTL_MAGIC, 31, unsigned)
#define AUDIO_SWITCH_DEVICE _IOW(AUDIO_IOCTL_MAGIC, 32, unsigned)
#define AUDIO_SET_MUTE _IOW(AUDIO_IOCTL_MAGIC, 33, unsigned)
+#define AUDIO_GET_STREAM_INFO _IOR(AUDIO_IOCTL_MAGIC, 34, struct msm_audio_bitstream_info)
#define AUDIO_MAX_COMMON_IOCTL_NUM 100
@@ -147,10 +148,24 @@ struct msm_audio_pcm_config {
#define AUDIO_EVENT_SUSPEND 0
#define AUDIO_EVENT_RESUME 1
#define AUDIO_EVENT_WRITE_DONE 2
-#define AUDIO_EVENT_READ_DONE 3
+#define AUDIO_EVENT_READ_DONE 3
+#define AUDIO_EVENT_STREAM_INFO 4
+
+#define AUDIO_CODEC_TYPE_MP3 0
+#define AUDIO_CODEC_TYPE_AAC 1
+
+struct msm_audio_bitstream_info {
+ uint32_t codec_type;
+ uint32_t chan_info;
+ uint32_t sample_rate;
+ uint32_t bit_stream_info;
+ uint32_t bit_rate;
+ uint32_t unused[3];
+};
union msm_audio_event_payload {
struct msm_audio_aio_buf aio_buf;
+ struct msm_audio_bitstream_info stream_info;
int reserved;
};