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 more chmap definitions for UAC2

Browse source 
The new PCM chmap positions have been added in (to be) 3.8-rc1 kernel,
and now updated alsa-lib, too.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2012-11-26 18:10:26 +01:00
parent 9b5beef1dd
commit 67d692af48
3 changed files with 34 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
include/pcm.h
View file

@ -475,7 +475,7 @@ int snd_pcm_link(snd_pcm_t *pcm1, snd_pcm_t *pcm2);
int snd_pcm_unlink(snd_pcm_t *pcm);
/** channel mapping API version number */
#define SND_CHMAP_API_VERSION ((1 << 16) | (0 << 8) | 0)
#define SND_CHMAP_API_VERSION ((1 << 16) | (0 << 8) | 1)
/** channel map list type */
enum snd_pcm_chmap_type {
@ -516,7 +516,16 @@ enum snd_pcm_chmap_position {
SND_CHMAP_TRL, /** top rear left */
SND_CHMAP_TRR, /** top rear right */
SND_CHMAP_TRC, /** top rear center */
SND_CHMAP_LAST = SND_CHMAP_TRC, /** last entry */
SND_CHMAP_TFLC, /* top front left center */
SND_CHMAP_TFRC, /* top front right center */
SND_CHMAP_TSL, /* top side left */
SND_CHMAP_TSR, /* top side right */
SND_CHMAP_LLFE, /* left LFE */
SND_CHMAP_RLFE, /* right LFE */
SND_CHMAP_BC, /* bottom center */
SND_CHMAP_BLC, /* bottom left center */
SND_CHMAP_BRC, /* bottom right center */
SND_CHMAP_LAST = SND_CHMAP_BRC,
};
/** bitmask for channel position */

12
include/sound/asound.h
View file

@ -492,7 +492,17 @@ enum {
SNDRV_CHMAP_TRL, /* top rear left */
SNDRV_CHMAP_TRR, /* top rear right */
SNDRV_CHMAP_TRC, /* top rear center */
SNDRV_CHMAP_LAST = SNDRV_CHMAP_TRC,
/* new definitions for UAC2 */
SNDRV_CHMAP_TFLC, /* top front left center */
SNDRV_CHMAP_TFRC, /* top front right center */
SNDRV_CHMAP_TSL, /* top side left */
SNDRV_CHMAP_TSR, /* top side right */
SNDRV_CHMAP_LLFE, /* left LFE */
SNDRV_CHMAP_RLFE, /* right LFE */
SNDRV_CHMAP_BC, /* bottom center */
SNDRV_CHMAP_BLC, /* bottom left center */
SNDRV_CHMAP_BRC, /* bottom right center */
SNDRV_CHMAP_LAST = SNDRV_CHMAP_BRC,
};
#define SNDRV_CHMAP_POSITION_MASK 0xffff

12
src/pcm/pcm.c
View file

@ -7434,6 +7434,9 @@ static const char *chmap_names[SND_CHMAP_LAST + 1] = {
_NAME(FLH), _NAME(FCH), _NAME(FRH), _NAME(TC),
_NAME(TFL), _NAME(TFR), _NAME(TFC),
_NAME(TRL), _NAME(TRR), _NAME(TRC),
_NAME(TFLC), _NAME(TFRC), _NAME(TSL), _NAME(TSR),
_NAME(LLFE), _NAME(RLFE),
_NAME(BC), _NAME(BLC), _NAME(BRC),
};
#undef _NAME
#endif
@ -7480,6 +7483,15 @@ static const char *chmap_long_names[SND_CHMAP_LAST + 1] = {
[SND_CHMAP_TRL] = "Top Rear Left",
[SND_CHMAP_TRR] = "Top Rear Right",
[SND_CHMAP_TRC] = "Top Rear Center",
[SND_CHMAP_TFLC] = "Top Front Left Center",
[SND_CHMAP_TFRC] = "Top Front Right Center",
[SND_CHMAP_TSL] = "Top Side Left",
[SND_CHMAP_TSR] = "Top Side Right",
[SND_CHMAP_LLFE] = "Left LFE",
[SND_CHMAP_RLFE] = "Right LFE",
[SND_CHMAP_BC] = "Bottom Center",
[SND_CHMAP_BLC] = "Bottom Left Center",
[SND_CHMAP_BRC] = "Bottom Right Center",
};
/**