annotate mlpdsp.c @ 12530:63edd10ad4bc libavcodec tip

Try to fix crashes introduced by r25218 r25218 made assumptions about the existence of past reference frames that weren't necessarily true.
author darkshikari
date Tue, 28 Sep 2010 09:06:22 +0000
parents 0b220468ba0d
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
9585
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
1 /*
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
2 * Copyright (c) 2007-2008 Ian Caulfield
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
3 * 2009 Ramiro Polla
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
4 *
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
5 * This file is part of FFmpeg.
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
6 *
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
7 * FFmpeg is free software; you can redistribute it and/or
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
9 * License as published by the Free Software Foundation; either
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
10 * version 2.1 of the License, or (at your option) any later version.
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
11 *
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
12 * FFmpeg is distributed in the hope that it will be useful,
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
15 * Lesser General Public License for more details.
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
16 *
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
17 * You should have received a copy of the GNU Lesser General Public
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
18 * License along with FFmpeg; if not, write to the Free Software
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
20 */
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
21
9646
b8b9ff6fa077 mlp: include mlp.h and use MAX_CHANNELS instead of hardcoding value 8.
ramiro
parents: 9585
diff changeset
22 #include "libavcodec/mlp.h"
9585
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
23 #include "dsputil.h"
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
24
9647
d0fe5dc427f0 mlp: Simplify adressing of state and coeffs arrays for both filters by making
ramiro
parents: 9646
diff changeset
25 static void ff_mlp_filter_channel(int32_t *state, const int32_t *coeff,
d0fe5dc427f0 mlp: Simplify adressing of state and coeffs arrays for both filters by making
ramiro
parents: 9646
diff changeset
26 int firorder, int iirorder,
9585
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
27 unsigned int filter_shift, int32_t mask, int blocksize,
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
28 int32_t *sample_buffer)
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
29 {
9647
d0fe5dc427f0 mlp: Simplify adressing of state and coeffs arrays for both filters by making
ramiro
parents: 9646
diff changeset
30 int32_t *firbuf = state;
d0fe5dc427f0 mlp: Simplify adressing of state and coeffs arrays for both filters by making
ramiro
parents: 9646
diff changeset
31 int32_t *iirbuf = state + MAX_BLOCKSIZE + MAX_FIR_ORDER;
d0fe5dc427f0 mlp: Simplify adressing of state and coeffs arrays for both filters by making
ramiro
parents: 9646
diff changeset
32 const int32_t *fircoeff = coeff;
d0fe5dc427f0 mlp: Simplify adressing of state and coeffs arrays for both filters by making
ramiro
parents: 9646
diff changeset
33 const int32_t *iircoeff = coeff + MAX_FIR_ORDER;
9585
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
34 int i;
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
35
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
36 for (i = 0; i < blocksize; i++) {
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
37 int32_t residual = *sample_buffer;
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
38 unsigned int order;
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
39 int64_t accum = 0;
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
40 int32_t result;
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
41
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
42 for (order = 0; order < firorder; order++)
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
43 accum += (int64_t) firbuf[order] * fircoeff[order];
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
44 for (order = 0; order < iirorder; order++)
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
45 accum += (int64_t) iirbuf[order] * iircoeff[order];
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
46
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
47 accum = accum >> filter_shift;
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
48 result = (accum + residual) & mask;
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
49
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
50 *--firbuf = result;
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
51 *--iirbuf = result - accum;
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
52
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
53 *sample_buffer = result;
9646
b8b9ff6fa077 mlp: include mlp.h and use MAX_CHANNELS instead of hardcoding value 8.
ramiro
parents: 9585
diff changeset
54 sample_buffer += MAX_CHANNELS;
9585
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
55 }
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
56 }
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
57
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
58 void ff_mlp_init(DSPContext* c, AVCodecContext *avctx)
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
59 {
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
60 c->mlp_filter_channel = ff_mlp_filter_channel;
9705
1db34b8dcf15 mlp: Re-enable x86-optimized DSP functions.
ramiro
parents: 9689
diff changeset
61 if (ARCH_X86)
1db34b8dcf15 mlp: Re-enable x86-optimized DSP functions.
ramiro
parents: 9689
diff changeset
62 ff_mlp_init_x86(c, avctx);
9585
5e1d9508b62f mlpdec: Move MLP's filter_channel() to dsputils.
ramiro
parents:
diff changeset
63 }