* [PATCH 2/2] alsa-lib: bring pcm.h and pcm.c in sync with the kernel list
2013-04-18 8:37 [PATCH 1/2] alsa-lib: pcm.c: fix indentation Daniel Mack
@ 2013-04-18 8:37 ` Daniel Mack
2013-04-18 9:50 ` [PATCH 1/2] alsa-lib: pcm.c: fix indentation Takashi Iwai
1 sibling, 0 replies; 4+ messages in thread
From: Daniel Mack @ 2013-04-18 8:37 UTC (permalink / raw)
To: alsa-devel; +Cc: tiwai, Daniel Mack
In particular, this adds definitions and descriptions for G.723 and
DSD types.
Signed-off-by: Daniel Mack <zonque@gmail.com>
---
include/pcm.h | 14 +++++++++++++-
src/pcm/pcm.c | 12 ++++++++++++
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/include/pcm.h b/include/pcm.h
index 2235678..fc0cfea 100644
--- a/include/pcm.h
+++ b/include/pcm.h
@@ -199,7 +199,19 @@ typedef enum _snd_pcm_format {
SND_PCM_FORMAT_U18_3LE,
/** Unsigned 18bit Big Endian in 3bytes format */
SND_PCM_FORMAT_U18_3BE,
- SND_PCM_FORMAT_LAST = SND_PCM_FORMAT_U18_3BE,
+ /* G.723 (ADPCM) 24 kbit/s, 8 samples in 3 bytes */
+ SND_PCM_FORMAT_G723_24,
+ /* G.723 (ADPCM) 24 kbit/s, 1 sample in 1 byte */
+ SND_PCM_FORMAT_G723_24_1B,
+ /* G.723 (ADPCM) 40 kbit/s, 8 samples in 3 bytes */
+ SND_PCM_FORMAT_G723_40,
+ /* G.723 (ADPCM) 40 kbit/s, 1 sample in 1 byte */
+ SND_PCM_FORMAT_G723_40_1B,
+ /* Direct Stream Digital (DSD) in 1-byte samples (x8) */
+ SND_PCM_FORMAT_DSD_U8,
+ /* Direct Stream Digital (DSD) in 2-byte samples (x16) */
+ SND_PCM_FORMAT_DSD_U16_LE,
+ SND_PCM_FORMAT_LAST = SND_PCM_FORMAT_DSD_U16_LE,
#if __BYTE_ORDER == __LITTLE_ENDIAN
/** Signed 16 bit CPU endian */
diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c
index 2963711..8d7b67d 100644
--- a/src/pcm/pcm.c
+++ b/src/pcm/pcm.c
@@ -1554,6 +1554,12 @@ static const char *const snd_pcm_format_names[] = {
FORMAT(S18_3BE),
FORMAT(U18_3LE),
FORMAT(U18_3BE),
+ FORMAT(G723_24),
+ FORMAT(G723_24_1B),
+ FORMAT(G723_40),
+ FORMAT(G723_40_1B),
+ FORMAT(DSD_U8),
+ FORMAT(DSD_U16_LE),
};
static const char *const snd_pcm_format_aliases[SND_PCM_FORMAT_LAST+1] = {
@@ -1607,6 +1613,12 @@ static const char *const snd_pcm_format_descriptions[] = {
FORMATD(S18_3BE, "Signed 18 bit Big Endian in 3bytes"),
FORMATD(U18_3LE, "Unsigned 18 bit Little Endian in 3bytes"),
FORMATD(U18_3BE, "Unsigned 18 bit Big Endian in 3bytes"),
+ FORMATD(G723_24, "G.723 (ADPCM) 24 kbit/s, 8 samples in 3 bytes"),
+ FORMATD(G723_24_1B, "G.723 (ADPCM) 24 kbit/s, 1 sample in 1 byte"),
+ FORMATD(G723_40, "G.723 (ADPCM) 40 kbit/s, 8 samples in 3 bytes"),
+ FORMATD(G723_40_1B, "G.723 (ADPCM) 40 kbit/s, 1 sample in 1 byte"),
+ FORMATD(DSD_U8, "Direct Stream Digital, 1-byte (x8), oldest bit in MSB"),
+ FORMATD(DSD_U16_LE, "Direct Stream Digital, 2-byte (x16), little endian, oldest bits in MSB"),
};
static const char *const snd_pcm_type_names[] = {
--
1.8.1.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 1/2] alsa-lib: pcm.c: fix indentation
2013-04-18 8:37 [PATCH 1/2] alsa-lib: pcm.c: fix indentation Daniel Mack
2013-04-18 8:37 ` [PATCH 2/2] alsa-lib: bring pcm.h and pcm.c in sync with the kernel list Daniel Mack
@ 2013-04-18 9:50 ` Takashi Iwai
1 sibling, 0 replies; 4+ messages in thread
From: Takashi Iwai @ 2013-04-18 9:50 UTC (permalink / raw)
To: Daniel Mack; +Cc: alsa-devel
At Thu, 18 Apr 2013 10:37:49 +0200,
Daniel Mack wrote:
>
> Signed-off-by: Daniel Mack <zonque@gmail.com>
Thanks, applied both now.
Takashi
> ---
> src/pcm/pcm.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c
> index 05737d9..2963711 100644
> --- a/src/pcm/pcm.c
> +++ b/src/pcm/pcm.c
> @@ -1634,11 +1634,11 @@ static const char *const snd_pcm_type_names[] = {
> PCMTYPE(LADSPA),
> PCMTYPE(DMIX),
> PCMTYPE(JACK),
> - PCMTYPE(DSNOOP),
> - PCMTYPE(IEC958),
> + PCMTYPE(DSNOOP),
> + PCMTYPE(IEC958),
> PCMTYPE(SOFTVOL),
> - PCMTYPE(IOPLUG),
> - PCMTYPE(EXTPLUG),
> + PCMTYPE(IOPLUG),
> + PCMTYPE(EXTPLUG),
> PCMTYPE(MMAP_EMUL),
> };
>
> --
> 1.8.1.4
>
^ permalink raw reply [flat|nested] 4+ messages in thread