- Alsa-devel - mailman.alsa-project.org

Re: [alsa-devel] hda-intel: no soundcard with current linus' git tree
by Maxim Levitsky 17 Oct '07

17 Oct '07

On Wednesday 17 October 2007 00:18:42 Thomas Meyer wrote: > $ dmesg > > [schnipp] > > ACPI: PCI Interrupt 0000:00:1b.0[A] -> GSI 22 (level, low) -> IRQ 21 > PCI: Enabling bus mastering for device 0000:00:1b.0 > PCI: Setting latency timer of device 0000:00:1b.0 to 64 > hda_codec: STAC922x, Apple subsys_id=106b0200 > ACPI: PCI interrupt for device 0000:00:1b.0 disabled > HDA Intel: probe of 0000:00:1b.0 failed with error -16 > > [schnipp] > > > - > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo(a)vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ > Please bisect this (the alsa merge happened just short time ago) Which kernel did work? Best regards, Maxim Levitsky

1 0

[alsa-devel] About the buffer_time and period_time
by Fengwei Yin 17 Oct '07

17 Oct '07

Hi all, I met a problem about period_time/buffer_time on PXA with ASOC enabled. The kernel version is 2.6.21. The Audio stream is 32k which is not supported by PXA ASOC driver. Please refer following RATES definition for PXA2xx. #define PXA2XX_AC97_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |\ SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_44100 | \ SNDRV_PCM_RATE_48000) So I set plughw as default ALSA device enable auto samplerate conversion. The code to set the period_time/buffer_time is as following: err = snd_pcm_hw_params_set_rate_near(hPCM, params, &rate, 0); if (err < 0) { error("Rate not available: %d\n", rate); return err; } err = snd_pcm_hw_params_get_buffer_time_max(params, &buffer_time, 0); if (buffer_time > 500000) buffer_time = 500000; buffer_time = 400000; period_time = buffer_time/4; err = snd_pcm_hw_params_set_buffer_time_near(hPCM, params, &buffer_time, 0); if (err < 0) { error("Buffer time not available: %d, error number: %d\n", buffer_time, err); return err; } err = snd_pcm_hw_params_set_period_time_near(hPCM, params, &period_time, 0); if (err < 0) { error("Period time not available: %d\n", period_time); return err; } If I set buffer_time to 400000, I will get: " Buffer time not available: 400000, error number: -22 Cannot init audio driver. Floating point exception " If I set buffer time to 500000, buffer_time can be set correctly. But audio playback failed. If I set period_time before setting buffer_time, Everything is OK. Any thought about this problem. Thanks. Regards Yin, Fengwei

2 2

[alsa-devel] Intel HDA digital out distortion
by pr0t0cod7 16 Oct '07

16 Oct '07

Hi, On Monday 23 July 2007 23:09:24 Ingmar Stieger wrote: > a couple of weeks ago, I bought an ASUS mainboard with integrated > Intel > HDA and an AD1988B codec. Unfortunately, the digital / SPDIF output > gets distorted with stock 1.0.14 drivers. It does not matter what the > volume levels of the various mixers are set to. I have the same issues. Any sound is distorted through spdif output (seems more pronounced with low frequencies.) Sound is not distorted: - using passthough (playing AC3) - when volume is set to the very minimal (no perceptible distortion) - with analog output My motherboard: ASUS P5B deluxe with integrated soundchip Kernel: 2.6.22 Alsa: Intel HD audio kernel built module asound.conf: http://pastebin.com/f2c54b47b > I think I might have found the source for this problem. Maybe it's > only a workaround, but it solved the issue and digital out now works > fine for me, so I thought I'd share. The patch worked for me, no more distortion :) Thanks for sharing, Alex.

2 2

[alsa-devel] fsc esprimo v5505 (snd_intel_hda) - output in /var/log/messages
by Jan-Simon Möller 16 Oct '07

16 Oct '07

Hi! What do these messages mean ? Oct 15 09:26:22 legolas kernel: ALSA sound/pci/hda/hda_intel.c:1185: azx_pcm_prepare: bufsize=0x10000, fragsize=0x1000, format=0x11 Oct 15 09:26:22 legolas kernel: ALSA sound/pci/hda/hda_codec.c:623: hda_codec_setup_stream: NID=0x13, stream=0x5, channel=0, format=0x11 Oct 15 09:26:22 legolas kernel: ALSA sound/pci/hda/hda_codec.c:623: hda_codec_setup_stream: NID=0x19, stream=0x5, channel=0, format=0x11 Oct 15 09:26:22 legolas kernel: ALSA sound/pci/hda/hda_codec.c:623: hda_codec_setup_stream: NID=0x19, stream=0x0, channel=0, format=0x0 Oct 15 09:26:22 legolas kernel: ALSA sound/pci/hda/hda_codec.c:623: hda_codec_setup_stream: NID=0x13, stream=0x0, channel=0, format=0x0 Oct 15 09:26:22 legolas kernel: ALSA sound/pci/hda/hda_intel.c:1185: azx_pcm_prepare: bufsize=0x10000, fragsize=0x1000, format=0x11 Oct 15 09:26:22 legolas kernel: ALSA sound/pci/hda/hda_codec.c:623: hda_codec_setup_stream: NID=0x13, stream=0x5, channel=0, format=0x11 Oct 15 09:26:22 legolas kernel: ALSA sound/pci/hda/hda_codec.c:623: hda_codec_setup_stream: NID=0x19, stream=0x5, channel=0, format=0x11 Oct 15 09:26:22 legolas kernel: ALSA sound/pci/hda/hda_codec.c:623: hda_codec_setup_stream: NID=0x19, stream=0x0, channel=0, format=0x0 Oct 15 09:26:22 legolas kernel: ALSA sound/pci/hda/hda_codec.c:623: hda_codec_setup_stream: NID=0x13, stream=0x0, channel=0, format=0x0 Thanks ! Jan

2 1

Re: [alsa-devel] [Alsa-user] How to get set/fixed sample rate of ALSA device?
by Rene Herman 16 Oct '07

16 Oct '07

On 10/07/2007 07:04 PM, Peteris Krisjanis wrote: >> "Current sample rate" only has meaning with the device open , and if I >> understand you right, a "cat >> /proc/asound/card0/pcm0{p,c}/sub0/hw_params will then get you what you >> want as to the "get" part (substitute for 0 in the above as required). > > I actually meant what kind of sample rate is set in sound card. For > example, my onboard sound card has fixed Hz. I would like to know such > information _before_ I touch sound card :) Okay, you want the information that the driver author supplied in the struct snd_pcm_hardware for the stream. I've in fact also wanted that information on a number of occasions and just looked at the driver source then. > So you suggest to open device via any means and then read that file? I > did this and it works. > I guess I can even try to implement it in app and check for sample > rate everytime before I play. > > But is this only solution? It's rather hack, and I would like to have > more reliable method. You might consider this less of of a hack -- it uses the ALSA API to query the information from the PCM handle directly. Please see the library docoumentation for other information you can extract from a hw_params struct. (I don't suppose you can ever get anything but dir == 0 for "hw" devices). Introducing a /proc/asound/card0/pcm0{p,c}/hw_limits or similar might not be a bad idea though? Rene /* gcc -W -Wall -o snd_rate snd_rate.c -l asound */ #include <stdio.h> #include <alsa/asoundlib.h> int main(void) { snd_pcm_t *handle; snd_pcm_hw_params_t *params; unsigned int val; int dir; int err; snd_pcm_hw_params_alloca(&params); err = snd_pcm_open(&handle, "hw:0,0", SND_PCM_STREAM_PLAYBACK, 0); if (err < 0) { fprintf(stderr, "snd_pcm_open: %s\n", snd_strerror(err)); return -1; } err = snd_pcm_hw_params_any(handle, params); if (err < 0) { fprintf(stderr, "snd_pcm_hw_params_any: %s\n", snd_strerror(err)); return -1; } err = snd_pcm_hw_params_get_rate_min(params, &val, &dir); if (err < 0) { fprintf(stderr, "snd_pcm_hw_params_get_rate_min: %s\n", snd_strerror(err)); return -1; } printf("min: (%c) %u\n", "<=>"[dir + 1], val); err = snd_pcm_hw_params_get_rate_max(params, &val, &dir); if (err < 0) { fprintf(stderr, "snd_pcm_hw_params_get_rate_max: %s\n", snd_strerror(err)); return -1; } printf("max: (%c) %u\n", "<=>"[dir + 1], val); snd_pcm_close(handle); return 0; }

4 7

[alsa-devel] intel-hda patch for Dell Latitude D531
by glogow＠fbihome.de 16 Oct '07

16 Oct '07

Hi I have attached three files to this mail: 1. patch_sigmatel.c.diff I have a Latitude D531 which has a ATI SB600 with a STAC 9205. The chip is detected, but no config was read with the latest drivers. The problems are the dmic_nids arrays, which are ignored for auto config lookup. This calles is_in_nid_list, which expects a 0 terminated list, but these arrays are not. Additionally I updated the dell_9205_m43_pin_configs with values from the latest win drivers. 2. create_dell_tables.pl When looking into the ini files and comparing the nids and config values of the various tables, I got really confused, so I wrote a litte script to extract the values and build the table. This is the extended version, after I got my sound working. It extracts all pin infos from all ini files, generates the apropriate tables and prepends the Version.txt from the driver, resultiung in a kind of C header. Maybe it's usefull for you. 3. patch_sigmatel_dell.h Output from running create_dell_tables.pl on the latest drivers for my D531 from Dell. HTH Jan-Marek Glogowski ---------------------------------------------------------------- This message was sent using IMP, the Internet Messaging Program.

3 3

[alsa-devel] ALSA 1.0.15 final
by Jaroslav Kysela 16 Oct '07

16 Oct '07

Hello all, delayed but ... all ALSA packages 1.0.15 final are available for download on http://www.alsa-project.org . The changelog is available on web for 1.0.14 -> 1.0.15. I will make also available 1.0.15rc3 -> 1.0.15 changelog in next few hours. Have fun, Jaroslav ----- Jaroslav Kysela <perex(a)perex.cz> Linux Kernel Sound Maintainer ALSA Project

1 0

[alsa-devel] How to detect 'dead air' while recording?
by william estrada 16 Oct '07

16 Oct '07

Hi group, I want to filter out 'dead air' while recording. What is the best way to do this? I don't want to use JACK, just ALSA. Any URLs? -- William Estrada MrUmunhum(a)popdial.com Mt-Umunhum-Wireless.net ( http://Mt-Umunhum-Wireless.net ) Ymessenger: MrUmunhum

1 0

[alsa-devel] LGPL Licensing
by WOODEN John 15 Oct '07

15 Oct '07

I wish to use either the ALSA or SALSA API within my application. I also intend to commercially distribute my application and sell it. What affect does ALSA's and/or SALSA's Lesser GPL license have upon applications that utilize their API's? Do I have to make the source code of my application freely available if I choose to utilize the ALSA or SALSA API? Thanks, John. IMPORTANT NOTICE: This e-mail and any attachment to it are intended only to be read or used by the named addressee. It is confidential and may contain legally privileged information. No confidentiality or privilege is waived or lost by any mistaken transmission to you. The RTA is not responsible for any unauthorised alterations to this e-mail or attachment to it. Views expressed in this message are those of the individual sender, and are not necessarily the views of the RTA. If you receive this e-mail in error, please immediately delete it from your system and notify the sender. You must not disclose, copy or use any part of this e-mail if you are not the intended recipient.

2 1

Re: [alsa-devel] [Pkg-alsa-devel] Bug#429326: Bug#437827: libasound2: Sound creaks badly when playing DVDs or OGG files
by Elimar Riesebieter 15 Oct '07

15 Oct '07

forwarded 429326 alsa-devel(a)alsa-project.org thanks On Sun, 14 Oct 2007 the mental interface of Loïc Minier told: > On Sun, Oct 14, 2007, Elimar Riesebieter wrote: > > From my point of view it is not reasonable to patch Debian packages, > > which of course will break 32bit only sound cards. So we've to find > > a way to force a solution directly on alsa-devel. Who will forward > > the _Debian_bug to alsa-devel(a)alsa-project.org ? > > I don't understand your remark about patching the Debian package? Why > would reverting the bit shift macros break anything? > > The attached patch for alsa-lib should be enough to fix this, upstream > should revert the broken change in the bit shifts. Yeah, we can provide it. But shouldn't it be a solution for all ALSA users? This is Debian #429326. As well reported as https://bugtrack.alsa-project.org/alsa-bug/view.php?id=3360. We have to look for a general solution as the distributors don't need to patch sources. > Alsa #3360; GNOME #436192; LP #116990; Mandriva #33908; Revert HG r2264 > (changeset 23c4c0f5de40) as the bit shifts overflow when the volume is high > for 32 bits to 16 bits resampling > > diff -r 23c4c0f5de40 -r 883ae69471d2 src/pcm/plugin_ops.h > --- a/src/pcm/plugin_ops.h Fri Mar 09 17:06:23 2007 +0100 > +++ b/src/pcm/plugin_ops.h Fri Mar 09 15:30:38 2007 +0100 > @@ -85,8 +85,6 @@ static inline u_int32_t sx24s(u_int32_t > #define _put_triple(ptr,val) _put_triple_be(ptr,val) > #define _put_triple_s(ptr,val) _put_triple_le(ptr,val) > #endif > - > -#define shift_down(val, bits) (((val) + (1 << ((bits) - 1))) >> (bits)) > > #ifdef COPY_LABELS > static void *copy_labels[5] = { > @@ -258,14 +256,14 @@ conv_xxx1_009x: as_u32(dst) = sx24s((u_i > conv_xxx1_009x: as_u32(dst) = sx24s((u_int32_t)(as_u8c(src) ^ 0x80) << 8); goto CONV_END; > conv_xxx1_9000: as_u32(dst) = (u_int32_t)(as_u8c(src) ^ 0x80) << 24; goto CONV_END; > conv_xxx1_0009: as_u32(dst) = (u_int32_t)(as_u8c(src) ^ 0x80); goto CONV_END; > -conv_xx12_xxx1: as_u8(dst) = shift_down(as_u16c(src), 8); goto CONV_END; > +conv_xx12_xxx1: as_u8(dst) = as_u16c(src) >> 8; goto CONV_END; > conv_xx12_xx12: as_u16(dst) = as_u16c(src); goto CONV_END; > conv_xx12_xx21: as_u16(dst) = bswap_16(as_u16c(src)); goto CONV_END; > conv_xx12_x120: as_u32(dst) = sx24((u_int32_t)as_u16c(src) << 8); goto CONV_END; > conv_xx12_021x: as_u32(dst) = sx24s((u_int32_t)bswap_16(as_u16c(src)) << 8); goto CONV_END; > conv_xx12_1200: as_u32(dst) = (u_int32_t)as_u16c(src) << 16; goto CONV_END; > conv_xx12_0021: as_u32(dst) = (u_int32_t)bswap_16(as_u16c(src)); goto CONV_END; > -conv_xx12_xxx9: as_u8(dst) = shift_down(as_u16c(src), 8) ^ 0x80; goto CONV_END; > +conv_xx12_xxx9: as_u8(dst) = (as_u16c(src) >> 8) ^ 0x80; goto CONV_END; > conv_xx12_xx92: as_u16(dst) = as_u16c(src) ^ 0x8000; goto CONV_END; > conv_xx12_xx29: as_u16(dst) = bswap_16(as_u16c(src)) ^ 0x80; goto CONV_END; > conv_xx12_x920: as_u32(dst) = sx24((u_int32_t)(as_u16c(src) ^ 0x8000) << 8); goto CONV_END; > @@ -284,57 +282,57 @@ conv_xx12_01Ax: as_u32(dst) = sx24s((u_i > conv_xx12_01Ax: as_u32(dst) = sx24s((u_int32_t)(as_u16c(src) ^ 0x80) << 8); goto CONV_END; > conv_xx12_A100: as_u32(dst) = (u_int32_t)bswap_16(as_u16c(src) ^ 0x80) << 16; goto CONV_END; > conv_xx12_001A: as_u32(dst) = (u_int32_t)(as_u16c(src) ^ 0x80); goto CONV_END; > -conv_x123_xxx1: as_u8(dst) = shift_down(as_u32c(src), 16); goto CONV_END; > -conv_x123_xx12: as_u16(dst) = shift_down(as_u32c(src), 8); goto CONV_END; > -conv_x123_xx21: as_u16(dst) = bswap_16(shift_down(as_u32c(src), 8)); goto CONV_END; > +conv_x123_xxx1: as_u8(dst) = as_u32c(src) >> 16; goto CONV_END; > +conv_x123_xx12: as_u16(dst) = as_u32c(src) >> 8; goto CONV_END; > +conv_x123_xx21: as_u16(dst) = bswap_16(as_u32c(src) >> 8); goto CONV_END; > conv_x123_x123: as_u32(dst) = sx24(as_u32c(src)); goto CONV_END; > conv_x123_321x: as_u32(dst) = sx24s(bswap_32(as_u32c(src))); goto CONV_END; > conv_x123_1230: as_u32(dst) = as_u32c(src) << 8; goto CONV_END; > -conv_x123_0321: as_u32(dst) = shift_down(bswap_32(as_u32c(src)), 8); goto CONV_END; > - conv_x123_xxx9: as_u8(dst) = shift_down(as_u32c(src), 16) ^ 0x80; goto CONV_END; > -conv_x123_xx92: as_u16(dst) = shift_down(as_u32c(src), 8) ^ 0x8000; goto CONV_END; > -conv_x123_xx29: as_u16(dst) = bswap_16(shift_down(as_u32c(src), 8)) ^ 0x80; goto CONV_END; > +conv_x123_0321: as_u32(dst) = bswap_32(as_u32c(src)) >> 8; goto CONV_END; > +conv_x123_xxx9: as_u8(dst) = (as_u32c(src) >> 16) ^ 0x80; goto CONV_END; > +conv_x123_xx92: as_u16(dst) = (as_u32c(src) >> 8) ^ 0x8000; goto CONV_END; > +conv_x123_xx29: as_u16(dst) = bswap_16(as_u32c(src) >> 8) ^ 0x80; goto CONV_END; > conv_x123_x923: as_u32(dst) = sx24(as_u32c(src) ^ 0x800000); goto CONV_END; > conv_x123_329x: as_u32(dst) = sx24s(bswap_32(as_u32c(src)) ^ 0x8000); goto CONV_END; > conv_x123_9230: as_u32(dst) = (as_u32c(src) ^ 0x800000) << 8; goto CONV_END; > -conv_x123_0329: as_u32(dst) = shift_down(bswap_32(as_u32c(src)), 8) ^ 0x80; goto CONV_END; > -conv_123x_xxx3: as_u8(dst) = shift_down(as_u32c(src), 8) & 0xff; goto CONV_END; > -conv_123x_xx32: as_u16(dst) = bswap_16(shift_down(as_u32c(src), 8)); goto CONV_END; > -conv_123x_xx23: as_u16(dst) = shift_down(as_u32c(src), 8) & 0xffff; goto CONV_END; > +conv_x123_0329: as_u32(dst) = (bswap_32(as_u32c(src)) >> 8) ^ 0x80; goto CONV_END; > +conv_123x_xxx3: as_u8(dst) = (as_u32c(src) >> 8) & 0xff; goto CONV_END; > +conv_123x_xx32: as_u16(dst) = bswap_16(as_u32c(src) >> 8); goto CONV_END; > +conv_123x_xx23: as_u16(dst) = (as_u32c(src) >> 8) & 0xffff; goto CONV_END; > conv_123x_x321: as_u32(dst) = sx24(bswap_32(as_u32c(src))); goto CONV_END; > conv_123x_123x: as_u32(dst) = sx24s(as_u32c(src)); goto CONV_END; > conv_123x_3210: as_u32(dst) = bswap_32(as_u32c(src)) << 8; goto CONV_END; > -conv_123x_0123: as_u32(dst) = shift_down(as_u32c(src), 8); goto CONV_END; > -conv_123x_xxxB: as_u8(dst) = (shift_down(as_u32c(src), 8) & 0xff) ^ 0x80; goto CONV_END; > -conv_123x_xxB2: as_u16(dst) = bswap_16(shift_down(as_u32c(src), 8) ^ 0x80); goto CONV_END; > -conv_123x_xx2B: as_u16(dst) = (shift_down(as_u32c(src), 8) & 0xffff) ^ 0x80; goto CONV_END; > +conv_123x_0123: as_u32(dst) = as_u32c(src) >> 8; goto CONV_END; > +conv_123x_xxxB: as_u8(dst) = ((as_u32c(src) >> 8) & 0xff) ^ 0x80; goto CONV_END; > +conv_123x_xxB2: as_u16(dst) = bswap_16((as_u32c(src) >> 8) ^ 0x80); goto CONV_END; > +conv_123x_xx2B: as_u16(dst) = ((as_u32c(src) >> 8) & 0xffff) ^ 0x80; goto CONV_END; > conv_123x_xB21: as_u32(dst) = sx24(bswap_32(as_u32c(src)) ^ 0x800000); goto CONV_END; > conv_123x_12Bx: as_u32(dst) = sx24s(as_u32c(src) ^ 0x8000); goto CONV_END; > conv_123x_B210: as_u32(dst) = bswap_32(as_u32c(src) ^ 0x8000) << 8; goto CONV_END; > -conv_123x_012B: as_u32(dst) = shift_down(as_u32c(src), 8) ^ 0x80; goto CONV_END; > -conv_1234_xxx1: as_u8(dst) = shift_down(as_u32c(src), 24); goto CONV_END; > -conv_1234_xx12: as_u16(dst) = shift_down(as_u32c(src), 16); goto CONV_END; > -conv_1234_xx21: as_u16(dst) = bswap_16(shift_down(as_u32c(src), 16)); goto CONV_END; > -conv_1234_x123: as_u32(dst) = sx24(shift_down(as_u32c(src), 8)); goto CONV_END; > +conv_123x_012B: as_u32(dst) = (as_u32c(src) >> 8) ^ 0x80; goto CONV_END; > +conv_1234_xxx1: as_u8(dst) = as_u32c(src) >> 24; goto CONV_END; > +conv_1234_xx12: as_u16(dst) = as_u32c(src) >> 16; goto CONV_END; > +conv_1234_xx21: as_u16(dst) = bswap_16(as_u32c(src) >> 16); goto CONV_END; > +conv_1234_x123: as_u32(dst) = sx24(as_u32c(src) >> 8); goto CONV_END; > conv_1234_321x: as_u32(dst) = sx24s(bswap_32(as_u32c(src)) << 8); goto CONV_END; > conv_1234_1234: as_u32(dst) = as_u32c(src); goto CONV_END; > conv_1234_4321: as_u32(dst) = bswap_32(as_u32c(src)); goto CONV_END; > -conv_1234_xxx9: as_u8(dst) = shift_down(as_u32c(src), 24) ^ 0x80; goto CONV_END; > -conv_1234_xx92: as_u16(dst) = shift_down(as_u32c(src), 16) ^ 0x8000; goto CONV_END; > -conv_1234_xx29: as_u16(dst) = bswap_16(shift_down(as_u32c(src), 16)) ^ 0x80; goto CONV_END; > -conv_1234_x923: as_u32(dst) = sx24(shift_down(as_u32c(src), 8) ^ 0x800000); goto CONV_END; > +conv_1234_xxx9: as_u8(dst) = (as_u32c(src) >> 24) ^ 0x80; goto CONV_END; > +conv_1234_xx92: as_u16(dst) = (as_u32c(src) >> 16) ^ 0x8000; goto CONV_END; > +conv_1234_xx29: as_u16(dst) = bswap_16(as_u32c(src) >> 16) ^ 0x80; goto CONV_END; > +conv_1234_x923: as_u32(dst) = sx24((as_u32c(src) >> 8) ^ 0x800000); goto CONV_END; > conv_1234_329x: as_u32(dst) = sx24s((bswap_32(as_u32c(src)) ^ 0x80) << 8); goto CONV_END; > conv_1234_9234: as_u32(dst) = as_u32c(src) ^ 0x80000000; goto CONV_END; > conv_1234_4329: as_u32(dst) = bswap_32(as_u32c(src)) ^ 0x80; goto CONV_END; > conv_1234_xxx4: as_u8(dst) = as_u32c(src) & 0xff; goto CONV_END; > conv_1234_xx43: as_u16(dst) = bswap_16(as_u32c(src)); goto CONV_END; > conv_1234_xx34: as_u16(dst) = as_u32c(src) & 0xffff; goto CONV_END; > -conv_1234_x432: as_u32(dst) = sx24(shift_down(bswap_32(as_u32c(src)), 8)); goto CONV_END; > +conv_1234_x432: as_u32(dst) = sx24(bswap_32(as_u32c(src)) >> 8); goto CONV_END; > conv_1234_234x: as_u32(dst) = sx24s(as_u32c(src) << 8); goto CONV_END; > conv_1234_xxxC: as_u8(dst) = (as_u32c(src) & 0xff) ^ 0x80; goto CONV_END; > conv_1234_xxC3: as_u16(dst) = bswap_16(as_u32c(src) ^ 0x80); goto CONV_END; > conv_1234_xx3C: as_u16(dst) = (as_u32c(src) & 0xffff) ^ 0x80; goto CONV_END; > -conv_1234_xC32: as_u32(dst) = sx24(shift_down(bswap_32(as_u32c(src)), 8) ^ 0x800000); goto CONV_END; > +conv_1234_xC32: as_u32(dst) = sx24((bswap_32(as_u32c(src)) >> 8) ^ 0x800000); goto CONV_END; > conv_1234_23Cx: as_u32(dst) = sx24s((as_u32c(src) ^ 0x80) << 8); goto CONV_END; > conv_1234_C321: as_u32(dst) = bswap_32(as_u32c(src) ^ 0x80); goto CONV_END; > conv_1234_123C: as_u32(dst) = as_u32c(src) ^ 0x80; goto CONV_END; > @@ -384,26 +382,26 @@ get16_12_92: sample = as_u16c(src) ^ 0x8 > get16_12_92: sample = as_u16c(src) ^ 0x8000; goto GET16_END; > get16_12_21: sample = bswap_16(as_u16c(src)); goto GET16_END; > get16_12_A1: sample = bswap_16(as_u16c(src) ^ 0x80); goto GET16_END; > -get16_0123_12: sample = shift_down(as_u32c(src), 8); goto GET16_END; > -get16_0123_92: sample = shift_down(as_u32c(src), 8) ^ 0x8000; goto GET16_END; > -get16_1230_32: sample = bswap_16(shift_down(as_u32c(src), 8)); goto GET16_END; > -get16_1230_B2: sample = bswap_16(shift_down(as_u32c(src), 8) ^ 0x80); goto GET16_END; > -get16_1234_12: sample = shift_down(as_u32c(src), 16); goto GET16_END; > -get16_1234_92: sample = shift_down(as_u32c(src), 16) ^ 0x8000; goto GET16_END; > +get16_0123_12: sample = as_u32c(src) >> 8; goto GET16_END; > +get16_0123_92: sample = (as_u32c(src) >> 8) ^ 0x8000; goto GET16_END; > +get16_1230_32: sample = bswap_16(as_u32c(src) >> 8); goto GET16_END; > +get16_1230_B2: sample = bswap_16((as_u32c(src) >> 8) ^ 0x80); goto GET16_END; > +get16_1234_12: sample = as_u32c(src) >> 16; goto GET16_END; > +get16_1234_92: sample = (as_u32c(src) >> 16) ^ 0x8000; goto GET16_END; > get16_1234_43: sample = bswap_16(as_u32c(src)); goto GET16_END; > get16_1234_C3: sample = bswap_16(as_u32c(src) ^ 0x80); goto GET16_END; > -get16_123_12: sample = shift_down(_get_triple(src), 8); goto GET16_END; > -get16_123_92: sample = shift_down(_get_triple(src), 8) ^ 0x8000; goto GET16_END; > -get16_123_32: sample = shift_down(_get_triple_s(src), 8); goto GET16_END; > -get16_123_B2: sample = shift_down(_get_triple_s(src), 8) ^ 0x8000; goto GET16_END; > -get16_123_12_20: sample = shift_down(_get_triple(src), 4); goto GET16_END; > -get16_123_92_20: sample = shift_down(_get_triple(src), 4) ^ 0x8000; goto GET16_END; > -get16_123_32_20: sample = shift_down(_get_triple_s(src), 4); goto GET16_END; > -get16_123_B2_20: sample = shift_down(_get_triple_s(src), 4) ^ 0x8000; goto GET16_END; > -get16_123_12_18: sample = shift_down(_get_triple(src), 2); goto GET16_END; > -get16_123_92_18: sample = shift_down(_get_triple(src), 2) ^ 0x8000; goto GET16_END; > -get16_123_32_18: sample = shift_down(_get_triple_s(src), 2); goto GET16_END; > -get16_123_B2_18: sample = shift_down(_get_triple_s(src), 2) ^ 0x8000; goto GET16_END; > +get16_123_12: sample = _get_triple(src) >> 8; goto GET16_END; > +get16_123_92: sample = (_get_triple(src) >> 8) ^ 0x8000; goto GET16_END; > +get16_123_32: sample = _get_triple_s(src) >> 8; goto GET16_END; > +get16_123_B2: sample = (_get_triple_s(src) >> 8) ^ 0x8000; goto GET16_END; > +get16_123_12_20: sample = _get_triple(src) >> 4; goto GET16_END; > +get16_123_92_20: sample = (_get_triple(src) >> 4) ^ 0x8000; goto GET16_END; > +get16_123_32_20: sample = _get_triple_s(src) >> 4; goto GET16_END; > +get16_123_B2_20: sample = (_get_triple_s(src) >> 4) ^ 0x8000; goto GET16_END; > +get16_123_12_18: sample = _get_triple(src) >> 2; goto GET16_END; > +get16_123_92_18: sample = (_get_triple(src) >> 2) ^ 0x8000; goto GET16_END; > +get16_123_32_18: sample = _get_triple_s(src) >> 2; goto GET16_END; > +get16_123_B2_18: sample = (_get_triple_s(src) >> 2) ^ 0x8000; goto GET16_END; > } > #endif > > @@ -431,8 +429,8 @@ static void *put16_labels[4 * 2 * 2] = { > > #ifdef PUT16_END > while (0) { > -put16_12_1: as_u8(dst) = shift_down(sample, 8); goto PUT16_END; > -put16_12_9: as_u8(dst) = shift_down(sample, 8) ^ 0x80; goto PUT16_END; > +put16_12_1: as_u8(dst) = sample >> 8; goto PUT16_END; > +put16_12_9: as_u8(dst) = (sample >> 8) ^ 0x80; goto PUT16_END; > put16_12_12: as_u16(dst) = sample; goto PUT16_END; > put16_12_92: as_u16(dst) = sample ^ 0x8000; goto PUT16_END; > put16_12_21: as_u16(dst) = bswap_16(sample); goto PUT16_END; > @@ -502,8 +500,8 @@ get32_12_A100: sample = (u_int32_t)bswap > get32_12_A100: sample = (u_int32_t)bswap_16(as_u16c(src) ^ 0x80) << 16; goto GET32_END; > get32_0123_1230: sample = as_u32c(src) << 8; goto GET32_END; > get32_0123_9230: sample = (as_u32c(src) << 8) ^ 0x80000000; goto GET32_END; > -get32_1230_3210: sample = bswap_32(shift_down(as_u32c(src), 8)); goto GET32_END; > -get32_1230_B210: sample = bswap_32(shift_down(as_u32c(src), 8) ^ 0x80); goto GET32_END; > +get32_1230_3210: sample = bswap_32(as_u32c(src) >> 8); goto GET32_END; > +get32_1230_B210: sample = bswap_32((as_u32c(src) >> 8) ^ 0x80); goto GET32_END; > get32_1234_1234: sample = as_u32c(src); goto GET32_END; > get32_1234_9234: sample = as_u32c(src) ^ 0x80000000; goto GET32_END; > get32_1234_4321: sample = bswap_32(as_u32c(src)); goto GET32_END; > @@ -570,32 +568,32 @@ static void *put32_labels[4 * 2 * 2 + 4 > > #ifdef PUT32_END > while (0) { > -put32_1234_1: as_u8(dst) = shift_down(sample, 24); goto PUT32_END; > -put32_1234_9: as_u8(dst) = shift_down(sample, 24) ^ 0x80; goto PUT32_END; > -put32_1234_12: as_u16(dst) = shift_down(sample, 16); goto PUT32_END; > -put32_1234_92: as_u16(dst) = shift_down(sample, 16) ^ 0x8000; goto PUT32_END; > -put32_1234_21: as_u16(dst) = bswap_16(shift_down(sample, 16)); goto PUT32_END; > -put32_1234_29: as_u16(dst) = bswap_16(shift_down(sample, 16)) ^ 0x80; goto PUT32_END; > -put32_1234_0123: as_u32(dst) = sx24(shift_down(sample, 8)); goto PUT32_END; > -put32_1234_0923: as_u32(dst) = sx24(shift_down(sample, 8) ^ 0x800000); goto PUT32_END; > +put32_1234_1: as_u8(dst) = sample >> 24; goto PUT32_END; > +put32_1234_9: as_u8(dst) = (sample >> 24) ^ 0x80; goto PUT32_END; > +put32_1234_12: as_u16(dst) = sample >> 16; goto PUT32_END; > +put32_1234_92: as_u16(dst) = (sample >> 16) ^ 0x8000; goto PUT32_END; > +put32_1234_21: as_u16(dst) = bswap_16(sample >> 16); goto PUT32_END; > +put32_1234_29: as_u16(dst) = bswap_16(sample >> 16) ^ 0x80; goto PUT32_END; > +put32_1234_0123: as_u32(dst) = sx24(sample >> 8); goto PUT32_END; > +put32_1234_0923: as_u32(dst) = sx24((sample >> 8) ^ 0x800000); goto PUT32_END; > put32_1234_3210: as_u32(dst) = sx24s(bswap_32(sample) << 8); goto PUT32_END; > put32_1234_3290: as_u32(dst) = sx24s((bswap_32(sample) ^ 0x80) << 8); goto PUT32_END; > put32_1234_1234: as_u32(dst) = sample; goto PUT32_END; > put32_1234_9234: as_u32(dst) = sample ^ 0x80000000; goto PUT32_END; > put32_1234_4321: as_u32(dst) = bswap_32(sample); goto PUT32_END; > put32_1234_4329: as_u32(dst) = bswap_32(sample) ^ 0x80; goto PUT32_END; > -put32_1234_123: _put_triple(dst, shift_down(sample, 8)); goto PUT32_END; > -put32_1234_923: _put_triple(dst, shift_down(sample ^ 0x80000000, 8)); goto PUT32_END; > -put32_1234_321: _put_triple_s(dst, shift_down(sample, 8)); goto PUT32_END; > -put32_1234_329: _put_triple_s(dst, shift_down(sample ^ 0x80000000, 8)); goto PUT32_END; > -put32_1234_123_20: _put_triple(dst, shift_down(sample, 12)); goto PUT32_END; > -put32_1234_923_20: _put_triple(dst, shift_down(sample ^ 0x80000000, 12)); goto PUT32_END; > -put32_1234_321_20: _put_triple_s(dst, shift_down(sample, 12)); goto PUT32_END; > -put32_1234_329_20: _put_triple_s(dst, shift_down(sample ^ 0x80000000, 12)); goto PUT32_END; > -put32_1234_123_18: _put_triple(dst, shift_down(sample, 14)); goto PUT32_END; > -put32_1234_923_18: _put_triple(dst, shift_down(sample ^ 0x80000000, 14)); goto PUT32_END; > -put32_1234_321_18: _put_triple_s(dst, shift_down(sample, 14)); goto PUT32_END; > -put32_1234_329_18: _put_triple_s(dst, shift_down(sample ^ 0x80000000, 14)); goto PUT32_END; > +put32_1234_123: _put_triple(dst, sample >> 8); goto PUT32_END; > +put32_1234_923: _put_triple(dst, (sample ^ 0x80000000) >> 8); goto PUT32_END; > +put32_1234_321: _put_triple_s(dst, sample >> 8); goto PUT32_END; > +put32_1234_329: _put_triple_s(dst, (sample ^ 0x80000000) >> 8); goto PUT32_END; > +put32_1234_123_20: _put_triple(dst, sample >> 12); goto PUT32_END; > +put32_1234_923_20: _put_triple(dst, (sample ^ 0x80000000) >> 12); goto PUT32_END; > +put32_1234_321_20: _put_triple_s(dst, sample >> 12); goto PUT32_END; > +put32_1234_329_20: _put_triple_s(dst, (sample ^ 0x80000000) >> 12); goto PUT32_END; > +put32_1234_123_18: _put_triple(dst, sample >> 14); goto PUT32_END; > +put32_1234_923_18: _put_triple(dst, (sample ^ 0x80000000) >> 14); goto PUT32_END; > +put32_1234_321_18: _put_triple_s(dst, sample >> 14); goto PUT32_END; > +put32_1234_329_18: _put_triple_s(dst, (sample ^ 0x80000000) >> 14); goto PUT32_END; > } > #endif > > @@ -1081,4 +1079,3 @@ norms_32_s32s: _norms(src, dst, 32, 1, > #undef _put_triple_le > #undef _put_triple_be > > -#undef shift_down -- Excellent day for drinking heavily. Spike the office water cooler;-)

2 1