diff options
author | QuIC Gerrit Code Review <gerrit@quicinc.com> | 2009-06-19 16:28:31 -0700 |
---|---|---|
committer | QuIC Gerrit Code Review <gerrit@quicinc.com> | 2009-06-19 16:28:31 -0700 |
commit | 9ab70d3d5879b485982df699af6a186f1b881a47 (patch) | |
tree | 8c69fc0cb12f24f481db2f2f03c3d007bc1f05fc /libc | |
parent | 17ddfa01983680452331ec3688a717a34a94b7b3 (diff) | |
parent | 5888ed7c7178f2ca3ee90749a09fefa6755d3b0d (diff) | |
download | bionic-9ab70d3d5879b485982df699af6a186f1b881a47.zip bionic-9ab70d3d5879b485982df699af6a186f1b881a47.tar.gz bionic-9ab70d3d5879b485982df699af6a186f1b881a47.tar.bz2 |
Merge change 2569 into donut
* changes:
Bionic: Updating msm_audio.h to support NT2 Stream Info
Diffstat (limited to 'libc')
-rw-r--r-- | libc/kernel/common/linux/msm_audio.h | 17 |
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; }; |