# HG changeset patch # User vitor # Date 1220572820 0 # Node ID 09b73aceebaf3779db87fa7b166ef6109a14f30c # Parent a7caaa2b56e9452002ce8bbbde3301b259aca149 Simplify: use a for instead of unrolling by hand diff -r a7caaa2b56e9 -r 09b73aceebaf mace.c --- a/mace.c Thu Sep 04 23:54:57 2008 +0000 +++ b/mace.c Fri Sep 05 00:00:20 2008 +0000 @@ -317,7 +317,7 @@ { short *samples = data; MACEContext *ctx = avctx->priv_data; - int i, j; + int i, j, k; for(i = 0; i < avctx->channels; i++) { ctx->index = ctx->lev = 0; @@ -325,15 +325,12 @@ ctx->outPtr = samples + i; for (j=0; j < buf_size / 2 / avctx->channels; j++) { - uint8_t pkt = buf[i*2 + j*2*avctx->channels]; + for (k=0; k < 2; k++) { + uint8_t pkt = buf[i*2 + j*2*avctx->channels + k]; chomp3(ctx, pkt & 7, MACEtab1, MACEtab2, avctx->channels); chomp3(ctx,(pkt >> 3) & 3, MACEtab3, MACEtab4, avctx->channels); chomp3(ctx, pkt >> 5 , MACEtab1, MACEtab2, avctx->channels); - - pkt = buf[i*2 + j*2*avctx->channels + 1]; - chomp3(ctx, pkt & 7, MACEtab1, MACEtab2, avctx->channels); - chomp3(ctx,(pkt >> 3) & 3, MACEtab3, MACEtab4, avctx->channels); - chomp3(ctx, pkt >> 5 , MACEtab1, MACEtab2, avctx->channels); + } } }