diff options
| author | Paul B Mahol <onemda@gmail.com> | 2013-05-09 09:59:38 +0000 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2013-05-09 20:36:58 +0000 |
| commit | 13cb6ed3c449c57c605653943f7d6168afa10bf9 (patch) | |
| tree | e309bbc93c096fceb881d77436b9e75442a49f45 /libavcodec/takdec.c | |
| parent | 43b6482d0a8f3ca0b84be455331b8d16f36346a9 (diff) | |
| download | ffmpeg-13cb6ed3c449c57c605653943f7d6168afa10bf9.tar.gz | |
takdec: simplify use of scalarproduct_int16 in decode_subframe()
Makes decoding little faster.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavcodec/takdec.c')
| -rw-r--r-- | libavcodec/takdec.c | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/libavcodec/takdec.c b/libavcodec/takdec.c index 43382f1034..f36cec334b 100644 --- a/libavcodec/takdec.c +++ b/libavcodec/takdec.c @@ -468,27 +468,14 @@ static int decode_subframe(TAKDecContext *s, int32_t *decoded, for (i = 0; i < tmp; i++) { int v = 1 << (filter_quant - 1); - if (!(filter_order & 15)) { + if (filter_order & -16) v += s->dsp.scalarproduct_int16(&s->residues[i], s->filter, - filter_order); - } else if (filter_order & 4) { - for (j = 0; j < filter_order; j += 4) { - v += s->residues[i + j + 3] * s->filter[j + 3] + - s->residues[i + j + 2] * s->filter[j + 2] + - s->residues[i + j + 1] * s->filter[j + 1] + - s->residues[i + j ] * s->filter[j ]; - } - } else { - for (j = 0; j < filter_order; j += 8) { - v += s->residues[i + j + 7] * s->filter[j + 7] + - s->residues[i + j + 6] * s->filter[j + 6] + - s->residues[i + j + 5] * s->filter[j + 5] + - s->residues[i + j + 4] * s->filter[j + 4] + - s->residues[i + j + 3] * s->filter[j + 3] + - s->residues[i + j + 2] * s->filter[j + 2] + - s->residues[i + j + 1] * s->filter[j + 1] + - s->residues[i + j ] * s->filter[j ]; - } + filter_order & -16); + for (j = filter_order & -16; j < filter_order; j += 4) { + v += s->residues[i + j + 3] * s->filter[j + 3] + + s->residues[i + j + 2] * s->filter[j + 2] + + s->residues[i + j + 1] * s->filter[j + 1] + + s->residues[i + j ] * s->filter[j ]; } v = (av_clip(v >> filter_quant, -8192, 8191) << dshift) - *decoded; *decoded++ = v; |