Author: titmuss
Date: Fri May 16 02:20:25 2008
New Revision: 2466
URL: http://svn.slimdevices.com?rev=2466&root=Jive&view=rev
Log:
Bug: N/A
Description:
Convert to use 32 bit samples in the output buffer.
Modified:
7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_flac.c
7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_mad.c
7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_pcm.c
7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c
7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_priv.h
7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_tones.c
Modified: 7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_flac.c
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_flac.c?rev=2466&root=Jive&r1=2465&r2=2466&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_flac.c
(original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_flac.c Fri
May 16 02:20:25 2008
@@ -86,14 +86,14 @@
if (frame->header.channels == 1) {
if (frame->header.bits_per_sample == 16) {
for (i=0; i<frame->header.blocksize; i++) {
+ FLAC__int32 s = *lptr++ << 16;
+ *sptr++ = s;
+ *sptr++ = s;
+ }
+ }
+ else /* bits_per_sample == 24 */ {
+ for (i=0; i<frame->header.blocksize; i++) {
FLAC__int32 s = *lptr++ << 8;
- *sptr++ = s;
- *sptr++ = s;
- }
- }
- else /* bits_per_sample == 24 */ {
- for (i=0; i<frame->header.blocksize; i++) {
- FLAC__int32 s = *lptr++;
*sptr++ = s;
*sptr++ = s;
}
@@ -102,14 +102,14 @@
else {
if (frame->header.bits_per_sample == 16) {
for (i=0; i<frame->header.blocksize; i++) {
+ *sptr++ = *lptr++ << 16;
+ *sptr++ = *rptr++ << 16;
+ }
+ }
+ else /* bits_per_sample == 24 */ {
+ for (i=0; i<frame->header.blocksize; i++) {
*sptr++ = *lptr++ << 8;
*sptr++ = *rptr++ << 8;
- }
- }
- else /* bits_per_sample == 24 */ {
- for (i=0; i<frame->header.blocksize; i++) {
- *sptr++ = *lptr++;
- *sptr++ = *rptr++;
}
}
}
Modified: 7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_mad.c
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_mad.c?rev=2466&root=Jive&r1=2465&r2=2466&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_mad.c
(original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_mad.c Fri May
16 02:20:25 2008
@@ -150,8 +150,8 @@
if (self->synth.pcm.channels == 2) {
/* stero */
for (i=0; i<self->synth.pcm.length; i++) {
- *buf++ = *left++ >> (MAD_F_FRACBITS + 1 - 24);
- *buf++ = *right++ >> (MAD_F_FRACBITS + 1 - 24);
+ *buf++ = *left++ << (32 - MAD_F_FRACBITS - 1);
+ *buf++ = *right++ << (32 - MAD_F_FRACBITS - 1);
}
}
else {
@@ -159,7 +159,7 @@
sample_t s;
for (i=0; i<self->synth.pcm.length; i++) {
- s = *left++ >> (MAD_F_FRACBITS + 1 - 24);
+ s = *left++ << (32 - MAD_F_FRACBITS - 1);
*buf++ = s;
*buf++ = s;
Modified: 7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_pcm.c
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_pcm.c?rev=2466&root=Jive&r1=2465&r2=2466&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_pcm.c
(original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_pcm.c Fri May
16 02:20:25 2008
@@ -48,7 +48,7 @@
sample = *pos;
sample = s.sign_extend = sample;
- return sample << 16;
+ return sample << 24;
}
@@ -61,7 +61,7 @@
sample = *pos;
sample = s.sign_extend = sample;
- return sample << 16;
+ return sample << 24;
}
@@ -75,7 +75,7 @@
sample = *pos;
sample = s.sign_extend = sample;
- return sample << 8;
+ return sample << 16;
}
@@ -87,7 +87,7 @@
sample = *pos << 8;
sample = s.sign_extend = sample;
- return sample << 8;
+ return sample << 16;
}
@@ -102,7 +102,7 @@
sample |= *pos;
sample = s.sign_extend = sample;
- return sample;
+ return sample << 8;
}
@@ -115,7 +115,7 @@
sample |= *pos << 16;
sample = s.sign_extend = sample;
- return sample;
+ return sample << 8;
}
@@ -131,7 +131,7 @@
sample |= *pos;
sample = s.sign_extend = sample;
- return sample >> 8;
+ return sample;
}
@@ -139,7 +139,7 @@
sample_t sample;
sample = *((s32_t *)pos);
- return sample >> 8;
+ return sample;
}
Modified:
7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c?rev=2466&root=Jive&r1=2465&r2=2466&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c
(original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_portaudio.c
Fri May 16 02:20:25 2008
@@ -232,7 +232,7 @@
memset(&outputParam, 0, sizeof(outputParam));
outputParam.channelCount = 2;
- outputParam.sampleFormat = paInt24Padded;
+ outputParam.sampleFormat = paInt32;
num_devices = Pa_GetDeviceCount();
for (i = 0; i < num_devices; i++) {
Modified: 7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_priv.h
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_priv.h?rev=2466&root=Jive&r1=2465&r2=2466&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_priv.h
(original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_priv.h Fri
May 16 02:20:25 2008
@@ -11,7 +11,7 @@
#include "audio/fifo.h"
-/* Audio sample, 24-bit padded.
+/* Audio sample, 32-bits.
*/
typedef s32_t sample_t;
Modified: 7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_tones.c
URL:
http://svn.slimdevices.com/7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_tones.c?rev=2466&root=Jive&r1=2465&r2=2466&view=diff
==============================================================================
--- 7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_tones.c
(original)
+++ 7.2/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_tones.c Fri
May 16 02:20:25 2008
@@ -111,8 +111,8 @@
if (++self->count == 40)
self->count = 0;
- *write_pos++ = sample;
- *write_pos++ = sample;
+ *write_pos++ = sample << 8;
+ *write_pos++ = sample << 8;
}
break;
@@ -153,8 +153,8 @@
right = sample;
}
- *write_pos++ = left;
- *write_pos++ = right;
+ *write_pos++ = left << 8;
+ *write_pos++ = right << 8;
}
DEBUG_TRACE("count: %08x, theta: %08x", self->count,
self->theta);
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
