Author: titmuss
Date: Fri May 16 02:24:35 2008
New Revision: 2467
URL: http://svn.slimdevices.com?rev=2467&root=Jive&view=rev
Log:
Bug: N/A
Description:
Revert changes to portaudio to support 24 bit padded samples.
Removed:
7.2/trunk/squeezeplay/src/portaudio_v19_1360/test/patest_sine24.c
Modified:
7.2/trunk/squeezeplay/src/portaudio_v19_1360/include/portaudio.h
7.2/trunk/squeezeplay/src/portaudio_v19_1360/src/common/pa_converters.c
7.2/trunk/squeezeplay/src/portaudio_v19_1360/src/common/pa_converters.h
7.2/trunk/squeezeplay/src/portaudio_v19_1360/src/common/pa_front.c
Modified: 7.2/trunk/squeezeplay/src/portaudio_v19_1360/include/portaudio.h
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/portaudio_v19_1360/include/portaudio.h?rev=2467&root=Jive&r1=2466&r2=2467&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/portaudio_v19_1360/include/portaudio.h (original)
+++ 7.2/trunk/squeezeplay/src/portaudio_v19_1360/include/portaudio.h Fri May 16
02:24:35 2008
@@ -412,7 +412,7 @@
Pa_ReadStream and Pa_WriteStream.
The standard formats paFloat32, paInt16, paInt32, paInt24, paInt8
- and paUInt8 are usually implemented by all implementations.
+ and aUInt8 are usually implemented by all implementations.
The floating point representation (paFloat32) uses +1.0 and -1.0 as the
maximum and minimum respectively.
@@ -423,7 +423,7 @@
as a set of non-interleaved pointers.
@see Pa_OpenStream, Pa_OpenDefaultStream, PaDeviceInfo
- @see paFloat32, paInt16, paInt32, paInt24, paInt24Padded, paInt8
+ @see paFloat32, paInt16, paInt32, paInt24, paInt8
@see paUInt8, paCustomFormat, paNonInterleaved
*/
typedef unsigned long PaSampleFormat;
@@ -431,11 +431,10 @@
#define paFloat32 ((PaSampleFormat) 0x00000001) /**< @see
PaSampleFormat */
#define paInt32 ((PaSampleFormat) 0x00000002) /**< @see
PaSampleFormat */
-#define paInt24Padded ((PaSampleFormat) 0x00000004) /**< Padded 24 bit
format. @see PaSampleFormat */
-#define paInt24 ((PaSampleFormat) 0x00000008) /**< Packed 24 bit
format. @see PaSampleFormat */
-#define paInt16 ((PaSampleFormat) 0x00000010) /**< @see
PaSampleFormat */
-#define paInt8 ((PaSampleFormat) 0x00000020) /**< @see
PaSampleFormat */
-#define paUInt8 ((PaSampleFormat) 0x00000040) /**< @see
PaSampleFormat */
+#define paInt24 ((PaSampleFormat) 0x00000004) /**< Packed 24 bit
format. @see PaSampleFormat */
+#define paInt16 ((PaSampleFormat) 0x00000008) /**< @see
PaSampleFormat */
+#define paInt8 ((PaSampleFormat) 0x00000010) /**< @see
PaSampleFormat */
+#define paUInt8 ((PaSampleFormat) 0x00000020) /**< @see
PaSampleFormat */
#define paCustomFormat ((PaSampleFormat) 0x00010000)/**< @see PaSampleFormat
*/
#define paNonInterleaved ((PaSampleFormat) 0x80000000)
Modified:
7.2/trunk/squeezeplay/src/portaudio_v19_1360/src/common/pa_converters.c
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/portaudio_v19_1360/src/common/pa_converters.c?rev=2467&root=Jive&r1=2466&r2=2467&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/portaudio_v19_1360/src/common/pa_converters.c
(original)
+++ 7.2/trunk/squeezeplay/src/portaudio_v19_1360/src/common/pa_converters.c Fri
May 16 02:24:35 2008
@@ -117,15 +117,12 @@
/* --------------------------------------------------------------------------
*/
-#define PA_SELECT_FORMAT_( format, float32, int32, int24Padded, int24, int16,
\
- int8, uint8 )
\
+#define PA_SELECT_FORMAT_( format, float32, int32, int24, int16, int8, uint8 )
\
switch( format & ~paNonInterleaved ){
\
case paFloat32:
\
float32
\
case paInt32:
\
int32
\
- case paInt24Padded:
\
- int24Padded
\
case paInt24:
\
int24
\
case paInt16:
\
@@ -183,7 +180,6 @@
PA_SELECT_FORMAT_( destinationFormat,
/* paFloat32: */
PA_UNITY_CONVERSION_( 32 ),
/* paInt32: */
PA_SELECT_CONVERTER_DITHER_CLIP_( flags, Float32, Int32 ),
- /* paInt24Padded: */
PA_SELECT_CONVERTER_DITHER_CLIP_( flags, Float32, Int24Padded ),
/* paInt24: */
PA_SELECT_CONVERTER_DITHER_CLIP_( flags, Float32, Int24 ),
/* paInt16: */
PA_SELECT_CONVERTER_DITHER_CLIP_( flags, Float32, Int16 ),
/* paInt8: */
PA_SELECT_CONVERTER_DITHER_CLIP_( flags, Float32, Int8 ),
@@ -193,27 +189,15 @@
PA_SELECT_FORMAT_( destinationFormat,
/* paFloat32: */
PA_USE_CONVERTER_( Int32, Float32 ),
/* paInt32: */
PA_UNITY_CONVERSION_( 32 ),
- /* paInt24Padded: */
PA_SELECT_CONVERTER_DITHER_( flags, Int32, Int24Padded ),
/* paInt24: */
PA_SELECT_CONVERTER_DITHER_( flags, Int32, Int24 ),
/* paInt16: */
PA_SELECT_CONVERTER_DITHER_( flags, Int32, Int16 ),
/* paInt8: */
PA_SELECT_CONVERTER_DITHER_( flags, Int32, Int8 ),
/* paUInt8: */
PA_SELECT_CONVERTER_DITHER_( flags, Int32, UInt8 )
),
- /* paInt24Padded: */
- PA_SELECT_FORMAT_( destinationFormat,
- /* paFloat32: */
PA_USE_CONVERTER_( Int24Padded, Float32 ),
- /* paInt32: */
PA_SELECT_CONVERTER_DITHER_( flags, Int24Padded, Int32 ),
- /* paInt24Padded: */
PA_UNITY_CONVERSION_( 32 ),
- /* paInt24: */
PA_SELECT_CONVERTER_DITHER_( flags, Int24Padded, Int24 ),
- /* paInt16: */
PA_SELECT_CONVERTER_DITHER_( flags, Int24Padded, Int16 ),
- /* paInt8: */
PA_SELECT_CONVERTER_DITHER_( flags, Int24Padded, Int8 ),
- /* paUInt8: */
PA_SELECT_CONVERTER_DITHER_( flags, Int24Padded, UInt8 )
- ),
/* paInt24: */
PA_SELECT_FORMAT_( destinationFormat,
/* paFloat32: */
PA_USE_CONVERTER_( Int24, Float32 ),
/* paInt32: */
PA_USE_CONVERTER_( Int24, Int32 ),
- /* paInt24Padded: */
PA_USE_CONVERTER_( Int24, Int24Padded ),
/* paInt24: */
PA_UNITY_CONVERSION_( 24 ),
/* paInt16: */
PA_SELECT_CONVERTER_DITHER_( flags, Int24, Int16 ),
/* paInt8: */
PA_SELECT_CONVERTER_DITHER_( flags, Int24, Int8 ),
@@ -223,7 +207,6 @@
PA_SELECT_FORMAT_( destinationFormat,
/* paFloat32: */
PA_USE_CONVERTER_( Int16, Float32 ),
/* paInt32: */
PA_USE_CONVERTER_( Int16, Int32 ),
- /* paInt24Padded: */
PA_USE_CONVERTER_( Int16, Int24Padded ),
/* paInt24: */
PA_USE_CONVERTER_( Int16, Int24 ),
/* paInt16: */
PA_UNITY_CONVERSION_( 16 ),
/* paInt8: */
PA_SELECT_CONVERTER_DITHER_( flags, Int16, Int8 ),
@@ -233,7 +216,6 @@
PA_SELECT_FORMAT_( destinationFormat,
/* paFloat32: */
PA_USE_CONVERTER_( Int8, Float32 ),
/* paInt32: */
PA_USE_CONVERTER_( Int8, Int32 ),
- /* paInt24Padded: */
PA_USE_CONVERTER_( Int8, Int24Padded ),
/* paInt24: */
PA_USE_CONVERTER_( Int8, Int24 ),
/* paInt16: */
PA_USE_CONVERTER_( Int8, Int16 ),
/* paInt8: */
PA_UNITY_CONVERSION_( 8 ),
@@ -243,7 +225,6 @@
PA_SELECT_FORMAT_( destinationFormat,
/* paFloat32: */
PA_USE_CONVERTER_( UInt8, Float32 ),
/* paInt32: */
PA_USE_CONVERTER_( UInt8, Int32 ),
- /* paInt24Padded: */
PA_USE_CONVERTER_( UInt8, Int24Padded ),
/* paInt24: */
PA_USE_CONVERTER_( UInt8, Int24 ),
/* paInt16: */
PA_USE_CONVERTER_( UInt8, Int16 ),
/* paInt8: */
PA_USE_CONVERTER_( UInt8, Int8 ),
@@ -264,11 +245,6 @@
0, /* PaUtilConverter *Float32_To_Int32_Clip; */
0, /* PaUtilConverter *Float32_To_Int32_DitherClip; */
- 0, /* PaUtilConverter *Float32_To_Int24Padded; */
- 0, /* PaUtilConverter *Float32_To_Int24Padded_Dither; */
- 0, /* PaUtilConverter *Float32_To_Int24Padded_Clip; */
- 0, /* PaUtilConverter *Float32_To_Int24Padded_DitherClip; */
-
0, /* PaUtilConverter *Float32_To_Int24; */
0, /* PaUtilConverter *Float32_To_Int24_Dither; */
0, /* PaUtilConverter *Float32_To_Int24_Clip; */
@@ -290,8 +266,6 @@
0, /* PaUtilConverter *Float32_To_UInt8_DitherClip; */
0, /* PaUtilConverter *Int32_To_Float32; */
- 0, /* PaUtilConverter *Int32_To_Int24Padded; */
- 0, /* PaUtilConverter *Int32_To_Int24Padded_Dither; */
0, /* PaUtilConverter *Int32_To_Int24; */
0, /* PaUtilConverter *Int32_To_Int24_Dither; */
0, /* PaUtilConverter *Int32_To_Int16; */
@@ -301,21 +275,8 @@
0, /* PaUtilConverter *Int32_To_UInt8; */
0, /* PaUtilConverter *Int32_To_UInt8_Dither; */
- 0, /* PaUtilConverter *Int24Padded_To_Float32; */
- 0, /* PaUtilConverter *Int24Padded_To_Int32; */
- 0, /* PaUtilConverter *Int24Padded_To_Int32_Dither; */
- 0, /* PaUtilConverter *Int24Padded_To_Int24; */
- 0, /* PaUtilConverter *Int24Padded_To_Int24_Dither; */
- 0, /* PaUtilConverter *Int24Padded_To_Int16; */
- 0, /* PaUtilConverter *Int24Padded_To_Int16_Dither; */
- 0, /* PaUtilConverter *Int24Padded_To_Int8; */
- 0, /* PaUtilConverter *Int24Padded_To_Int8_Dither; */
- 0, /* PaUtilConverter *Int24Padded_To_UInt8; */
- 0, /* PaUtilConverter *Int24Padded_To_UInt8_Dither; */
-
0, /* PaUtilConverter *Int24_To_Float32; */
0, /* PaUtilConverter *Int24_To_Int32; */
- 0, /* PaUtilConverter *Int24_To_Int24Padded; */
0, /* PaUtilConverter *Int24_To_Int16; */
0, /* PaUtilConverter *Int24_To_Int16_Dither; */
0, /* PaUtilConverter *Int24_To_Int8; */
@@ -325,7 +286,6 @@
0, /* PaUtilConverter *Int16_To_Float32; */
0, /* PaUtilConverter *Int16_To_Int32; */
- 0, /* PaUtilConverter *Int16_To_Int24Padded; */
0, /* PaUtilConverter *Int16_To_Int24; */
0, /* PaUtilConverter *Int16_To_Int8; */
0, /* PaUtilConverter *Int16_To_Int8_Dither; */
@@ -334,14 +294,12 @@
0, /* PaUtilConverter *Int8_To_Float32; */
0, /* PaUtilConverter *Int8_To_Int32; */
- 0, /* PaUtilConverter *Int8_To_Int24Padded; */
0, /* PaUtilConverter *Int8_To_Int24 */
0, /* PaUtilConverter *Int8_To_Int16; */
0, /* PaUtilConverter *Int8_To_UInt8; */
0, /* PaUtilConverter *UInt8_To_Float32; */
0, /* PaUtilConverter *UInt8_To_Int32; */
- 0, /* PaUtilConverter *UInt8_To_Int24Padded; */
0, /* PaUtilConverter *UInt8_To_Int24; */
0, /* PaUtilConverter *UInt8_To_Int16; */
0, /* PaUtilConverter *UInt8_To_Int8; */
@@ -487,70 +445,6 @@
/* --------------------------------------------------------------------------
*/
-static void Float32_To_Int24Padded(
- void *destinationBuffer, signed int destinationStride,
- void *sourceBuffer, signed int sourceStride,
- unsigned int count, struct PaUtilTriangularDitherGenerator
*ditherGenerator )
-{
- (void) destinationBuffer; /* unused parameters */
- (void) destinationStride; /* unused parameters */
- (void) sourceBuffer; /* unused parameters */
- (void) sourceStride; /* unused parameters */
- (void) count; /* unused parameters */
- (void) ditherGenerator; /* unused parameters */
- /* IMPLEMENT ME */
-}
-
-/* --------------------------------------------------------------------------
*/
-
-static void Float32_To_Int24Padded_Clip(
- void *destinationBuffer, signed int destinationStride,
- void *sourceBuffer, signed int sourceStride,
- unsigned int count, struct PaUtilTriangularDitherGenerator
*ditherGenerator )
-{
- (void) destinationBuffer; /* unused parameters */
- (void) destinationStride; /* unused parameters */
- (void) sourceBuffer; /* unused parameters */
- (void) sourceStride; /* unused parameters */
- (void) count; /* unused parameters */
- (void) ditherGenerator; /* unused parameters */
- /* IMPLEMENT ME */
-}
-
-/* --------------------------------------------------------------------------
*/
-
-static void Float32_To_Int24Padded_Dither(
- void *destinationBuffer, signed int destinationStride,
- void *sourceBuffer, signed int sourceStride,
- unsigned int count, struct PaUtilTriangularDitherGenerator
*ditherGenerator )
-{
- (void) destinationBuffer; /* unused parameters */
- (void) destinationStride; /* unused parameters */
- (void) sourceBuffer; /* unused parameters */
- (void) sourceStride; /* unused parameters */
- (void) count; /* unused parameters */
- (void) ditherGenerator; /* unused parameters */
- /* IMPLEMENT ME */
-}
-
-/* --------------------------------------------------------------------------
*/
-
-static void Float32_To_Int24Padded_DitherClip(
- void *destinationBuffer, signed int destinationStride,
- void *sourceBuffer, signed int sourceStride,
- unsigned int count, struct PaUtilTriangularDitherGenerator
*ditherGenerator )
-{
- (void) destinationBuffer; /* unused parameters */
- (void) destinationStride; /* unused parameters */
- (void) sourceBuffer; /* unused parameters */
- (void) sourceStride; /* unused parameters */
- (void) count; /* unused parameters */
- (void) ditherGenerator; /* unused parameters */
- /* IMPLEMENT ME */
-}
-
-/* --------------------------------------------------------------------------
*/
-
static void Float32_To_Int24(
void *destinationBuffer, signed int destinationStride,
void *sourceBuffer, signed int sourceStride,
@@ -996,41 +890,6 @@
/* --------------------------------------------------------------------------
*/
-static void Int32_To_Int24Padded(
- void *destinationBuffer, signed int destinationStride,
- void *sourceBuffer, signed int sourceStride,
- unsigned int count, struct PaUtilTriangularDitherGenerator
*ditherGenerator )
-{
- PaInt32 *src = (PaInt32*)sourceBuffer;
- PaInt32 *dest = (PaInt32*)destinationBuffer;
- (void) ditherGenerator; /* unused parameter */
-
- while( count-- )
- {
- *dest = *src >> 8;
- src += sourceStride;
- dest += destinationStride;
- }
-}
-
-/* --------------------------------------------------------------------------
*/
-
-static void Int32_To_Int24Padded_Dither(
- void *destinationBuffer, signed int destinationStride,
- void *sourceBuffer, signed int sourceStride,
- unsigned int count, struct PaUtilTriangularDitherGenerator
*ditherGenerator )
-{
- (void) destinationBuffer; /* unused parameters */
- (void) destinationStride; /* unused parameters */
- (void) sourceBuffer; /* unused parameters */
- (void) sourceStride; /* unused parameters */
- (void) count; /* unused parameters */
- (void) ditherGenerator; /* unused parameters */
- /* IMPLEMENT ME */
-}
-
-/* --------------------------------------------------------------------------
*/
-
static void Int32_To_Int24(
void *destinationBuffer, signed int destinationStride,
void *sourceBuffer, signed int sourceStride,
@@ -1103,15 +962,12 @@
PaInt32 *src = (PaInt32*)sourceBuffer;
PaInt16 *dest = (PaInt16*)destinationBuffer;
PaInt32 dither;
- PaInt32 dithered;
while( count-- )
{
/* REVIEW */
dither = PaUtil_Generate16BitTriangularDither( ditherGenerator );
- dithered = ((((*src)>>1) + (dither>>1)) >> 15);
- PA_CLIP_( dithered, -0x8000, 0x7FFF );
- *dest = (PaInt16) dithered;
+ *dest = (PaInt16) ((((*src)>>1) + dither) >> 15);
src += sourceStride;
dest += destinationStride;
@@ -1200,11 +1056,9 @@
}
}
-
-
-/* --------------------------------------------------------------------------
*/
-
-static void Int24Padded_To_Float32(
+/* --------------------------------------------------------------------------
*/
+
+static void Int24_To_Float32(
void *destinationBuffer, signed int destinationStride,
void *sourceBuffer, signed int sourceStride,
unsigned int count, struct PaUtilTriangularDitherGenerator
*ditherGenerator )
@@ -1217,7 +1071,6 @@
while( count-- )
{
- /* REVIEW */
#if defined(PA_LITTLE_ENDIAN)
temp = (((long)src[0]) << 8);
@@ -1231,193 +1084,20 @@
*dest = (float) ((double)temp * const_1_div_2147483648_);
- src += sourceStride * 4;
- dest += destinationStride;
- }
-}
-
-/* --------------------------------------------------------------------------
*/
-
-static void Int24Padded_To_Int32(
- void *destinationBuffer, signed int destinationStride,
- void *sourceBuffer, signed int sourceStride,
- unsigned int count, struct PaUtilTriangularDitherGenerator
*ditherGenerator )
-{
- (void) destinationBuffer; /* unused parameters */
- (void) destinationStride; /* unused parameters */
- (void) sourceBuffer; /* unused parameters */
- (void) sourceStride; /* unused parameters */
- (void) count; /* unused parameters */
- (void) ditherGenerator; /* unused parameters */
- /* IMPLEMENT ME */
-}
-
-/* --------------------------------------------------------------------------
*/
-
-static void Int24Padded_To_Int32_Dither(
- void *destinationBuffer, signed int destinationStride,
- void *sourceBuffer, signed int sourceStride,
- unsigned int count, struct PaUtilTriangularDitherGenerator
*ditherGenerator )
-{
- (void) destinationBuffer; /* unused parameters */
- (void) destinationStride; /* unused parameters */
- (void) sourceBuffer; /* unused parameters */
- (void) sourceStride; /* unused parameters */
- (void) count; /* unused parameters */
- (void) ditherGenerator; /* unused parameters */
- /* IMPLEMENT ME */
-}
-
-/* --------------------------------------------------------------------------
*/
-
-static void Int24Padded_To_Int24(
- void *destinationBuffer, signed int destinationStride,
- void *sourceBuffer, signed int sourceStride,
- unsigned int count, struct PaUtilTriangularDitherGenerator
*ditherGenerator )
-{
- (void) destinationBuffer; /* unused parameters */
- (void) destinationStride; /* unused parameters */
- (void) sourceBuffer; /* unused parameters */
- (void) sourceStride; /* unused parameters */
- (void) count; /* unused parameters */
- (void) ditherGenerator; /* unused parameters */
- /* IMPLEMENT ME */
-}
-
-/* --------------------------------------------------------------------------
*/
-
-static void Int24Padded_To_Int24_Dither(
- void *destinationBuffer, signed int destinationStride,
- void *sourceBuffer, signed int sourceStride,
- unsigned int count, struct PaUtilTriangularDitherGenerator
*ditherGenerator )
-{
- (void) destinationBuffer; /* unused parameters */
- (void) destinationStride; /* unused parameters */
- (void) sourceBuffer; /* unused parameters */
- (void) sourceStride; /* unused parameters */
- (void) count; /* unused parameters */
- (void) ditherGenerator; /* unused parameters */
- /* IMPLEMENT ME */
-}
-
-/* --------------------------------------------------------------------------
*/
-
-static void Int24Padded_To_Int16(
- void *destinationBuffer, signed int destinationStride,
- void *sourceBuffer, signed int sourceStride,
- unsigned int count, struct PaUtilTriangularDitherGenerator
*ditherGenerator )
-{
- PaInt32 *src = (PaInt32*)sourceBuffer;
- PaInt16 *dest = (PaInt16*)destinationBuffer;
- (void) ditherGenerator; /* unused parameter */
-
- while( count-- )
- {
- *dest = (PaInt16)(*src >> 8);
- src += sourceStride;
- dest += destinationStride;
- }
-
-}
-
-/* --------------------------------------------------------------------------
*/
-
-static void Int24Padded_To_Int16_Dither(
- void *destinationBuffer, signed int destinationStride,
- void *sourceBuffer, signed int sourceStride,
- unsigned int count, struct PaUtilTriangularDitherGenerator
*ditherGenerator )
-{
- PaInt32 *src = (PaInt32*)sourceBuffer;
- PaInt16 *dest = (PaInt16*)destinationBuffer;
- PaInt32 dither;
- PaInt32 dithered;
-
- while( count-- )
- {
- /* REVIEW */
- dither = PaUtil_Generate16BitTriangularDither( ditherGenerator );
- dithered = ((*src + (dither>>8)) >> 8);
- PA_CLIP_( dithered, -0x8000, 0x7FFF );
- *dest = (PaInt16) dithered;
-
- src += sourceStride;
- dest += destinationStride;
- }
-}
-
-/* --------------------------------------------------------------------------
*/
-
-static void Int24Padded_To_Int8(
- void *destinationBuffer, signed int destinationStride,
- void *sourceBuffer, signed int sourceStride,
- unsigned int count, struct PaUtilTriangularDitherGenerator
*ditherGenerator )
-{
- (void) destinationBuffer; /* unused parameters */
- (void) destinationStride; /* unused parameters */
- (void) sourceBuffer; /* unused parameters */
- (void) sourceStride; /* unused parameters */
- (void) count; /* unused parameters */
- (void) ditherGenerator; /* unused parameters */
- /* IMPLEMENT ME */
-}
-
-/* --------------------------------------------------------------------------
*/
-
-static void Int24Padded_To_Int8_Dither(
- void *destinationBuffer, signed int destinationStride,
- void *sourceBuffer, signed int sourceStride,
- unsigned int count, struct PaUtilTriangularDitherGenerator
*ditherGenerator )
-{
- (void) destinationBuffer; /* unused parameters */
- (void) destinationStride; /* unused parameters */
- (void) sourceBuffer; /* unused parameters */
- (void) sourceStride; /* unused parameters */
- (void) count; /* unused parameters */
- (void) ditherGenerator; /* unused parameters */
- /* IMPLEMENT ME */
-}
-
-/* --------------------------------------------------------------------------
*/
-
-static void Int24Padded_To_UInt8(
- void *destinationBuffer, signed int destinationStride,
- void *sourceBuffer, signed int sourceStride,
- unsigned int count, struct PaUtilTriangularDitherGenerator
*ditherGenerator )
-{
- (void) destinationBuffer; /* unused parameters */
- (void) destinationStride; /* unused parameters */
- (void) sourceBuffer; /* unused parameters */
- (void) sourceStride; /* unused parameters */
- (void) count; /* unused parameters */
- (void) ditherGenerator; /* unused parameters */
- /* IMPLEMENT ME */
-}
-
-/* --------------------------------------------------------------------------
*/
-
-static void Int24Padded_To_UInt8_Dither(
- void *destinationBuffer, signed int destinationStride,
- void *sourceBuffer, signed int sourceStride,
- unsigned int count, struct PaUtilTriangularDitherGenerator
*ditherGenerator )
-{
- (void) destinationBuffer; /* unused parameters */
- (void) destinationStride; /* unused parameters */
- (void) sourceBuffer; /* unused parameters */
- (void) sourceStride; /* unused parameters */
- (void) count; /* unused parameters */
- (void) ditherGenerator; /* unused parameters */
- /* IMPLEMENT ME */
-}
-
-/* --------------------------------------------------------------------------
*/
-
-static void Int24_To_Float32(
- void *destinationBuffer, signed int destinationStride,
- void *sourceBuffer, signed int sourceStride,
- unsigned int count, struct PaUtilTriangularDitherGenerator
*ditherGenerator )
-{
- unsigned char *src = (unsigned char*)sourceBuffer;
- float *dest = (float*)destinationBuffer;
+ src += sourceStride * 3;
+ dest += destinationStride;
+ }
+}
+
+/* --------------------------------------------------------------------------
*/
+
+static void Int24_To_Int32(
+ void *destinationBuffer, signed int destinationStride,
+ void *sourceBuffer, signed int sourceStride,
+ unsigned int count, struct PaUtilTriangularDitherGenerator
*ditherGenerator )
+{
+ unsigned char *src = (unsigned char*)sourceBuffer;
+ PaInt32 *dest = (PaInt32*) destinationBuffer;
PaInt32 temp;
(void) ditherGenerator; /* unused parameter */
@@ -1435,60 +1115,11 @@
temp = temp | (((long)src[2]) << 8);
#endif
- *dest = (float) ((double)temp * const_1_div_2147483648_);
+ *dest = temp;
src += sourceStride * 3;
dest += destinationStride;
}
-}
-
-/* --------------------------------------------------------------------------
*/
-
-static void Int24_To_Int32(
- void *destinationBuffer, signed int destinationStride,
- void *sourceBuffer, signed int sourceStride,
- unsigned int count, struct PaUtilTriangularDitherGenerator
*ditherGenerator )
-{
- unsigned char *src = (unsigned char*)sourceBuffer;
- PaInt32 *dest = (PaInt32*) destinationBuffer;
- PaInt32 temp;
-
- (void) ditherGenerator; /* unused parameter */
-
- while( count-- )
- {
-
-#if defined(PA_LITTLE_ENDIAN)
- temp = (((long)src[0]) << 8);
- temp = temp | (((long)src[1]) << 16);
- temp = temp | (((long)src[2]) << 24);
-#elif defined(PA_BIG_ENDIAN)
- temp = (((long)src[0]) << 24);
- temp = temp | (((long)src[1]) << 16);
- temp = temp | (((long)src[2]) << 8);
-#endif
-
- *dest = temp;
-
- src += sourceStride * 3;
- dest += destinationStride;
- }
-}
-
-/* --------------------------------------------------------------------------
*/
-
-static void Int24_To_Int24Padded(
- void *destinationBuffer, signed int destinationStride,
- void *sourceBuffer, signed int sourceStride,
- unsigned int count, struct PaUtilTriangularDitherGenerator
*ditherGenerator )
-{
- (void) destinationBuffer; /* unused parameters */
- (void) destinationStride; /* unused parameters */
- (void) sourceBuffer; /* unused parameters */
- (void) sourceStride; /* unused parameters */
- (void) count; /* unused parameters */
- (void) ditherGenerator; /* unused parameters */
- /* IMPLEMENT ME */
}
/* --------------------------------------------------------------------------
*/
@@ -1680,22 +1311,6 @@
/* --------------------------------------------------------------------------
*/
-static void Int16_To_Int24Padded(
- void *destinationBuffer, signed int destinationStride,
- void *sourceBuffer, signed int sourceStride,
- unsigned int count, struct PaUtilTriangularDitherGenerator
*ditherGenerator )
-{
- (void) destinationBuffer; /* unused parameters */
- (void) destinationStride; /* unused parameters */
- (void) sourceBuffer; /* unused parameters */
- (void) sourceStride; /* unused parameters */
- (void) count; /* unused parameters */
- (void) ditherGenerator; /* unused parameters */
- /* IMPLEMENT ME */
-}
-
-/* --------------------------------------------------------------------------
*/
-
static void Int16_To_Int24(
void *destinationBuffer, signed int destinationStride,
void *sourceBuffer, signed int sourceStride,
@@ -1849,22 +1464,6 @@
/* --------------------------------------------------------------------------
*/
-static void Int8_To_Int24Padded(
- void *destinationBuffer, signed int destinationStride,
- void *sourceBuffer, signed int sourceStride,
- unsigned int count, struct PaUtilTriangularDitherGenerator
*ditherGenerator )
-{
- (void) destinationBuffer; /* unused parameters */
- (void) destinationStride; /* unused parameters */
- (void) sourceBuffer; /* unused parameters */
- (void) sourceStride; /* unused parameters */
- (void) count; /* unused parameters */
- (void) ditherGenerator; /* unused parameters */
- /* IMPLEMENT ME */
-}
-
-/* --------------------------------------------------------------------------
*/
-
static void Int8_To_Int24(
void *destinationBuffer, signed int destinationStride,
void *sourceBuffer, signed int sourceStride,
@@ -1975,23 +1574,6 @@
/* --------------------------------------------------------------------------
*/
-
-static void UInt8_To_Int24Padded(
- void *destinationBuffer, signed int destinationStride,
- void *sourceBuffer, signed int sourceStride,
- unsigned int count, struct PaUtilTriangularDitherGenerator
*ditherGenerator )
-{
- (void) destinationBuffer; /* unused parameters */
- (void) destinationStride; /* unused parameters */
- (void) sourceBuffer; /* unused parameters */
- (void) sourceStride; /* unused parameters */
- (void) count; /* unused parameters */
- (void) ditherGenerator; /* unused parameters */
- /* IMPLEMENT ME */
-}
-
-/* --------------------------------------------------------------------------
*/
-
static void UInt8_To_Int24(
void *destinationBuffer, signed int destinationStride,
void *sourceBuffer, signed int sourceStride,
@@ -2145,7 +1727,6 @@
}
}
-
/* --------------------------------------------------------------------------
*/
PaUtilConverterTable paConverters = {
@@ -2153,11 +1734,6 @@
Float32_To_Int32_Dither, /* PaUtilConverter
*Float32_To_Int32_Dither; */
Float32_To_Int32_Clip, /* PaUtilConverter *Float32_To_Int32_Clip;
*/
Float32_To_Int32_DitherClip, /* PaUtilConverter
*Float32_To_Int32_DitherClip; */
-
- Float32_To_Int24Padded, /* PaUtilConverter
*Float32_To_Int24Padded; */
- Float32_To_Int24Padded_Dither, /* PaUtilConverter
*Float32_To_Int24Padded_Dither; */
- Float32_To_Int24Padded_Clip, /* PaUtilConverter
*Float32_To_Int24Padded_Clip; */
- Float32_To_Int24Padded_DitherClip, /* PaUtilConverter
*Float32_To_Int24Padded_DitherClip; */
Float32_To_Int24, /* PaUtilConverter *Float32_To_Int24; */
Float32_To_Int24_Dither, /* PaUtilConverter
*Float32_To_Int24_Dither; */
@@ -2180,8 +1756,6 @@
Float32_To_UInt8_DitherClip, /* PaUtilConverter
*Float32_To_UInt8_DitherClip; */
Int32_To_Float32, /* PaUtilConverter *Int32_To_Float32; */
- Int32_To_Int24Padded, /* PaUtilConverter *Int32_To_Int24Padded; */
- Int32_To_Int24Padded_Dither, /* PaUtilConverter
*Int32_To_Int24Padded_Dither; */
Int32_To_Int24, /* PaUtilConverter *Int32_To_Int24; */
Int32_To_Int24_Dither, /* PaUtilConverter *Int32_To_Int24_Dither;
*/
Int32_To_Int16, /* PaUtilConverter *Int32_To_Int16; */
@@ -2191,21 +1765,8 @@
Int32_To_UInt8, /* PaUtilConverter *Int32_To_UInt8; */
Int32_To_UInt8_Dither, /* PaUtilConverter *Int32_To_UInt8_Dither;
*/
- Int24Padded_To_Float32, /* PaUtilConverter *Int24Padded_To_Float32;
*/
- Int24Padded_To_Int32, /* PaUtilConverter *Int24Padded_To_Int32; */
- Int24Padded_To_Int32_Dither, /* PaUtilConverter
*Int24Padded_To_Int32_Dither; */
- Int24Padded_To_Int24, /* PaUtilConverter *Int24Padded_To_Int24; */
- Int24Padded_To_Int24_Dither, /* PaUtilConverter
*Int24Padded_To_Int24_Dither; */
- Int24Padded_To_Int16, /* PaUtilConverter *Int24Padded_To_Int16; */
- Int24Padded_To_Int16_Dither, /* PaUtilConverter
*Int24Padded_To_Int16_Dither; */
- Int24Padded_To_Int8, /* PaUtilConverter *Int24Padded_To_Int8; */
- Int24Padded_To_Int8_Dither, /* PaUtilConverter
*Int24Padded_To_Int8_Dither; */
- Int24Padded_To_UInt8, /* PaUtilConverter *Int24Padded_To_UInt8; */
- Int24Padded_To_UInt8_Dither, /* PaUtilConverter
*Int24Padded_To_UInt8_Dither; */
-
Int24_To_Float32, /* PaUtilConverter *Int24_To_Float32; */
Int24_To_Int32, /* PaUtilConverter *Int24_To_Int32; */
- Int24_To_Int24Padded, /* PaUtilConverter *Int24_To_Int24Padded; */
Int24_To_Int16, /* PaUtilConverter *Int24_To_Int16; */
Int24_To_Int16_Dither, /* PaUtilConverter *Int24_To_Int16_Dither;
*/
Int24_To_Int8, /* PaUtilConverter *Int24_To_Int8; */
@@ -2215,7 +1776,6 @@
Int16_To_Float32, /* PaUtilConverter *Int16_To_Float32; */
Int16_To_Int32, /* PaUtilConverter *Int16_To_Int32; */
- Int16_To_Int24Padded, /* PaUtilConverter *Int16_To_Int24Padded; */
Int16_To_Int24, /* PaUtilConverter *Int16_To_Int24; */
Int16_To_Int8, /* PaUtilConverter *Int16_To_Int8; */
Int16_To_Int8_Dither, /* PaUtilConverter *Int16_To_Int8_Dither; */
@@ -2224,14 +1784,12 @@
Int8_To_Float32, /* PaUtilConverter *Int8_To_Float32; */
Int8_To_Int32, /* PaUtilConverter *Int8_To_Int32; */
- Int8_To_Int24Padded, /* PaUtilConverter *Int8_To_Int24Padded; */
Int8_To_Int24, /* PaUtilConverter *Int8_To_Int24 */
Int8_To_Int16, /* PaUtilConverter *Int8_To_Int16; */
Int8_To_UInt8, /* PaUtilConverter *Int8_To_UInt8; */
UInt8_To_Float32, /* PaUtilConverter *UInt8_To_Float32; */
UInt8_To_Int32, /* PaUtilConverter *UInt8_To_Int32; */
- UInt8_To_Int24Padded, /* PaUtilConverter *UInt8_To_Int24Padded; */
UInt8_To_Int24, /* PaUtilConverter *UInt8_To_Int24; */
UInt8_To_Int16, /* PaUtilConverter *UInt8_To_Int16; */
UInt8_To_Int8, /* PaUtilConverter *UInt8_To_Int8; */
@@ -2254,8 +1812,6 @@
case paFloat32:
return paZeroers.Zero32;
case paInt32:
- return paZeroers.Zero32;
- case paInt24Padded:
return paZeroers.Zero32;
case paInt24:
return paZeroers.Zero24;
Modified:
7.2/trunk/squeezeplay/src/portaudio_v19_1360/src/common/pa_converters.h
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/portaudio_v19_1360/src/common/pa_converters.h?rev=2467&root=Jive&r1=2466&r2=2467&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/portaudio_v19_1360/src/common/pa_converters.h
(original)
+++ 7.2/trunk/squeezeplay/src/portaudio_v19_1360/src/common/pa_converters.h Fri
May 16 02:24:35 2008
@@ -141,11 +141,6 @@
PaUtilConverter *Float32_To_Int32_Clip;
PaUtilConverter *Float32_To_Int32_DitherClip;
- PaUtilConverter *Float32_To_Int24Padded;
- PaUtilConverter *Float32_To_Int24Padded_Dither;
- PaUtilConverter *Float32_To_Int24Padded_Clip;
- PaUtilConverter *Float32_To_Int24Padded_DitherClip;
-
PaUtilConverter *Float32_To_Int24;
PaUtilConverter *Float32_To_Int24_Dither;
PaUtilConverter *Float32_To_Int24_Clip;
@@ -167,8 +162,6 @@
PaUtilConverter *Float32_To_UInt8_DitherClip;
PaUtilConverter *Int32_To_Float32;
- PaUtilConverter *Int32_To_Int24Padded;
- PaUtilConverter *Int32_To_Int24Padded_Dither;
PaUtilConverter *Int32_To_Int24;
PaUtilConverter *Int32_To_Int24_Dither;
PaUtilConverter *Int32_To_Int16;
@@ -178,21 +171,8 @@
PaUtilConverter *Int32_To_UInt8;
PaUtilConverter *Int32_To_UInt8_Dither;
- PaUtilConverter *Int24Padded_To_Float32;
- PaUtilConverter *Int24Padded_To_Int32;
- PaUtilConverter *Int24Padded_To_Int32_Dither;
- PaUtilConverter *Int24Padded_To_Int24;
- PaUtilConverter *Int24Padded_To_Int24_Dither;
- PaUtilConverter *Int24Padded_To_Int16;
- PaUtilConverter *Int24Padded_To_Int16_Dither;
- PaUtilConverter *Int24Padded_To_Int8;
- PaUtilConverter *Int24Padded_To_Int8_Dither;
- PaUtilConverter *Int24Padded_To_UInt8;
- PaUtilConverter *Int24Padded_To_UInt8_Dither;
-
PaUtilConverter *Int24_To_Float32;
PaUtilConverter *Int24_To_Int32;
- PaUtilConverter *Int24_To_Int24Padded;
PaUtilConverter *Int24_To_Int16;
PaUtilConverter *Int24_To_Int16_Dither;
PaUtilConverter *Int24_To_Int8;
@@ -202,7 +182,6 @@
PaUtilConverter *Int16_To_Float32;
PaUtilConverter *Int16_To_Int32;
- PaUtilConverter *Int16_To_Int24Padded;
PaUtilConverter *Int16_To_Int24;
PaUtilConverter *Int16_To_Int8;
PaUtilConverter *Int16_To_Int8_Dither;
@@ -211,14 +190,12 @@
PaUtilConverter *Int8_To_Float32;
PaUtilConverter *Int8_To_Int32;
- PaUtilConverter *Int8_To_Int24Padded;
PaUtilConverter *Int8_To_Int24;
PaUtilConverter *Int8_To_Int16;
PaUtilConverter *Int8_To_UInt8;
PaUtilConverter *UInt8_To_Float32;
PaUtilConverter *UInt8_To_Int32;
- PaUtilConverter *UInt8_To_Int24Padded;
PaUtilConverter *UInt8_To_Int24;
PaUtilConverter *UInt8_To_Int16;
PaUtilConverter *UInt8_To_Int8;
Modified: 7.2/trunk/squeezeplay/src/portaudio_v19_1360/src/common/pa_front.c
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/portaudio_v19_1360/src/common/pa_front.c?rev=2467&root=Jive&r1=2466&r2=2467&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/portaudio_v19_1360/src/common/pa_front.c
(original)
+++ 7.2/trunk/squeezeplay/src/portaudio_v19_1360/src/common/pa_front.c Fri May
16 02:24:35 2008
@@ -750,7 +750,6 @@
case paFloat32: return 1;
case paInt16: return 1;
case paInt32: return 1;
- case paInt24Padded: return 1;
case paInt24: return 1;
case paInt8: return 1;
case paUInt8: return 1;
@@ -1751,7 +1750,6 @@
case paFloat32:
case paInt32:
- case paInt24Padded:
result = 4;
break;
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
