alsa-lib: pcm.c: fix indentation
PATCH 2/2 alsa-lib: bring pcm.h and pcm.c in sync with the kernel list
In reply to Daniel MackIn particular, this adds definitions and descriptions for G.723 and DSD types.
Signed-off-by Daniel Mack <[email protected]>
--- include/pcm.h | 14 +++++++++++++- src/pcm/pcm.c | 12 ++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-)
include/pcm.h +13 -1
@@ -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 */
src/pcm/pcm.c +12 -0
@@ -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[] = {
Signature · 1 line
1.8.1.4
PATCH 1/2 alsa-lib: pcm.c: fix indentation
Signed-off-by Daniel Mack <[email protected]>
--- src/pcm/pcm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
src/pcm/pcm.c +4 -4
@@ -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), };
Signature · 1 line
1.8.1.4
Takashi Iwai
AppliedAt Thu, 18 Apr 2013 10:37:49 +0200,
Quoted 2 lines · Daniel Mack
Signed-off-by Daniel Mack <[email protected]>
Thanks, applied both now.
Takashi
Quoted 27 lines
--- src/pcm/pcm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)src/pcm/pcm.c +4
-4@@ -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), };Signature · 1 line
1.8.1.4