mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-10-29 05:40:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

pcm: Add MSBITS subformat options

Browse source 
Improve granularity of format selection for S32/U32 formats by adding
masks representing 20, 24 and 32 most significant bits.

Closes: https://github.com/alsa-project/alsa-lib/pull/342
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Cezary Rojewski 2023-08-04 10:13:40 +02:00 • committed by Jaroslav Kysela
parent f33284e85e
commit d8000f57fc
4 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/pcm.h
View file

@ -286,7 +286,13 @@ typedef enum _snd_pcm_subformat {
SND_PCM_SUBFORMAT_UNKNOWN = -1, SND_PCM_SUBFORMAT_UNKNOWN = -1,
/** Standard */ /** Standard */
SND_PCM_SUBFORMAT_STD = 0, SND_PCM_SUBFORMAT_STD = 0,
SND_PCM_SUBFORMAT_LAST = SND_PCM_SUBFORMAT_STD /** Maximum bits based on PCM format */
SND_PCM_SUBFORMAT_MSBITS_MAX = 1,
/** 20 most significant bits */
SND_PCM_SUBFORMAT_MSBITS_20 = 2,
/** 24 most significant bits */
SND_PCM_SUBFORMAT_MSBITS_24 = 3,
SND_PCM_SUBFORMAT_LAST = SND_PCM_SUBFORMAT_MSBITS_24
} snd_pcm_subformat_t; } snd_pcm_subformat_t;
/** PCM state */ /** PCM state */

5
include/sound/uapi/asound.h
View file

@ -274,7 +274,10 @@ typedef int __bitwise snd_pcm_format_t;
typedef int __bitwise snd_pcm_subformat_t; typedef int __bitwise snd_pcm_subformat_t;
#define SNDRV_PCM_SUBFORMAT_STD ((snd_pcm_subformat_t) 0) #define SNDRV_PCM_SUBFORMAT_STD ((snd_pcm_subformat_t) 0)
#define SNDRV_PCM_SUBFORMAT_LAST SNDRV_PCM_SUBFORMAT_STD #define SNDRV_PCM_SUBFORMAT_MSBITS_MAX ((snd_pcm_subformat_t) 1)
#define SNDRV_PCM_SUBFORMAT_MSBITS_20 ((snd_pcm_subformat_t) 2)
#define SNDRV_PCM_SUBFORMAT_MSBITS_24 ((snd_pcm_subformat_t) 3)
#define SNDRV_PCM_SUBFORMAT_LAST SNDRV_PCM_SUBFORMAT_MSBITS_24
#define SNDRV_PCM_INFO_MMAP 0x00000001 /* hardware supports mmap */ #define SNDRV_PCM_INFO_MMAP 0x00000001 /* hardware supports mmap */
#define SNDRV_PCM_INFO_MMAP_VALID 0x00000002 /* period data are valid during transfer */ #define SNDRV_PCM_INFO_MMAP_VALID 0x00000002 /* period data are valid during transfer */

6
src/pcm/pcm.c
View file

@ -2070,10 +2070,16 @@ static const char *const snd_pcm_type_names[] = {
static const char *const snd_pcm_subformat_names[] = { static const char *const snd_pcm_subformat_names[] = {
SUBFORMAT(STD), SUBFORMAT(STD),
SUBFORMAT(MSBITS_MAX),
SUBFORMAT(MSBITS_20),
SUBFORMAT(MSBITS_24),
}; };
static const char *const snd_pcm_subformat_descriptions[] = { static const char *const snd_pcm_subformat_descriptions[] = {
SUBFORMATD(STD, "Standard"), SUBFORMATD(STD, "Standard"),
SUBFORMATD(MSBITS_MAX, "Maximum based on PCM format"),
SUBFORMATD(MSBITS_20, "20 most significant bits"),
SUBFORMATD(MSBITS_24, "24 most significant bits"),
}; };
static const char *const snd_pcm_start_mode_names[] = { static const char *const snd_pcm_start_mode_names[] = {

5
src/pcm/pcm_params.c
View file

@ -2008,7 +2008,10 @@ static const snd_mask_t refine_masks[SND_PCM_HW_PARAM_LAST_MASK - SND_PCM_HW_PAR
}, },
[SND_PCM_HW_PARAM_SUBFORMAT - SND_PCM_HW_PARAM_FIRST_MASK] = { [SND_PCM_HW_PARAM_SUBFORMAT - SND_PCM_HW_PARAM_FIRST_MASK] = {
.bits = { .bits = {
PCM_BIT(SNDRV_PCM_SUBFORMAT_STD) PCM_BIT(SNDRV_PCM_SUBFORMAT_STD) |
PCM_BIT(SNDRV_PCM_SUBFORMAT_MSBITS_MAX) |
PCM_BIT(SNDRV_PCM_SUBFORMAT_MSBITS_20) |
PCM_BIT(SNDRV_PCM_SUBFORMAT_MSBITS_24),
}, },
}, },
}; };