[FFmpeg-cvslog] r18721 - in trunk/libavcodec: Makefile dsputil.c dsputil.h mlpdec.c mlpdsp.c
ramiro
subversion
Thu Apr 30 14:30:06 CEST 2009
Author: ramiro
Date: Thu Apr 30 14:30:05 2009
New Revision: 18721
Log:
mlpdec: Move MLP's filter_channel() to dsputils.
Added:
trunk/libavcodec/mlpdsp.c
Modified:
trunk/libavcodec/Makefile
trunk/libavcodec/dsputil.c
trunk/libavcodec/dsputil.h
trunk/libavcodec/mlpdec.c
Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile Thu Apr 30 14:08:35 2009 (r18720)
+++ trunk/libavcodec/Makefile Thu Apr 30 14:30:05 2009 (r18721)
@@ -125,7 +125,7 @@ OBJS-$(CONFIG_MIMIC_DECODER) +
OBJS-$(CONFIG_MJPEG_DECODER) += mjpegdec.o mjpeg.o
OBJS-$(CONFIG_MJPEG_ENCODER) += mjpegenc.o mjpeg.o mpegvideo_enc.o motion_est.o ratecontrol.o mpeg12data.o mpegvideo.o
OBJS-$(CONFIG_MJPEGB_DECODER) += mjpegbdec.o mjpegdec.o mjpeg.o
-OBJS-$(CONFIG_MLP_DECODER) += mlpdec.o mlp_parser.o mlp.o
+OBJS-$(CONFIG_MLP_DECODER) += mlpdec.o mlp_parser.o mlp.o mlpdsp.o
OBJS-$(CONFIG_MMVIDEO_DECODER) += mmvideo.o
OBJS-$(CONFIG_MOTIONPIXELS_DECODER) += motionpixels.o
OBJS-$(CONFIG_MP1_DECODER) += mpegaudiodec.o mpegaudiodecheader.o mpegaudio.o mpegaudiodata.o
@@ -221,7 +221,7 @@ OBJS-$(CONFIG_THP_DECODER) +
OBJS-$(CONFIG_TIERTEXSEQVIDEO_DECODER) += tiertexseqv.o
OBJS-$(CONFIG_TIFF_DECODER) += tiff.o lzw.o faxcompr.o
OBJS-$(CONFIG_TIFF_ENCODER) += tiffenc.o rle.o lzwenc.o
-OBJS-$(CONFIG_TRUEHD_DECODER) += mlpdec.o mlp_parser.o mlp.o
+OBJS-$(CONFIG_TRUEHD_DECODER) += mlpdec.o mlp_parser.o mlp.o mlpdsp.o
OBJS-$(CONFIG_TRUEMOTION1_DECODER) += truemotion1.o
OBJS-$(CONFIG_TRUEMOTION2_DECODER) += truemotion2.o
OBJS-$(CONFIG_TRUESPEECH_DECODER) += truespeech.o
Modified: trunk/libavcodec/dsputil.c
==============================================================================
--- trunk/libavcodec/dsputil.c Thu Apr 30 14:08:35 2009 (r18720)
+++ trunk/libavcodec/dsputil.c Thu Apr 30 14:30:05 2009 (r18721)
@@ -2754,6 +2754,10 @@ void ff_avg_cavs_qpel16_mc00_c(uint8_t *
}
#endif /* CONFIG_CAVS_DECODER */
+#if CONFIG_MLP_DECODER || CONFIG_TRUEHD_DECODER
+ void ff_mlp_init(DSPContext* c, AVCodecContext *avctx);
+#endif
+
#if CONFIG_VC1_DECODER || CONFIG_WMV3_DECODER
/* VC-1 specific */
void ff_vc1dsp_init(DSPContext* c, AVCodecContext *avctx);
@@ -4542,6 +4546,10 @@ void dsputil_init(DSPContext* c, AVCodec
#if CONFIG_CAVS_DECODER
ff_cavsdsp_init(c,avctx);
#endif
+
+#if CONFIG_MLP_DECODER || CONFIG_TRUEHD_DECODER
+ ff_mlp_init(c, avctx);
+#endif
#if CONFIG_VC1_DECODER || CONFIG_WMV3_DECODER
ff_vc1dsp_init(c,avctx);
#endif
Modified: trunk/libavcodec/dsputil.h
==============================================================================
--- trunk/libavcodec/dsputil.h Thu Apr 30 14:08:35 2009 (r18720)
+++ trunk/libavcodec/dsputil.h Thu Apr 30 14:30:05 2009 (r18721)
@@ -475,6 +475,12 @@ typedef struct DSPContext {
void (*shrink[4])(uint8_t *dst, int dst_wrap, const uint8_t *src, int src_wrap, int width, int height);
+ /* mlp/truehd functions */
+ void (*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);
+
/* vc1 functions */
void (*vc1_inv_trans_8x8)(DCTELEM *b);
void (*vc1_inv_trans_8x4)(uint8_t *dest, int line_size, DCTELEM *block);
Modified: trunk/libavcodec/mlpdec.c
==============================================================================
--- trunk/libavcodec/mlpdec.c Thu Apr 30 14:08:35 2009 (r18720)
+++ trunk/libavcodec/mlpdec.c Thu Apr 30 14:30:05 2009 (r18721)
@@ -27,6 +27,7 @@
#include <stdint.h>
#include "avcodec.h"
+#include "dsputil.h"
#include "libavutil/intreadwrite.h"
#include "get_bits.h"
#include "libavutil/crc.h"
@@ -144,6 +145,8 @@ typedef struct MLPDecodeContext {
int8_t noise_buffer[MAX_BLOCKSIZE_POW2];
int8_t bypassed_lsbs[MAX_BLOCKSIZE][MAX_CHANNELS];
int32_t sample_buffer[MAX_BLOCKSIZE][MAX_CHANNELS];
+
+ DSPContext dsp;
} MLPDecodeContext;
static VLC huff_vlc[3];
@@ -231,6 +234,7 @@ static av_cold int mlp_decode_init(AVCod
m->avctx = avctx;
for (substr = 0; substr < MAX_SUBSTREAMS; substr++)
m->substream[substr].lossless_check_data = 0xffffffff;
+ dsputil_init(&m->dsp, avctx);
return 0;
}
@@ -708,35 +712,17 @@ static void filter_channel(MLPDecodeCont
FilterParams *iir = &m->channel_params[channel].filter_params[IIR];
unsigned int filter_shift = fir->shift;
int32_t mask = MSB_MASK(s->quant_step_size[channel]);
- int i;
memcpy(firbuf, fir->state, MAX_FIR_ORDER * sizeof(int32_t));
memcpy(iirbuf, iir->state, MAX_IIR_ORDER * sizeof(int32_t));
- for (i = 0; i < s->blocksize; i++) {
- int32_t residual = m->sample_buffer[i + s->blockpos][channel];
- unsigned int order;
- int64_t accum = 0;
- int32_t result;
-
- /* TODO: Move this code to DSPContext? */
-
- for (order = 0; order < fir->order; order++)
- accum += (int64_t) firbuf[order] * fir->coeff[order];
- for (order = 0; order < iir->order; order++)
- accum += (int64_t) iirbuf[order] * iir->coeff[order];
-
- accum = accum >> filter_shift;
- result = (accum + residual) & mask;
-
- *--firbuf = result;
- *--iirbuf = result - accum;
-
- m->sample_buffer[i + s->blockpos][channel] = result;
- }
+ m->dsp.mlp_filter_channel(firbuf, fir->coeff, fir->order,
+ iirbuf, iir->coeff, iir->order,
+ filter_shift, mask, s->blocksize,
+ &m->sample_buffer[s->blockpos][channel]);
- memcpy(fir->state, firbuf, MAX_FIR_ORDER * sizeof(int32_t));
- memcpy(iir->state, iirbuf, MAX_IIR_ORDER * sizeof(int32_t));
+ memcpy(fir->state, firbuf - s->blocksize, MAX_FIR_ORDER * sizeof(int32_t));
+ memcpy(iir->state, iirbuf - s->blocksize, MAX_IIR_ORDER * sizeof(int32_t));
}
/** Read a block of PCM residual data (or actual if no filtering active). */
Added: trunk/libavcodec/mlpdsp.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/libavcodec/mlpdsp.c Thu Apr 30 14:30:05 2009 (r18721)
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2007-2008 Ian Caulfield
+ * 2009 Ramiro Polla
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg 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,
+ * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "dsputil.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)
+{
+ int i;
+
+ for (i = 0; i < blocksize; i++) {
+ int32_t residual = *sample_buffer;
+ unsigned int order;
+ int64_t accum = 0;
+ int32_t result;
+
+ for (order = 0; order < firorder; order++)
+ accum += (int64_t) firbuf[order] * fircoeff[order];
+ for (order = 0; order < iirorder; order++)
+ accum += (int64_t) iirbuf[order] * iircoeff[order];
+
+ accum = accum >> filter_shift;
+ result = (accum + residual) & mask;
+
+ *--firbuf = result;
+ *--iirbuf = result - accum;
+
+ *sample_buffer = result;
+ sample_buffer += 8;
+ }
+}
+
+void ff_mlp_init(DSPContext* c, AVCodecContext *avctx)
+{
+ c->mlp_filter_channel = ff_mlp_filter_channel;
+}
More information about the ffmpeg-cvslog
mailing list