diff options
| author | Siarhei Siamashka <siarhei.siamashka@nokia.com> | 2009-03-16 02:27:26 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2009-03-14 07:15:47 +0100 |
| commit | fe3eae16902ebce9530f058dfeb9f1db49b2fa3e (patch) | |
| tree | 3d4ba7ad6a3fc31b98fa37d14e3ad9435413fd73 | |
| parent | bf6a4a577408aa6192c40f9a789788badb1a386a (diff) | |
sbc: ensure 16-byte buffer position alignment for 4 subbands encoding
Buffer position in X array was not always 16-bytes aligned.
Strict 16-byte alignment is strictly required for powerpc altivec
simd optimizations because altivec does not have support for
unaligned vector loads at all.
| -rw-r--r-- | sbc/sbc.c | 2 | ||||
| -rw-r--r-- | sbc/sbc_primitives.c | 6 |
2 files changed, 4 insertions, 4 deletions
@@ -924,7 +924,7 @@ static void sbc_encoder_init(struct sbc_encoder_state *state, const struct sbc_frame *frame) { memset(&state->X, 0, sizeof(state->X)); - state->position = SBC_X_BUFFER_SIZE - frame->subbands * 9; + state->position = (SBC_X_BUFFER_SIZE - frame->subbands * 9) & ~7; sbc_init_primitives(state); } diff --git a/sbc/sbc_primitives.c b/sbc/sbc_primitives.c index 6b0be3f5..2105280e 100644 --- a/sbc/sbc_primitives.c +++ b/sbc/sbc_primitives.c @@ -231,12 +231,12 @@ static SBC_ALWAYS_INLINE int sbc_encoder_process_input_s4_internal( /* handle X buffer wraparound */ if (position < nsamples) { if (nchannels > 0) - memcpy(&X[0][SBC_X_BUFFER_SIZE - 36], &X[0][position], + memcpy(&X[0][SBC_X_BUFFER_SIZE - 40], &X[0][position], 36 * sizeof(int16_t)); if (nchannels > 1) - memcpy(&X[1][SBC_X_BUFFER_SIZE - 36], &X[1][position], + memcpy(&X[1][SBC_X_BUFFER_SIZE - 40], &X[1][position], 36 * sizeof(int16_t)); - position = SBC_X_BUFFER_SIZE - 36; + position = SBC_X_BUFFER_SIZE - 40; } #define PCM(i) (big_endian ? \ |