#include <stdint.h>
#include "avcodec.h"
+#include "dsputil.h"
#include "libavutil/intreadwrite.h"
#include "get_bits.h"
#include "libavutil/crc.h"
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];
m->avctx = avctx;
for (substr = 0; substr < MAX_SUBSTREAMS; substr++)
m->substream[substr].lossless_check_data = 0xffffffff;
+ dsputil_init(&m->dsp, avctx);
return 0;
}
: MAX_MATRIX_CHANNEL_TRUEHD;
sync_word = get_bits(gbp, 13);
- s->noise_type = get_bits1(gbp);
- if ((m->avctx->codec_id == CODEC_ID_MLP && s->noise_type) ||
- sync_word != 0x31ea >> 1) {
+ if (sync_word != 0x31ea >> 1) {
av_log(m->avctx, AV_LOG_ERROR,
"restart header sync incorrect (got 0x%04x)\n", sync_word);
return -1;
}
+ s->noise_type = get_bits1(gbp);
+
+ if (m->avctx->codec_id == CODEC_ID_MLP && s->noise_type) {
+ av_log(m->avctx, AV_LOG_ERROR, "MLP must have 0x31ea sync word.\n");
+ return -1;
+ }
+
skip_bits(gbp, 16); /* Output timestamp */
s->min_channel = get_bits(gbp, 4);
return -1;
}
+ /* This should happen for TrueHD streams with >6 channels and MLP's noise
+ * type. It is not yet known if this is allowed. */
+ if (s->max_channel > MAX_MATRIX_CHANNEL_MLP && !s->noise_type) {
+ av_log(m->avctx, AV_LOG_ERROR,
+ "Number of channels %d is larger than the maximum supported "
+ "by the decoder. %s\n", s->max_channel+2, sample_message);
+ return -1;
+ }
+
if (s->min_channel > s->max_channel) {
av_log(m->avctx, AV_LOG_ERROR,
"Substream min channel cannot be greater than max channel.\n");
return -1;
}
/* The FIR and IIR filters must have the same precision.
- * To simplify the filtering code, only the precision of the
- * FIR filter is considered. If only the IIR filter is employed,
- * the FIR filter precision is set to that of the IIR filter, so
- * that the filtering code can use it. */
+ * To simplify the filtering code, only the precision of the
+ * FIR filter is considered. If only the IIR filter is employed,
+ * the FIR filter precision is set to that of the IIR filter, so
+ * that the filtering code can use it. */
if (!fir->order && iir->order)
fir->shift = iir->shift;
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). */