asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2024-12-22 23:56:29 +01:00
Code Issues Projects Releases Packages Wiki Activity

speaker-test.c - fix sine generator on big-endian archs

Browse source 
speaker-test doesn't work well when you choose a little-endian format on a
big-endian processor, or the opposite. Yes, I know about plughw:, but for
debugging purposes it may not be an option. The following patch add proper
support for S32 and S16 support for but LE and BE processors:

- The "if (bits-per-sample)" construct was replaced by case (format).
- Support for S16_BE, S32_BE formats was added.
- S16_LE and S32_LE were made compatible with big-endian processors.
- NB: The pink noise generator wasn't changed (I'll do if this patch is OK).

From: Giuliano Pochini <pochini@shiny.it>
This commit is contained in:
Takashi Iwai 2008-04-21 15:19:27 +02:00
parent 8802e85d41
commit 6372f4acc2
1 changed files with 51 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
speaker-test/speaker-test.c
View file

@ -139,7 +139,6 @@ static void generate_sine(uint8_t *frames, int channel, int count, double *_phas
int16_t *samp16 = (int16_t*) frames; int16_t *samp16 = (int16_t*) frames;
int32_t *samp32 = (int32_t*) frames; int32_t *samp32 = (int32_t*) frames;
float *samp_f = (float*) frames; float *samp_f = (float*) frames;
int sample_size_bits = snd_pcm_format_width(format);
while (count-- > 0) { while (count-- > 0) {
//res = sin((phase * 2 * M_PI) / max_phase - M_PI) * 32767; //res = sin((phase * 2 * M_PI) / max_phase - M_PI) * 32767;
@ -154,26 +153,43 @@ static void generate_sine(uint8_t *frames, int channel, int count, double *_phas
//ires = 0; //ires = 0;
for(chn=0;chn<channels;chn++) { for(chn=0;chn<channels;chn++) {
if (sample_size_bits == 8) { switch (format) {
case SND_PCM_FORMAT_S8:
if (chn==channel) { if (chn==channel) {
res = (sin((phase * 2 * M_PI) / max_phase - M_PI)) * 0x03fffffff; /* Don't use MAX volume */ res = (sin((phase * 2 * M_PI) / max_phase - M_PI)) * 0x03fffffff; /* Don't use MAX volume */
ires = res; ires = res;
*samp8++ = ires >> 24; *samp8++ = ires >> 24;
//*samp8++ = 0x12;
} else { } else {
*samp8++ = 0; *samp8++ = 0;
} }
} else if (sample_size_bits == 16) { break;
case SND_PCM_FORMAT_S16_LE:
if (chn==channel) { if (chn==channel) {
res = (sin((phase * 2 * M_PI) / max_phase - M_PI)) * 0x03fffffff; /* Don't use MAX volume */ res = (sin((phase * 2 * M_PI) / max_phase - M_PI)) * 0x03fffffff; /* Don't use MAX volume */
ires = res; ires = res;
*samp16++ = ires >>16; #if __BYTE_ORDER == __LITTLE_ENDIAN
//*samp16++ = 0x1234; *samp16++ = ires >> 16;
#elif __BYTE_ORDER == __BIG_ENDIAN
*samp16++ = bswap_16(ires >> 16);
#endif
} else { } else {
//*samp16++ = (ires >>16)+1;
*samp16++ = 0; *samp16++ = 0;
} }
} else if ((sample_size_bits == 32) && (format == SND_PCM_FORMAT_FLOAT_LE)) { break;
case SND_PCM_FORMAT_S16_BE:
if (chn==channel) {
res = (sin((phase * 2 * M_PI) / max_phase - M_PI)) * 0x03fffffff; /* Don't use MAX volume */
ires = res;
#if __BYTE_ORDER == __BIG_ENDIAN
*samp16++ = ires >> 16;
#elif __BYTE_ORDER == __LITTLE_ENDIAN
*samp16++ = bswap_16(ires >> 16);
#endif
} else {
*samp16++ = 0;
}
break;
case SND_PCM_FORMAT_FLOAT_LE:
if (chn==channel) { if (chn==channel) {
res = (sin((phase * 2 * M_PI) / max_phase - M_PI)) * 0.75 ; /* Don't use MAX volume */ res = (sin((phase * 2 * M_PI) / max_phase - M_PI)) * 0.75 ; /* Don't use MAX volume */
fres = res; fres = res;
@ -185,18 +201,35 @@ static void generate_sine(uint8_t *frames, int channel, int count, double *_phas
//*samp32++ = ires; //*samp32++ = ires;
*samp_f++ = 0.0; *samp_f++ = 0.0;
} }
} else if ((sample_size_bits == 32) && (format != SND_PCM_FORMAT_FLOAT_LE)) { break;
case SND_PCM_FORMAT_S32_LE:
if (chn==channel) { if (chn==channel) {
res = (sin((phase * 2 * M_PI) / max_phase - M_PI)) * 0x03fffffff; /* Don't use MAX volume */ res = (sin((phase * 2 * M_PI) / max_phase - M_PI)) * 0x03fffffff; /* Don't use MAX volume */
ires = res; ires = res;
#if __BYTE_ORDER == __LITTLE_ENDIAN
*samp32++ = ires; *samp32++ = ires;
//*samp32++ = 0xF2345678; #elif __BYTE_ORDER == __BIG_ENDIAN
//printf("res=%lf, ires=%d 0x%x, samp32=0x%x\n",res,ires, ires, samp32[-1]); *samp32++ = bswap_32(ires);
#endif
} else { } else {
//*samp32++ = ires+0x10000;
//*samp32++ = ires;
*samp32++ = 0; *samp32++ = 0;
} }
break;
case SND_PCM_FORMAT_S32_BE:
if (chn==channel) {
res = (sin((phase * 2 * M_PI) / max_phase - M_PI)) * 0x03fffffff; /* Don't use MAX volume */
ires = res;
#if __BYTE_ORDER == __BIG_ENDIAN
*samp32++ = ires;
#elif __BYTE_ORDER == __LITTLE_ENDIAN
*samp32++ = bswap_32(ires);
#endif
} else {
*samp32++ = 0;
}
break;
default:
;
} }
} }