* Copyright (c) 2007-2008 Ian Caulfield
* 2009 Ramiro Polla
*
- * This file is part of FFmpeg.
+ * This file is part of Libav.
*
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "dsputil.h"
+#include "config.h"
+#include "libavutil/attributes.h"
+#include "mlpdsp.h"
+#include "mlp.h"
-static void ff_mlp_filter_channel(int32_t *firbuf, const int32_t *fircoeff, int firorder,
- int32_t *iirbuf, const int32_t *iircoeff, int iirorder,
- unsigned int filter_shift, int32_t mask, int blocksize,
- int32_t *sample_buffer)
+static void mlp_filter_channel(int32_t *state, const int32_t *coeff,
+ int firorder, int iirorder,
+ unsigned int filter_shift, int32_t mask,
+ int blocksize, int32_t *sample_buffer)
{
+ int32_t *firbuf = state;
+ int32_t *iirbuf = state + MAX_BLOCKSIZE + MAX_FIR_ORDER;
+ const int32_t *fircoeff = coeff;
+ const int32_t *iircoeff = coeff + MAX_FIR_ORDER;
int i;
for (i = 0; i < blocksize; i++) {
*--iirbuf = result - accum;
*sample_buffer = result;
- sample_buffer += 8;
+ sample_buffer += MAX_CHANNELS;
}
}
-void ff_mlp_init(DSPContext* c, AVCodecContext *avctx)
+av_cold void ff_mlpdsp_init(MLPDSPContext *c)
{
- c->mlp_filter_channel = ff_mlp_filter_channel;
+ c->mlp_filter_channel = mlp_filter_channel;
+ if (ARCH_X86)
+ ff_mlpdsp_init_x86(c);
}