mirror of
https://github.com/alsa-project/alsa-lib.git
synced 2025-11-03 09:01:52 -05:00
pcm: add and describe SND_PCM_FORMAT_{S, U}20
This patch adds and describes in various functions that query format
properties SND_PCM_FORMAT_{S,U}20 formats that were recently added to the
kernel as SNDRV_PCM_FORMAT_{S,U}20.
These formats are similar to existing 20-bit PCM formats
SND_PCM_FORMAT_{S,U}20_3, however they occupy 4 bytes instead of 3.
Signed-off-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name>
Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Maciej S. Szmigiero
Takashi Iwai
parent
22e6b3c200
commit
d67e42c139
4 changed files with 70 additions and 5 deletions
|
|
@ -1780,6 +1780,10 @@ static const char *const snd_pcm_format_names[] = {
|
|||
FORMAT(IMA_ADPCM),
|
||||
FORMAT(MPEG),
|
||||
FORMAT(GSM),
|
||||
FORMAT(S20_LE),
|
||||
FORMAT(S20_BE),
|
||||
FORMAT(U20_LE),
|
||||
FORMAT(U20_BE),
|
||||
FORMAT(SPECIAL),
|
||||
FORMAT(S24_3LE),
|
||||
FORMAT(S24_3BE),
|
||||
|
|
@ -1814,6 +1818,8 @@ static const char *const snd_pcm_format_aliases[SND_PCM_FORMAT_LAST+1] = {
|
|||
FORMAT(FLOAT),
|
||||
FORMAT(FLOAT64),
|
||||
FORMAT(IEC958_SUBFRAME),
|
||||
FORMAT(S20),
|
||||
FORMAT(U20),
|
||||
};
|
||||
|
||||
static const char *const snd_pcm_format_descriptions[] = {
|
||||
|
|
@ -1842,6 +1848,10 @@ static const char *const snd_pcm_format_descriptions[] = {
|
|||
FORMATD(IMA_ADPCM, "Ima-ADPCM"),
|
||||
FORMATD(MPEG, "MPEG"),
|
||||
FORMATD(GSM, "GSM"),
|
||||
FORMATD(S20_LE, "Signed 20 bit Little Endian in 4 bytes, LSB justified"),
|
||||
FORMATD(S20_BE, "Signed 20 bit Big Endian in 4 bytes, LSB justified"),
|
||||
FORMATD(U20_LE, "Unsigned 20 bit Little Endian in 4 bytes, LSB justified"),
|
||||
FORMATD(U20_BE, "Unsigned 20 bit Big Endian in 4 bytes, LSB justified"),
|
||||
FORMATD(SPECIAL, "Special"),
|
||||
FORMATD(S24_3LE, "Signed 24 bit Little Endian in 3bytes"),
|
||||
FORMATD(S24_3BE, "Signed 24 bit Big Endian in 3bytes"),
|
||||
|
|
|
|||
|
|
@ -984,6 +984,10 @@ const snd_config_t *snd_pcm_rate_get_default_converter(snd_config_t *root);
|
|||
(1U << SND_PCM_FORMAT_S16_BE) | \
|
||||
(1U << SND_PCM_FORMAT_U16_LE) | \
|
||||
(1U << SND_PCM_FORMAT_U16_BE) | \
|
||||
(1U << SND_PCM_FORMAT_S20_LE) | \
|
||||
(1U << SND_PCM_FORMAT_S20_BE) | \
|
||||
(1U << SND_PCM_FORMAT_U20_LE) | \
|
||||
(1U << SND_PCM_FORMAT_U20_BE) | \
|
||||
(1U << SND_PCM_FORMAT_S24_LE) | \
|
||||
(1U << SND_PCM_FORMAT_S24_BE) | \
|
||||
(1U << SND_PCM_FORMAT_U24_LE) | \
|
||||
|
|
|
|||
|
|
@ -38,6 +38,8 @@ int snd_pcm_format_signed(snd_pcm_format_t format)
|
|||
case SNDRV_PCM_FORMAT_S8:
|
||||
case SNDRV_PCM_FORMAT_S16_LE:
|
||||
case SNDRV_PCM_FORMAT_S16_BE:
|
||||
case SNDRV_PCM_FORMAT_S20_LE:
|
||||
case SNDRV_PCM_FORMAT_S20_BE:
|
||||
case SNDRV_PCM_FORMAT_S24_LE:
|
||||
case SNDRV_PCM_FORMAT_S24_BE:
|
||||
case SNDRV_PCM_FORMAT_S32_LE:
|
||||
|
|
@ -52,6 +54,8 @@ int snd_pcm_format_signed(snd_pcm_format_t format)
|
|||
case SNDRV_PCM_FORMAT_U8:
|
||||
case SNDRV_PCM_FORMAT_U16_LE:
|
||||
case SNDRV_PCM_FORMAT_U16_BE:
|
||||
case SNDRV_PCM_FORMAT_U20_LE:
|
||||
case SNDRV_PCM_FORMAT_U20_BE:
|
||||
case SNDRV_PCM_FORMAT_U24_LE:
|
||||
case SNDRV_PCM_FORMAT_U24_BE:
|
||||
case SNDRV_PCM_FORMAT_U32_LE:
|
||||
|
|
@ -126,6 +130,8 @@ int snd_pcm_format_little_endian(snd_pcm_format_t format)
|
|||
switch (format) {
|
||||
case SNDRV_PCM_FORMAT_S16_LE:
|
||||
case SNDRV_PCM_FORMAT_U16_LE:
|
||||
case SNDRV_PCM_FORMAT_S20_LE:
|
||||
case SNDRV_PCM_FORMAT_U20_LE:
|
||||
case SNDRV_PCM_FORMAT_S24_LE:
|
||||
case SNDRV_PCM_FORMAT_U24_LE:
|
||||
case SNDRV_PCM_FORMAT_S32_LE:
|
||||
|
|
@ -144,6 +150,8 @@ int snd_pcm_format_little_endian(snd_pcm_format_t format)
|
|||
return 1;
|
||||
case SNDRV_PCM_FORMAT_S16_BE:
|
||||
case SNDRV_PCM_FORMAT_U16_BE:
|
||||
case SNDRV_PCM_FORMAT_S20_BE:
|
||||
case SNDRV_PCM_FORMAT_U20_BE:
|
||||
case SNDRV_PCM_FORMAT_S24_BE:
|
||||
case SNDRV_PCM_FORMAT_U24_BE:
|
||||
case SNDRV_PCM_FORMAT_S32_BE:
|
||||
|
|
@ -218,6 +226,10 @@ int snd_pcm_format_width(snd_pcm_format_t format)
|
|||
case SNDRV_PCM_FORMAT_U18_3LE:
|
||||
case SNDRV_PCM_FORMAT_U18_3BE:
|
||||
return 18;
|
||||
case SNDRV_PCM_FORMAT_S20_LE:
|
||||
case SNDRV_PCM_FORMAT_S20_BE:
|
||||
case SNDRV_PCM_FORMAT_U20_LE:
|
||||
case SNDRV_PCM_FORMAT_U20_BE:
|
||||
case SNDRV_PCM_FORMAT_S20_3LE:
|
||||
case SNDRV_PCM_FORMAT_S20_3BE:
|
||||
case SNDRV_PCM_FORMAT_U20_3LE:
|
||||
|
|
@ -289,6 +301,10 @@ int snd_pcm_format_physical_width(snd_pcm_format_t format)
|
|||
case SNDRV_PCM_FORMAT_U24_3LE:
|
||||
case SNDRV_PCM_FORMAT_U24_3BE:
|
||||
return 24;
|
||||
case SNDRV_PCM_FORMAT_S20_LE:
|
||||
case SNDRV_PCM_FORMAT_S20_BE:
|
||||
case SNDRV_PCM_FORMAT_U20_LE:
|
||||
case SNDRV_PCM_FORMAT_U20_BE:
|
||||
case SNDRV_PCM_FORMAT_S24_LE:
|
||||
case SNDRV_PCM_FORMAT_S24_BE:
|
||||
case SNDRV_PCM_FORMAT_U24_LE:
|
||||
|
|
@ -350,6 +366,10 @@ ssize_t snd_pcm_format_size(snd_pcm_format_t format, size_t samples)
|
|||
case SNDRV_PCM_FORMAT_U24_3LE:
|
||||
case SNDRV_PCM_FORMAT_U24_3BE:
|
||||
return samples * 3;
|
||||
case SNDRV_PCM_FORMAT_S20_LE:
|
||||
case SNDRV_PCM_FORMAT_S20_BE:
|
||||
case SNDRV_PCM_FORMAT_U20_LE:
|
||||
case SNDRV_PCM_FORMAT_U20_BE:
|
||||
case SNDRV_PCM_FORMAT_S24_LE:
|
||||
case SNDRV_PCM_FORMAT_S24_BE:
|
||||
case SNDRV_PCM_FORMAT_U24_LE:
|
||||
|
|
@ -393,6 +413,8 @@ uint64_t snd_pcm_format_silence_64(snd_pcm_format_t format)
|
|||
case SNDRV_PCM_FORMAT_S8:
|
||||
case SNDRV_PCM_FORMAT_S16_LE:
|
||||
case SNDRV_PCM_FORMAT_S16_BE:
|
||||
case SNDRV_PCM_FORMAT_S20_LE:
|
||||
case SNDRV_PCM_FORMAT_S20_BE:
|
||||
case SNDRV_PCM_FORMAT_S24_LE:
|
||||
case SNDRV_PCM_FORMAT_S24_BE:
|
||||
case SNDRV_PCM_FORMAT_S32_LE:
|
||||
|
|
@ -415,12 +437,16 @@ uint64_t snd_pcm_format_silence_64(snd_pcm_format_t format)
|
|||
#ifdef SNDRV_LITTLE_ENDIAN
|
||||
case SNDRV_PCM_FORMAT_U16_LE:
|
||||
return 0x8000800080008000ULL;
|
||||
case SNDRV_PCM_FORMAT_U20_LE:
|
||||
return 0x0008000000080000ULL;
|
||||
case SNDRV_PCM_FORMAT_U24_LE:
|
||||
return 0x0080000000800000ULL;
|
||||
case SNDRV_PCM_FORMAT_U32_LE:
|
||||
return 0x8000000080000000ULL;
|
||||
case SNDRV_PCM_FORMAT_U16_BE:
|
||||
return 0x0080008000800080ULL;
|
||||
case SNDRV_PCM_FORMAT_U20_BE:
|
||||
return 0x0000080000000800ULL;
|
||||
case SNDRV_PCM_FORMAT_U24_BE:
|
||||
return 0x0000800000008000ULL;
|
||||
case SNDRV_PCM_FORMAT_U32_BE:
|
||||
|
|
@ -440,12 +466,16 @@ uint64_t snd_pcm_format_silence_64(snd_pcm_format_t format)
|
|||
#else
|
||||
case SNDRV_PCM_FORMAT_U16_LE:
|
||||
return 0x0080008000800080ULL;
|
||||
case SNDRV_PCM_FORMAT_U20_LE:
|
||||
return 0x0000080000000800ULL;
|
||||
case SNDRV_PCM_FORMAT_U24_LE:
|
||||
return 0x0000800000008000ULL;
|
||||
case SNDRV_PCM_FORMAT_U32_LE:
|
||||
return 0x0000008000000080ULL;
|
||||
case SNDRV_PCM_FORMAT_U16_BE:
|
||||
return 0x8000800080008000ULL;
|
||||
case SNDRV_PCM_FORMAT_U20_BE:
|
||||
return 0x0008000000080000ULL;
|
||||
case SNDRV_PCM_FORMAT_U24_BE:
|
||||
return 0x0080000000800000ULL;
|
||||
case SNDRV_PCM_FORMAT_U32_BE:
|
||||
|
|
@ -653,11 +683,13 @@ int snd_pcm_format_set_silence(snd_pcm_format_t format, void *data, unsigned int
|
|||
return 0;
|
||||
}
|
||||
|
||||
static const int linear_formats[4][2][2] = {
|
||||
static const int linear_formats[5][2][2] = {
|
||||
{ { SNDRV_PCM_FORMAT_S8, SNDRV_PCM_FORMAT_S8 },
|
||||
{ SNDRV_PCM_FORMAT_U8, SNDRV_PCM_FORMAT_U8 } },
|
||||
{ { SNDRV_PCM_FORMAT_S16_LE, SNDRV_PCM_FORMAT_S16_BE },
|
||||
{ SNDRV_PCM_FORMAT_U16_LE, SNDRV_PCM_FORMAT_U16_BE } },
|
||||
{ { SNDRV_PCM_FORMAT_S20_LE, SNDRV_PCM_FORMAT_S20_BE },
|
||||
{ SNDRV_PCM_FORMAT_U20_LE, SNDRV_PCM_FORMAT_U20_BE } },
|
||||
{ { SNDRV_PCM_FORMAT_S24_LE, SNDRV_PCM_FORMAT_S24_BE },
|
||||
{ SNDRV_PCM_FORMAT_U24_LE, SNDRV_PCM_FORMAT_U24_BE } },
|
||||
{ { SNDRV_PCM_FORMAT_S32_LE, SNDRV_PCM_FORMAT_S32_BE },
|
||||
|
|
@ -706,12 +738,15 @@ snd_pcm_format_t snd_pcm_build_linear_format(int width, int pwidth, int unsignd,
|
|||
case 16:
|
||||
width = 1;
|
||||
break;
|
||||
case 24:
|
||||
case 20:
|
||||
width = 2;
|
||||
break;
|
||||
case 32:
|
||||
case 24:
|
||||
width = 3;
|
||||
break;
|
||||
case 32:
|
||||
width = 4;
|
||||
break;
|
||||
default:
|
||||
return SND_PCM_FORMAT_UNKNOWN;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue