diff options
| author | QuIC Gerrit Code Review <gerrit@quicinc.com> | 2009-10-13 22:20:07 -0700 |
|---|---|---|
| committer | QuIC Gerrit Code Review <gerrit@quicinc.com> | 2009-10-13 22:20:07 -0700 |
| commit | 091bca3c55cd86992589172c55fc29c8336e6cb8 (patch) | |
| tree | f190c424d234666aa56b19ed02cb300e8bbbe283 | |
| parent | 57a559b72d26af5086f82df6f0596dbb29b239fd (diff) | |
| parent | d3bbed2c26db9edbf605f70aa86ab67aef094042 (diff) | |
| download | bionic-091bca3c55cd86992589172c55fc29c8336e6cb8.zip bionic-091bca3c55cd86992589172c55fc29c8336e6cb8.tar.gz bionic-091bca3c55cd86992589172c55fc29c8336e6cb8.tar.bz2 | |
Merge change 9911 into donut
* changes:
bionic: updated msm_audio.h and msm_audio_aac.h to change to the AAC interface so that the userspace apps can provide format type and bitrate
| -rw-r--r-- | libc/kernel/common/linux/msm_audio.h | 16 | ||||
| -rw-r--r-- | libc/kernel/common/linux/msm_audio_aac.h | 12 |
2 files changed, 22 insertions, 6 deletions
diff --git a/libc/kernel/common/linux/msm_audio.h b/libc/kernel/common/linux/msm_audio.h index 7e040b4..7e5ae11 100644 --- a/libc/kernel/common/linux/msm_audio.h +++ b/libc/kernel/common/linux/msm_audio.h @@ -47,13 +47,16 @@ #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_GET_STREAM_INFO _IOR(AUDIO_IOCTL_MAGIC, 34, struct msm_audio_bitstream_info) #define AUDIO_SET_PAN _IOW(AUDIO_IOCTL_MAGIC, 35, unsigned) #define AUDIO_SET_QCONCERT_PLUS _IOW(AUDIO_IOCTL_MAGIC, 36, unsigned) #define AUDIO_SET_MBADRC _IOW(AUDIO_IOCTL_MAGIC, 37, unsigned) -#define AUDIO_SET_VOLUME_PATH _IOW(AUDIO_IOCTL_MAGIC, 38, struct msm_vol_info) +#define AUDIO_SET_VOLUME_PATH _IOW(AUDIO_IOCTL_MAGIC, 38, struct msm_vol_info) #define AUDIO_SET_MAX_VOL_ALL _IOW(AUDIO_IOCTL_MAGIC, 39, unsigned) +#define AUDIO_SET_STREAM_CONFIG _IOW(AUDIO_IOCTL_MAGIC, 40, struct msm_audio_stream_config) +#define AUDIO_GET_STREAM_CONFIG _IOR(AUDIO_IOCTL_MAGIC, 41, struct msm_audio_stream_config) + #define AUDIO_MAX_COMMON_IOCTL_NUM 100 #define AUDIO_ENABLE_AUDPRE _IOW(AUDIO_IOCTL_MAGIC, 11, unsigned) @@ -113,6 +116,11 @@ struct msm_audio_config { uint32_t unused[3]; }; +struct msm_audio_stream_config { + uint32_t buffer_size; + uint32_t buffer_count; +}; + struct msm_audio_stats { uint32_t byte_count; uint32_t sample_count; @@ -129,7 +137,7 @@ struct msm_audio_aio_buf { uint32_t buf_len; uint32_t data_len; void *private_data; - unsigned short mfield_sz; /*only useful for data has meta field */ + unsigned short mfield_sz; }; #define SND_IOCTL_MAGIC 's' @@ -148,9 +156,7 @@ struct msm_vol_info { }; struct msm_voicerec_mode { - uint32_t rec_mode; - }; struct msm_snd_device_config { diff --git a/libc/kernel/common/linux/msm_audio_aac.h b/libc/kernel/common/linux/msm_audio_aac.h index 25cf87c..48d9c57 100644 --- a/libc/kernel/common/linux/msm_audio_aac.h +++ b/libc/kernel/common/linux/msm_audio_aac.h @@ -17,6 +17,10 @@ #define AUDIO_SET_AAC_CONFIG _IOW(AUDIO_IOCTL_MAGIC, (AUDIO_MAX_COMMON_IOCTL_NUM+0), unsigned) #define AUDIO_GET_AAC_CONFIG _IOR(AUDIO_IOCTL_MAGIC, (AUDIO_MAX_COMMON_IOCTL_NUM+1), unsigned) +#define AUDIO_SET_AAC_ENC_CONFIG _IOW(AUDIO_IOCTL_MAGIC, (AUDIO_MAX_COMMON_IOCTL_NUM+3), struct msm_audio_aac_enc_config) + +#define AUDIO_GET_AAC_ENC_CONFIG _IOR(AUDIO_IOCTL_MAGIC, (AUDIO_MAX_COMMON_IOCTL_NUM+4), struct msm_audio_aac_enc_config) + #define AUDIO_AAC_FORMAT_ADTS -1 #define AUDIO_AAC_FORMAT_RAW 0x0000 #define AUDIO_AAC_FORMAT_PSUEDO_RAW 0x0001 @@ -63,5 +67,11 @@ struct msm_audio_aac_config { unsigned short channel_configuration; }; -#endif +struct msm_audio_aac_enc_config { + uint32_t channels; + uint32_t sample_rate; + uint32_t bit_rate; + uint32_t stream_format; +}; +#endif |