summaryrefslogtreecommitdiff
path: root/premix.c
diff options
context:
space:
mode:
authorGravatar waker <wakeroid@gmail.com>2010-11-23 21:21:36 +0100
committerGravatar waker <wakeroid@gmail.com>2010-11-23 21:21:36 +0100
commite910b10f97d9da681ed11831e85bf1410a246551 (patch)
tree077df9186078c546731aa68cdeec3e923e7168eb /premix.c
parent575757905dcb6df69327223ef2bb24d089627c32 (diff)
small fix to 24<->float converters
Diffstat (limited to 'premix.c')
-rw-r--r--premix.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/premix.c b/premix.c
index 46036f1e..ebb06575 100644
--- a/premix.c
+++ b/premix.c
@@ -196,7 +196,7 @@ pcm_write_samples_24_to_float (const ddb_waveformat_t * restrict inputfmt, const
for (int c = 0; c < inputfmt->channels; c++) {
if (channelmap[c] != -1) {
float *out = (float *)(output + 4 * channelmap[c]);
- int32_t sample = ((int32_t)input[0]<<16) | ((int32_t)input[1]<<8) | (input[2]);
+ int32_t sample = ((int32_t)input[0]<<24) | ((int32_t)input[1]<<16) | (input[2]<<8);
*out = sample / (float)0x7fffffff;
}
input += 3;
@@ -285,9 +285,9 @@ pcm_write_samples_float_to_24 (const ddb_waveformat_t * restrict inputfmt, const
sample = -1;
}
int32_t outsample = (int32_t)ftoi (sample * 0x7fffffff);
- out[0] = (outsample&0x00ff0000)>>16;
- out[1] = (outsample&0x0000ff00)>>8;
- out[2] = (outsample&0x000000ff);
+ out[0] = (outsample&0xff000000)>>24;
+ out[1] = (outsample&0x00ff0000)>>16;
+ out[2] = (outsample&0x0000ff00)>>8;
}
input += 4;
}