Author: titmuss
Date: Mon Jan 5 01:57:46 2009
New Revision: 3667
URL: http://svn.slimdevices.com?rev=3667&root=Jive&view=rev
Log:
r3...@harrypotter (orig r3666): titmuss | 2009-01-05 09:51:50 +0000
Bug: N/A
Description:
Fix wav playback, removing static.
Modified:
7.4/trunk/ (props changed)
7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_pcm.c
Propchange: 7.4/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Mon Jan 5 01:57:46 2009
@@ -3,7 +3,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2920
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2921
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/private-branches/jive-refresh:3653
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3658
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:3666
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified: 7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_pcm.c
URL:
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_pcm.c?rev=3667&root=Jive&r1=3666&r2=3667&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_pcm.c
(original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay/src/audio/decode/decode_pcm.c Mon Jan
5 01:57:46 2009
@@ -40,106 +40,35 @@
static sample_t pcm_read8bitBE(u8_t *pos) {
- sample_t sample;
- struct { s32_t sign_extend:8; } s;
-
- /* XXXX: REVIEW */
-
- sample = *pos;
-
- sample = s.sign_extend = sample;
- return sample << 24;
+ return (sample_t) (*pos << 24);
}
-
static sample_t pcm_read8bitLE(u8_t *pos) {
- sample_t sample;
- struct { s32_t sign_extend:8; } s;
-
- /* XXXX: REVIEW */
-
- sample = *pos;
-
- sample = s.sign_extend = sample;
- return sample << 24;
+ return (sample_t) (*pos << 24);
}
-
static sample_t pcm_read16bitBE(u8_t *pos) {
- sample_t sample;
- struct { s32_t sign_extend:16; } s;
-
- /* XXXX: REVIEW */
-
- sample = *pos++ << 8;
- sample = *pos;
-
- sample = s.sign_extend = sample;
- return sample << 16;
+ return (sample_t) (*pos << 24) | (*++pos << 16);
}
-
static sample_t pcm_read16bitLE(u8_t *pos) {
- sample_t sample;
- struct { s32_t sign_extend:16; } s;
-
- sample = *pos++;
- sample = *pos << 8;
-
- sample = s.sign_extend = sample;
- return sample << 16;
+ return (sample_t) (*pos << 16) | (*++pos << 24);
}
-
-static sample_t pcm_read24bitBE(u8_t *pos) {
- sample_t sample;
- struct { s32_t sign_extend:24; } s;
-
- /* XXXX: REVIEW */
-
- sample = *pos++ << 16;
- sample |= *pos++ << 8;
- sample |= *pos;
-
- sample = s.sign_extend = sample;
- return sample << 8;
+static sample_t pcm_read24bitBE(u8_t *pos) {
+ return (sample_t) (*pos << 24) | (*++pos << 16) | (*++pos << 8);
}
-
-static sample_t pcm_read24bitLE(u8_t *pos) {
- sample_t sample;
- struct { s32_t sign_extend:24; } s;
-
- sample = *pos++;
- sample |= *pos++ << 8;
- sample |= *pos << 16;
-
- sample = s.sign_extend = sample;
- return sample << 8;
+static sample_t pcm_read24bitLE(u8_t *pos) {
+ return (sample_t) (*pos << 8) | (*++pos << 16) | (*++pos << 24);
}
-
-static sample_t pcm_read32bitBE(u8_t *pos) {
- sample_t sample;
- struct { s32_t sign_extend:32; } s;
-
- /* XXXX: REVIEW */
-
- sample = *pos++ << 24;
- sample |= *pos++ << 16;
- sample |= *pos++ << 8;
- sample |= *pos;
-
- sample = s.sign_extend = sample;
- return sample;
+static sample_t pcm_read32bitBE(u8_t *pos) {
+ return (sample_t) (*pos << 24) | (*++pos << 16) | (*++pos << 8) |
(*++pos);
}
-
static sample_t pcm_read32bitLE(u8_t *pos) {
- sample_t sample;
-
- sample = *((s32_t *)(void *)pos);
- return sample;
+ return *((sample_t *)(void *)pos);
}
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
