From 4a7c61614f42f3cd759e1ad4fe78ce4b690216a8 Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Sat, 4 Sep 2010 15:47:54 -0700 Subject: alsa-lib:Bumped/Updated for LinHES 7. --- abs/core-testing/alsa-lib/PKGBUILD | 8 +- abs/core-testing/alsa-lib/python2.5.patch | 11 - ...ch-to-fix-converting-32bit-audio-to-16bit.patch | 242 --------------------- 3 files changed, 4 insertions(+), 257 deletions(-) delete mode 100644 abs/core-testing/alsa-lib/python2.5.patch delete mode 100644 abs/core-testing/alsa-lib/revert-patch-to-fix-converting-32bit-audio-to-16bit.patch diff --git a/abs/core-testing/alsa-lib/PKGBUILD b/abs/core-testing/alsa-lib/PKGBUILD index 005dd82..9ba2945 100644 --- a/abs/core-testing/alsa-lib/PKGBUILD +++ b/abs/core-testing/alsa-lib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 18680 2008-11-08 16:21:16Z tpowa $ +# $Id: PKGBUILD 79040 2010-04-30 05:28:10Z tpowa $ # Maintainer: judd pkgname=alsa-lib -pkgver=1.0.18 -pkgrel=2 +pkgver=1.0.23 +pkgrel=1 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64') url="http://www.alsa-project.org" @@ -20,4 +20,4 @@ build() { make || return 1 make DESTDIR=$pkgdir install } -md5sums=('de60df7541fafe8c6a3397e0f105ff0e') +md5sums=('f48b50421d8a69d2d806d9c47e534f0d') diff --git a/abs/core-testing/alsa-lib/python2.5.patch b/abs/core-testing/alsa-lib/python2.5.patch deleted file mode 100644 index cd0032b..0000000 --- a/abs/core-testing/alsa-lib/python2.5.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/mixer/simple/python.c~ 2007-08-21 17:21:28.000000000 +0200 -+++ modules/mixer/simple/python.c 2007-08-21 17:26:39.000000000 +0200 -@@ -23,7 +23,7 @@ - #include "config.h" - #include "asoundlib.h" - #include "mixer_abst.h" --#include -+#include - - struct python_priv { - int py_initialized; diff --git a/abs/core-testing/alsa-lib/revert-patch-to-fix-converting-32bit-audio-to-16bit.patch b/abs/core-testing/alsa-lib/revert-patch-to-fix-converting-32bit-audio-to-16bit.patch deleted file mode 100644 index 588272f..0000000 --- a/abs/core-testing/alsa-lib/revert-patch-to-fix-converting-32bit-audio-to-16bit.patch +++ /dev/null @@ -1,242 +0,0 @@ - ---- a/src/pcm/plugin_ops.h Mon Jan 09 14:40:08 2006 +0000 -+++ b/src/pcm/plugin_ops.h Fri Mar 09 17:06:23 2007 +0100 -@@ -85,6 +85,8 @@ 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] = { -@@ -256,14 +258,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) = as_u16c(src) >> 8; goto CONV_END; -+conv_xx12_xxx1: as_u8(dst) = shift_down(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) = (as_u16c(src) >> 8) ^ 0x80; goto CONV_END; -+conv_xx12_xxx9: as_u8(dst) = shift_down(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; -@@ -282,57 +284,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) = 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_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_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) = 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_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_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) = (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_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_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) = 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_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_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) = (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_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_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) = (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_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_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(bswap_32(as_u32c(src)) >> 8); goto CONV_END; -+conv_1234_x432: as_u32(dst) = sx24(shift_down(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((bswap_32(as_u32c(src)) >> 8) ^ 0x800000); goto CONV_END; -+conv_1234_xC32: as_u32(dst) = sx24(shift_down(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; -@@ -382,26 +384,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 = 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_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_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 = _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; -+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; - } - #endif - -@@ -429,8 +431,8 @@ static void *put16_labels[4 * 2 * 2] = { - - #ifdef PUT16_END - while (0) { --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_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_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; -@@ -500,8 +502,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(as_u32c(src) >> 8); goto GET32_END; --get32_1230_B210: sample = bswap_32((as_u32c(src) >> 8) ^ 0x80); 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_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; -@@ -568,32 +570,32 @@ static void *put32_labels[4 * 2 * 2 + 4 - - #ifdef PUT32_END - while (0) { --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_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_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, 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; -+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; - } - #endif - -@@ -1079,3 +1081,4 @@ norms_32_s32s: _norms(src, dst, 32, 1, - #undef _put_triple_le - #undef _put_triple_be - -+#undef shift_down - - - - -- cgit v0.12