diff options
| author | QuIC Gerrit Code Review <gerrit@quicinc.com> | 2010-03-04 20:53:18 -0800 |
|---|---|---|
| committer | QuIC Gerrit Code Review <gerrit@quicinc.com> | 2010-03-04 20:53:18 -0800 |
| commit | 96627710d032b51abeb3ba56107411c83c83f1ed (patch) | |
| tree | f904b19d581f89b4205f3a02781a297c14a3d2ed /libc/kernel/common | |
| parent | a1681e305c7f15f42a7f7757be9fac8e567c4f17 (diff) | |
| parent | 1ffafd4f5fc255c61e000774251d5a1adf08672c (diff) | |
| download | bionic-96627710d032b51abeb3ba56107411c83c83f1ed.zip bionic-96627710d032b51abeb3ba56107411c83c83f1ed.tar.gz bionic-96627710d032b51abeb3ba56107411c83c83f1ed.tar.bz2 | |
Merge change I2af7911b into eclair
* changes:
bionic: Add new ioctl and structure for bitstream error feedback feature
Diffstat (limited to 'libc/kernel/common')
| -rw-r--r-- | libc/kernel/common/linux/msm_audio.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libc/kernel/common/linux/msm_audio.h b/libc/kernel/common/linux/msm_audio.h index 64f312e..6447f75 100644 --- a/libc/kernel/common/linux/msm_audio.h +++ b/libc/kernel/common/linux/msm_audio.h @@ -52,6 +52,8 @@ #define AUDIO_STOP_VOICE _IOW(AUDIO_IOCTL_MAGIC, 36, unsigned) #define AUDIO_REINIT_ACDB _IOW(AUDIO_IOCTL_MAGIC, 39, unsigned) #define AUDIO_OUTPORT_FLUSH _IOW(AUDIO_IOCTL_MAGIC, 40, unsigned short) +#define AUDIO_SET_ERR_THRESHOLD_VALUE _IOW(AUDIO_IOCTL_MAGIC, 41, unsigned short) +#define AUDIO_GET_BITSTREAM_ERROR_INFO _IOR(AUDIO_IOCTL_MAGIC, 42, struct msm_audio_bitstream_error_info) #define AUDIO_SET_STREAM_CONFIG _IOW(AUDIO_IOCTL_MAGIC, 80, struct msm_audio_stream_config) #define AUDIO_GET_STREAM_CONFIG _IOR(AUDIO_IOCTL_MAGIC, 81, struct msm_audio_stream_config) @@ -205,6 +207,7 @@ struct msm_audio_pcm_config { #define AUDIO_EVENT_WRITE_DONE 2 #define AUDIO_EVENT_READ_DONE 3 #define AUDIO_EVENT_STREAM_INFO 4 +#define AUDIO_EVENT_BITSTREAM_ERROR_INFO 5 #define AUDIO_CODEC_TYPE_MP3 0 #define AUDIO_CODEC_TYPE_AAC 1 @@ -218,9 +221,16 @@ struct msm_audio_bitstream_info { uint32_t unused[3]; }; +struct msm_audio_bitstream_error_info { + uint32_t dec_id; + uint32_t err_msg_indicator; + uint32_t err_type; +}; + union msm_audio_event_payload { struct msm_audio_aio_buf aio_buf; struct msm_audio_bitstream_info stream_info; + struct msm_audio_bitstream_error_info error_info; int reserved; }; |