this add new API for sound compress to support gapless playback. As noted in Documentation change, we add API to send metadata of encoder and padding delay to DSP. Also add API for indicating EOF and switching to subsequent track Also bump the compress API version
Showing the changes to include/uapi (1 of 4 files). Show all
Unified · Split
| @@ -30,7 +30,7 @@ · 29 unmodified lines | |||
| 30 | #include <sound/compress_params.h> | 30 | #include <sound/compress_params.h> |
| 31 | 31 | ||
| 32 | 32 | ||
| 33 | #define SNDRV_COMPRESS_VERSION SNDRV_PROTOCOL_VERSION(0, 1, 0) | 33 | #define SNDRV_COMPRESS_VERSION SNDRV_PROTOCOL_VERSION(0, 1, 1) |
| 34 | /** | 34 | /** |
| 35 | * struct snd_compressed_buffer: compressed buffer | 35 | * struct snd_compressed_buffer: compressed buffer |
| 36 | * @fragment_size: size of buffer fragment in bytes | 36 | * @fragment_size: size of buffer fragment in bytes |
| @@ -121,6 +121,27 @@ struct snd_compr_codec_caps { · 84 unmodified lines | |||
| 121 | struct snd_codec_desc descriptor[MAX_NUM_CODEC_DESCRIPTORS]; | 121 | struct snd_codec_desc descriptor[MAX_NUM_CODEC_DESCRIPTORS]; |
| 122 | }; | 122 | }; |
| 123 | 123 | ||
| 124 | /** | ||
| 125 | * @SNDRV_COMPRESS_ENCODER_PADDING: no of samples appended by the encoder at the | ||
| 126 | * end of the track | ||
| 127 | * @SNDRV_COMPRESS_ENCODER_DELAY: no of samples inserted by the encoder at the | ||
| 128 | * beginning of the track | ||
| 129 | */ | ||
| 130 | enum { | ||
| 131 | SNDRV_COMPRESS_ENCODER_PADDING = 1, | ||
| 132 | SNDRV_COMPRESS_ENCODER_DELAY = 2, | ||
| 133 | }; | ||
| 134 | |||
| 135 | /** | ||
| 136 | * struct snd_compr_metadata: compressed stream metadata | ||
| 137 | * @key: key id | ||
| 138 | * @value: key value | ||
| 139 | */ | ||
| 140 | struct snd_compr_metadata { | ||
| 141 | __u32 key; | ||
| 142 | __u32 value[8]; | ||
| 143 | }; | ||
| 144 | |||
| 124 | /** | 145 | /** |
| 125 | * compress path ioctl definitions | 146 | * compress path ioctl definitions |
| 126 | * SNDRV_COMPRESS_GET_CAPS: Query capability of DSP | 147 | * SNDRV_COMPRESS_GET_CAPS: Query capability of DSP |
| @@ -145,6 +166,10 @@ struct snd_compr_codec_caps { · 18 unmodified lines | |||
| 145 | struct snd_compr_codec_caps) | 166 | struct snd_compr_codec_caps) |
| 146 | #define SNDRV_COMPRESS_SET_PARAMS _IOW('C', 0x12, struct snd_compr_params) | 167 | #define SNDRV_COMPRESS_SET_PARAMS _IOW('C', 0x12, struct snd_compr_params) |
| 147 | #define SNDRV_COMPRESS_GET_PARAMS _IOR('C', 0x13, struct snd_codec) | 168 | #define SNDRV_COMPRESS_GET_PARAMS _IOR('C', 0x13, struct snd_codec) |
| 169 | #define SNDRV_COMPRESS_SET_METADATA _IOW('C', 0x14,\ | ||
| 170 | struct snd_compr_metadata) | ||
| 171 | #define SNDRV_COMPRESS_GET_METADATA _IOWR('C', 0x15,\ | ||
| 172 | struct snd_compr_metadata) | ||
| 148 | #define SNDRV_COMPRESS_TSTAMP _IOR('C', 0x20, struct snd_compr_tstamp) | 173 | #define SNDRV_COMPRESS_TSTAMP _IOR('C', 0x20, struct snd_compr_tstamp) |
| 149 | #define SNDRV_COMPRESS_AVAIL _IOR('C', 0x21, struct snd_compr_avail) | 174 | #define SNDRV_COMPRESS_AVAIL _IOR('C', 0x21, struct snd_compr_avail) |
| 150 | #define SNDRV_COMPRESS_PAUSE _IO('C', 0x30) | 175 | #define SNDRV_COMPRESS_PAUSE _IO('C', 0x30) |
| @@ -152,10 +177,14 @@ struct snd_compr_codec_caps { · 1 unmodified line | |||
| 152 | #define SNDRV_COMPRESS_START _IO('C', 0x32) | 177 | #define SNDRV_COMPRESS_START _IO('C', 0x32) |
| 153 | #define SNDRV_COMPRESS_STOP _IO('C', 0x33) | 178 | #define SNDRV_COMPRESS_STOP _IO('C', 0x33) |
| 154 | #define SNDRV_COMPRESS_DRAIN _IO('C', 0x34) | 179 | #define SNDRV_COMPRESS_DRAIN _IO('C', 0x34) |
| 180 | #define SNDRV_COMPRESS_NEXT_TRACK _IO('C', 0x35) | ||
| 181 | #define SNDRV_COMPRESS_PARTIAL_DRAIN _IO('C', 0x36) | ||
| 155 | /* | 182 | /* |
| 156 | * TODO | 183 | * TODO |
| 157 | * 1. add mmap support | 184 | * 1. add mmap support |
| 158 | * | 185 | * |
| 159 | */ | 186 | */ |
| 160 | #define SND_COMPR_TRIGGER_DRAIN 7 /*FIXME move this to pcm.h */ | 187 | #define SND_COMPR_TRIGGER_DRAIN 7 /*FIXME move this to pcm.h */ |
| 188 | #define SND_COMPR_TRIGGER_NEXT_TRACK 8 | ||
| 189 | #define SND_COMPR_TRIGGER_PARTIAL_DRAIN 9 | ||
| 161 | #endif | 190 | #endif |