X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fmlpdec.c;h=7b3bd710bbdc5455e323afe85a5995fb464f8837;hb=d7e5aebae7652ac766034f1d90e5a4f62677fb3c;hp=7bda70356f2a016b5129411cce04fd66a8930026;hpb=d544dcdf38411c8f4ebd872d69f89f087cf69751;p=ffmpeg diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index 7bda70356f2..7b3bd710bbd 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -20,15 +20,16 @@ */ /** - * @file libavcodec/mlpdec.c + * @file * MLP decoder */ #include #include "avcodec.h" +#include "dsputil.h" #include "libavutil/intreadwrite.h" -#include "bitstream.h" +#include "get_bits.h" #include "libavutil/crc.h" #include "parser.h" #include "mlp_parser.h" @@ -61,6 +62,9 @@ typedef struct SubStream { //! For each channel output by the matrix, the output channel to map it to uint8_t ch_assign[MAX_CHANNELS]; + //! Channel coding parameters for channels in the substream + ChannelParams channel_params[MAX_CHANNELS]; + //! The left shift applied to random noise in 0x31ea substreams. uint8_t noise_shift; //! The current seed value for the pseudorandom noise generator(s). @@ -93,7 +97,7 @@ typedef struct SubStream { //! Whether the LSBs of the matrix output are encoded in the bitstream. uint8_t lsb_bypass[MAX_MATRICES]; //! Matrix coefficients, stored as 2.14 fixed point. - int32_t matrix_coeff[MAX_MATRICES][MAX_CHANNELS+2]; + int32_t matrix_coeff[MAX_MATRICES][MAX_CHANNELS]; //! Left shift to apply to noise values in 0x31eb substreams. uint8_t matrix_noise_shift[MAX_MATRICES]; //@} @@ -117,6 +121,9 @@ typedef struct SubStream { typedef struct MLPDecodeContext { AVCodecContext *avctx; + //! Current access unit being read has a major sync. + int is_major_sync_unit; + //! Set if a valid major sync block has been read. Otherwise no decoding is possible. uint8_t params_valid; @@ -126,6 +133,9 @@ typedef struct MLPDecodeContext { //! Index of the last substream to decode - further substreams are skipped. uint8_t max_decoded_substream; + //! Stream needs channel reordering to comply with FFmpeg's channel order + uint8_t needs_reordering; + //! number of PCM samples contained in each frame int access_unit_size; //! next power of two above the number of samples in each frame @@ -133,11 +143,14 @@ typedef struct MLPDecodeContext { SubStream substream[MAX_SUBSTREAMS]; - ChannelParams channel_params[MAX_CHANNELS]; + int matrix_changed; + int filter_changed[MAX_CHANNELS][NUM_FILTERS]; int8_t noise_buffer[MAX_BLOCKSIZE_POW2]; int8_t bypassed_lsbs[MAX_BLOCKSIZE][MAX_CHANNELS]; - int32_t sample_buffer[MAX_BLOCKSIZE][MAX_CHANNELS+2]; + int32_t sample_buffer[MAX_BLOCKSIZE][MAX_CHANNELS]; + + DSPContext dsp; } MLPDecodeContext; static VLC huff_vlc[3]; @@ -146,15 +159,17 @@ static VLC huff_vlc[3]; static av_cold void init_static(void) { - INIT_VLC_STATIC(&huff_vlc[0], VLC_BITS, 18, - &ff_mlp_huffman_tables[0][0][1], 2, 1, - &ff_mlp_huffman_tables[0][0][0], 2, 1, 512); - INIT_VLC_STATIC(&huff_vlc[1], VLC_BITS, 16, - &ff_mlp_huffman_tables[1][0][1], 2, 1, - &ff_mlp_huffman_tables[1][0][0], 2, 1, 512); - INIT_VLC_STATIC(&huff_vlc[2], VLC_BITS, 15, - &ff_mlp_huffman_tables[2][0][1], 2, 1, - &ff_mlp_huffman_tables[2][0][0], 2, 1, 512); + if (!huff_vlc[0].bits) { + INIT_VLC_STATIC(&huff_vlc[0], VLC_BITS, 18, + &ff_mlp_huffman_tables[0][0][1], 2, 1, + &ff_mlp_huffman_tables[0][0][0], 2, 1, 512); + INIT_VLC_STATIC(&huff_vlc[1], VLC_BITS, 16, + &ff_mlp_huffman_tables[1][0][1], 2, 1, + &ff_mlp_huffman_tables[1][0][0], 2, 1, 512); + INIT_VLC_STATIC(&huff_vlc[2], VLC_BITS, 15, + &ff_mlp_huffman_tables[2][0][1], 2, 1, + &ff_mlp_huffman_tables[2][0][0], 2, 1, 512); + } ff_mlp_init_crc(); } @@ -162,8 +177,8 @@ static av_cold void init_static(void) static inline int32_t calculate_sign_huff(MLPDecodeContext *m, unsigned int substr, unsigned int ch) { - ChannelParams *cp = &m->channel_params[ch]; SubStream *s = &m->substream[substr]; + ChannelParams *cp = &s->channel_params[ch]; int lsb_bits = cp->huff_lsbs - s->quant_step_size[ch]; int sign_shift = lsb_bits + (cp->codebook ? 2 - cp->codebook : -1); int32_t sign_huff_offset = cp->huff_offset; @@ -191,7 +206,7 @@ static inline int read_huff_channels(MLPDecodeContext *m, GetBitContext *gbp, m->bypassed_lsbs[pos + s->blockpos][mat] = get_bits1(gbp); for (channel = s->min_channel; channel <= s->max_channel; channel++) { - ChannelParams *cp = &m->channel_params[channel]; + ChannelParams *cp = &s->channel_params[channel]; int codebook = cp->codebook; int quant_step_size = s->quant_step_size[channel]; int lsb_bits = cp->huff_lsbs - quant_step_size; @@ -225,6 +240,7 @@ static av_cold int mlp_decode_init(AVCodecContext *avctx) m->avctx = avctx; for (substr = 0; substr < MAX_SUBSTREAMS; substr++) m->substream[substr].lossless_check_data = 0xffffffff; + dsputil_init(&m->dsp, avctx); return 0; } @@ -305,14 +321,33 @@ static int read_major_sync(MLPDecodeContext *m, GetBitContext *gb) m->avctx->bits_per_raw_sample = mh.group1_bits; if (mh.group1_bits > 16) - m->avctx->sample_fmt = SAMPLE_FMT_S32; + m->avctx->sample_fmt = AV_SAMPLE_FMT_S32; else - m->avctx->sample_fmt = SAMPLE_FMT_S16; + m->avctx->sample_fmt = AV_SAMPLE_FMT_S16; m->params_valid = 1; for (substr = 0; substr < MAX_SUBSTREAMS; substr++) m->substream[substr].restart_seen = 0; + if (mh.stream_type == 0xbb) { + /* MLP stream */ + m->avctx->channel_layout = ff_mlp_layout[mh.channels_mlp]; + } else { /* mh.stream_type == 0xba */ + /* TrueHD stream */ + if (mh.channels_thd_stream2) { + m->avctx->channel_layout = ff_truehd_layout(mh.channels_thd_stream2); + } else { + m->avctx->channel_layout = ff_truehd_layout(mh.channels_thd_stream1); + } + if (m->avctx->channels && + av_get_channel_layout_nb_channels(m->avctx->channel_layout) != m->avctx->channels) { + m->avctx->channel_layout = 0; + av_log_ask_for_sample(m->avctx, "Unknown channel layout."); + } + } + + m->needs_reordering = mh.channels_mlp >= 18 && mh.channels_mlp <= 20; + return 0; } @@ -329,6 +364,9 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp, uint8_t checksum; uint8_t lossless_check; int start_count = get_bits_count(gbp); + const int max_matrix_channel = m->avctx->codec_id == CODEC_ID_MLP + ? MAX_MATRIX_CHANNEL_MLP + : MAX_MATRIX_CHANNEL_TRUEHD; sync_word = get_bits(gbp, 13); @@ -337,14 +375,42 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp, "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); s->max_channel = get_bits(gbp, 4); s->max_matrix_channel = get_bits(gbp, 4); + if (s->max_matrix_channel > max_matrix_channel) { + av_log(m->avctx, AV_LOG_ERROR, + "Max matrix channel cannot be greater than %d.\n", + max_matrix_channel); + return -1; + } + + if (s->max_channel != s->max_matrix_channel) { + av_log(m->avctx, AV_LOG_ERROR, + "Max channel must be equal max matrix channel.\n"); + 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"); @@ -354,7 +420,7 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp, if (m->avctx->request_channels > 0 && s->max_channel + 1 >= m->avctx->request_channels && substr < m->max_decoded_substream) { - av_log(m->avctx, AV_LOG_INFO, + av_log(m->avctx, AV_LOG_DEBUG, "Extracting %d channel downmix from substream %d. " "Further substreams will be skipped.\n", s->max_channel + 1, substr); @@ -392,6 +458,24 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp, s->ch_assign[ch_assign] = ch; } + if (m->avctx->codec_id == CODEC_ID_MLP && m->needs_reordering) { + if (m->avctx->channel_layout == (AV_CH_LAYOUT_2_2|AV_CH_LOW_FREQUENCY) || + m->avctx->channel_layout == AV_CH_LAYOUT_5POINT0) { + int i = s->ch_assign[4]; + s->ch_assign[4] = s->ch_assign[3]; + s->ch_assign[3] = s->ch_assign[2]; + s->ch_assign[2] = i; + } else if (m->avctx->channel_layout == AV_CH_LAYOUT_5POINT1) { + FFSWAP(int, s->ch_assign[2], s->ch_assign[4]); + FFSWAP(int, s->ch_assign[3], s->ch_assign[5]); + } + } + if (m->avctx->codec_id == CODEC_ID_TRUEHD && + m->avctx->channel_layout == AV_CH_LAYOUT_7POINT1) { + FFSWAP(int, s->ch_assign[4], s->ch_assign[6]); + FFSWAP(int, s->ch_assign[5], s->ch_assign[7]); + } + checksum = ff_mlp_restart_checksum(buf, get_bits_count(gbp) - start_count); if (checksum != get_bits(gbp, 8)) @@ -407,7 +491,7 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp, memset(s->quant_step_size, 0, sizeof(s->quant_step_size)); for (ch = s->min_channel; ch <= s->max_channel; ch++) { - ChannelParams *cp = &m->channel_params[ch]; + ChannelParams *cp = &s->channel_params[ch]; cp->filter_params[FIR].order = 0; cp->filter_params[IIR].order = 0; cp->filter_params[FIR].shift = 0; @@ -420,9 +504,8 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp, cp->huff_lsbs = 24; } - if (substr == m->max_decoded_substream) { + if (substr == m->max_decoded_substream) m->avctx->channels = s->max_matrix_channel + 1; - } return 0; } @@ -430,9 +513,11 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp, /** Read parameters for one of the prediction filters. */ static int read_filter_params(MLPDecodeContext *m, GetBitContext *gbp, - unsigned int channel, unsigned int filter) + unsigned int substr, unsigned int channel, + unsigned int filter) { - FilterParams *fp = &m->channel_params[channel].filter_params[filter]; + SubStream *s = &m->substream[substr]; + FilterParams *fp = &s->channel_params[channel].filter_params[filter]; const int max_order = filter ? MAX_IIR_ORDER : MAX_FIR_ORDER; const char fchar = filter ? 'I' : 'F'; int i, order; @@ -440,6 +525,11 @@ static int read_filter_params(MLPDecodeContext *m, GetBitContext *gbp, // Filter is 0 for FIR, 1 for IIR. assert(filter < 2); + if (m->filter_changed[channel][filter]++ > 1) { + av_log(m->avctx, AV_LOG_ERROR, "Filters may change only once per access unit.\n"); + return -1; + } + order = get_bits(gbp, 4); if (order > max_order) { av_log(m->avctx, AV_LOG_ERROR, @@ -450,6 +540,7 @@ static int read_filter_params(MLPDecodeContext *m, GetBitContext *gbp, fp->order = order; if (order > 0) { + int32_t *fcoeff = s->channel_params[channel].coeff[filter]; int coeff_bits, coeff_shift; fp->shift = get_bits(gbp, 4); @@ -470,7 +561,7 @@ static int read_filter_params(MLPDecodeContext *m, GetBitContext *gbp, } for (i = 0; i < order; i++) - fp->coeff[i] = get_sbits(gbp, coeff_bits) << coeff_shift; + fcoeff[i] = get_sbits(gbp, coeff_bits) << coeff_shift; if (get_bits1(gbp)) { int state_bits, state_shift; @@ -496,19 +587,35 @@ static int read_filter_params(MLPDecodeContext *m, GetBitContext *gbp, /** Read parameters for primitive matrices. */ -static int read_matrix_params(MLPDecodeContext *m, SubStream *s, GetBitContext *gbp) +static int read_matrix_params(MLPDecodeContext *m, unsigned int substr, GetBitContext *gbp) { + SubStream *s = &m->substream[substr]; unsigned int mat, ch; + const int max_primitive_matrices = m->avctx->codec_id == CODEC_ID_MLP + ? MAX_MATRICES_MLP + : MAX_MATRICES_TRUEHD; + + if (m->matrix_changed++ > 1) { + av_log(m->avctx, AV_LOG_ERROR, "Matrices may change only once per access unit.\n"); + return -1; + } s->num_primitive_matrices = get_bits(gbp, 4); + if (s->num_primitive_matrices > max_primitive_matrices) { + av_log(m->avctx, AV_LOG_ERROR, + "Number of primitive matrices cannot be greater than %d.\n", + max_primitive_matrices); + return -1; + } + for (mat = 0; mat < s->num_primitive_matrices; mat++) { int frac_bits, max_chan; s->matrix_out_ch[mat] = get_bits(gbp, 4); frac_bits = get_bits(gbp, 4); s->lsb_bypass [mat] = get_bits1(gbp); - if (s->matrix_out_ch[mat] > s->max_channel) { + if (s->matrix_out_ch[mat] > s->max_matrix_channel) { av_log(m->avctx, AV_LOG_ERROR, "Invalid channel %d specified as output from matrix.\n", s->matrix_out_ch[mat]); @@ -546,19 +653,19 @@ static int read_matrix_params(MLPDecodeContext *m, SubStream *s, GetBitContext * static int read_channel_params(MLPDecodeContext *m, unsigned int substr, GetBitContext *gbp, unsigned int ch) { - ChannelParams *cp = &m->channel_params[ch]; + SubStream *s = &m->substream[substr]; + ChannelParams *cp = &s->channel_params[ch]; FilterParams *fir = &cp->filter_params[FIR]; FilterParams *iir = &cp->filter_params[IIR]; - SubStream *s = &m->substream[substr]; if (s->param_presence_flags & PARAM_FIR) if (get_bits1(gbp)) - if (read_filter_params(m, gbp, ch, FIR) < 0) + if (read_filter_params(m, gbp, substr, ch, FIR) < 0) return -1; if (s->param_presence_flags & PARAM_IIR) if (get_bits1(gbp)) - if (read_filter_params(m, gbp, ch, IIR) < 0) + if (read_filter_params(m, gbp, substr, ch, IIR) < 0) return -1; if (fir->order + iir->order > 8) { @@ -573,10 +680,10 @@ static int read_channel_params(MLPDecodeContext *m, unsigned int substr, 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; @@ -607,8 +714,8 @@ static int read_decoding_params(MLPDecodeContext *m, GetBitContext *gbp, unsigned int ch; if (s->param_presence_flags & PARAM_PRESENCE) - if (get_bits1(gbp)) - s->param_presence_flags = get_bits(gbp, 8); + if (get_bits1(gbp)) + s->param_presence_flags = get_bits(gbp, 8); if (s->param_presence_flags & PARAM_BLOCKSIZE) if (get_bits1(gbp)) { @@ -621,21 +728,19 @@ static int read_decoding_params(MLPDecodeContext *m, GetBitContext *gbp, } if (s->param_presence_flags & PARAM_MATRIX) - if (get_bits1(gbp)) { - if (read_matrix_params(m, s, gbp) < 0) + if (get_bits1(gbp)) + if (read_matrix_params(m, substr, gbp) < 0) return -1; - } if (s->param_presence_flags & PARAM_OUTSHIFT) if (get_bits1(gbp)) - for (ch = 0; ch <= s->max_matrix_channel; ch++) { + for (ch = 0; ch <= s->max_matrix_channel; ch++) s->output_shift[ch] = get_sbits(gbp, 4); - } if (s->param_presence_flags & PARAM_QUANTSTEP) if (get_bits1(gbp)) for (ch = 0; ch <= s->max_channel; ch++) { - ChannelParams *cp = &m->channel_params[ch]; + ChannelParams *cp = &s->channel_params[ch]; s->quant_step_size[ch] = get_bits(gbp, 4); @@ -643,10 +748,9 @@ static int read_decoding_params(MLPDecodeContext *m, GetBitContext *gbp, } for (ch = s->min_channel; ch <= s->max_channel; ch++) - if (get_bits1(gbp)) { + if (get_bits1(gbp)) if (read_channel_params(m, substr, gbp, ch) < 0) return -1; - } return 0; } @@ -660,44 +764,25 @@ static void filter_channel(MLPDecodeContext *m, unsigned int substr, unsigned int channel) { SubStream *s = &m->substream[substr]; - int32_t firbuf[MAX_BLOCKSIZE + MAX_FIR_ORDER]; - int32_t iirbuf[MAX_BLOCKSIZE + MAX_IIR_ORDER]; - FilterParams *fir = &m->channel_params[channel].filter_params[FIR]; - FilterParams *iir = &m->channel_params[channel].filter_params[IIR]; + const int32_t *fircoeff = s->channel_params[channel].coeff[FIR]; + int32_t state_buffer[NUM_FILTERS][MAX_BLOCKSIZE + MAX_FIR_ORDER]; + int32_t *firbuf = state_buffer[FIR] + MAX_BLOCKSIZE; + int32_t *iirbuf = state_buffer[IIR] + MAX_BLOCKSIZE; + FilterParams *fir = &s->channel_params[channel].filter_params[FIR]; + FilterParams *iir = &s->channel_params[channel].filter_params[IIR]; unsigned int filter_shift = fir->shift; int32_t mask = MSB_MASK(s->quant_step_size[channel]); - int index = MAX_BLOCKSIZE; - int i; - - memcpy(&firbuf[index], fir->state, MAX_FIR_ORDER * sizeof(int32_t)); - memcpy(&iirbuf[index], 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[index + order] * fir->coeff[order]; - for (order = 0; order < iir->order; order++) - accum += (int64_t) iirbuf[index + order] * iir->coeff[order]; + memcpy(firbuf, fir->state, MAX_FIR_ORDER * sizeof(int32_t)); + memcpy(iirbuf, iir->state, MAX_IIR_ORDER * sizeof(int32_t)); - accum = accum >> filter_shift; - result = (accum + residual) & mask; + m->dsp.mlp_filter_channel(firbuf, fircoeff, + fir->order, iir->order, + filter_shift, mask, s->blocksize, + &m->sample_buffer[s->blockpos][channel]); - --index; - - firbuf[index] = result; - iirbuf[index] = result - accum; - - m->sample_buffer[i + s->blockpos][channel] = result; - } - - memcpy(fir->state, &firbuf[index], MAX_FIR_ORDER * sizeof(int32_t)); - memcpy(iir->state, &iirbuf[index], 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). */ @@ -723,14 +808,12 @@ static int read_block_data(MLPDecodeContext *m, GetBitContext *gbp, memset(&m->bypassed_lsbs[s->blockpos][0], 0, s->blocksize * sizeof(m->bypassed_lsbs[0])); - for (i = 0; i < s->blocksize; i++) { + for (i = 0; i < s->blocksize; i++) if (read_huff_channels(m, gbp, substr, i) < 0) return -1; - } - for (ch = s->min_channel; ch <= s->max_channel; ch++) { + for (ch = s->min_channel; ch <= s->max_channel; ch++) filter_channel(m, substr, ch); - } s->blockpos += s->blocksize; @@ -831,22 +914,27 @@ static void rematrix_channels(MLPDecodeContext *m, unsigned int substr) int matrix_noise_shift = s->matrix_noise_shift[mat]; unsigned int dest_ch = s->matrix_out_ch[mat]; int32_t mask = MSB_MASK(s->quant_step_size[dest_ch]); + int32_t *coeffs = s->matrix_coeff[mat]; + int index = s->num_primitive_matrices - mat; + int index2 = 2 * index + 1; /* TODO: DSPContext? */ for (i = 0; i < s->blockpos; i++) { + int32_t bypassed_lsb = m->bypassed_lsbs[i][mat]; + int32_t *samples = m->sample_buffer[i]; int64_t accum = 0; - for (src_ch = 0; src_ch <= maxchan; src_ch++) { - accum += (int64_t)m->sample_buffer[i][src_ch] - * s->matrix_coeff[mat][src_ch]; - } + + for (src_ch = 0; src_ch <= maxchan; src_ch++) + accum += (int64_t) samples[src_ch] * coeffs[src_ch]; + if (matrix_noise_shift) { - uint32_t index = s->num_primitive_matrices - mat; - index = (i * (index * 2 + 1) + index) & (m->access_unit_size_pow2 - 1); + index &= m->access_unit_size_pow2 - 1; accum += m->noise_buffer[index] << (matrix_noise_shift + 7); + index += index2; } - m->sample_buffer[i][dest_ch] = ((accum >> 14) & mask) - + m->bypassed_lsbs[i][mat]; + + samples[dest_ch] = ((accum >> 14) & mask) + bypassed_lsb; } } } @@ -883,7 +971,7 @@ static int output_data_internal(MLPDecodeContext *m, unsigned int substr, static int output_data(MLPDecodeContext *m, unsigned int substr, uint8_t *data, unsigned int *data_size) { - if (m->avctx->sample_fmt == SAMPLE_FMT_S32) + if (m->avctx->sample_fmt == AV_SAMPLE_FMT_S32) return output_data_internal(m, substr, data, data_size, 1); else return output_data_internal(m, substr, data, data_size, 0); @@ -891,12 +979,14 @@ static int output_data(MLPDecodeContext *m, unsigned int substr, /** Read an access unit from the stream. - * Returns < 0 on error, 0 if not enough data is present in the input stream - * otherwise returns the number of bytes consumed. */ + * @return negative on error, 0 if not enough data is present in the input stream, + * otherwise the number of bytes consumed. */ static int read_access_unit(AVCodecContext *avctx, void* data, int *data_size, - const uint8_t *buf, int buf_size) + AVPacket *avpkt) { + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; MLPDecodeContext *m = avctx->priv_data; GetBitContext gb; unsigned int length, substr; @@ -912,14 +1002,16 @@ static int read_access_unit(AVCodecContext *avctx, void* data, int *data_size, length = (AV_RB16(buf) & 0xfff) * 2; - if (length > buf_size) + if (length < 4 || length > buf_size) return -1; init_get_bits(&gb, (buf + 4), (length - 4) * 8); + m->is_major_sync_unit = 0; if (show_bits_long(&gb, 31) == (0xf8726fba >> 1)) { if (read_major_sync(m, &gb) < 0) goto error; + m->is_major_sync_unit = 1; header_size += 28; } @@ -933,10 +1025,10 @@ static int read_access_unit(AVCodecContext *avctx, void* data, int *data_size, substream_start = 0; for (substr = 0; substr < m->num_substreams; substr++) { - int extraword_present, checkdata_present, end; + int extraword_present, checkdata_present, end, nonrestart_substr; extraword_present = get_bits1(&gb); - skip_bits1(&gb); + nonrestart_substr = get_bits1(&gb); checkdata_present = get_bits1(&gb); skip_bits1(&gb); @@ -945,10 +1037,19 @@ static int read_access_unit(AVCodecContext *avctx, void* data, int *data_size, substr_header_size += 2; if (extraword_present) { + if (m->avctx->codec_id == CODEC_ID_MLP) { + av_log(m->avctx, AV_LOG_ERROR, "There must be no extraword for MLP.\n"); + goto error; + } skip_bits(&gb, 16); substr_header_size += 2; } + if (!(nonrestart_substr ^ m->is_major_sync_unit)) { + av_log(m->avctx, AV_LOG_ERROR, "Invalid nonrestart_substr.\n"); + goto error; + } + if (end + header_size + substr_header_size > length) { av_log(m->avctx, AV_LOG_ERROR, "Indicated length of substream %d data goes off end of " @@ -986,6 +1087,9 @@ static int read_access_unit(AVCodecContext *avctx, void* data, int *data_size, SubStream *s = &m->substream[substr]; init_get_bits(&gb, buf, substream_data_len[substr] * 8); + m->matrix_changed = 0; + memset(m->filter_changed, 0, sizeof(m->filter_changed)); + s->blockpos = 0; do { if (get_bits1(&gb)) { @@ -996,31 +1100,25 @@ static int read_access_unit(AVCodecContext *avctx, void* data, int *data_size, s->restart_seen = 1; } - if (!s->restart_seen) { - av_log(m->avctx, AV_LOG_ERROR, - "No restart header present in substream %d.\n", - substr); + if (!s->restart_seen) goto next_substr; - } - if (read_decoding_params(m, &gb, substr) < 0) goto next_substr; } - if (!s->restart_seen) { - av_log(m->avctx, AV_LOG_ERROR, - "No restart header present in substream %d.\n", - substr); + if (!s->restart_seen) goto next_substr; - } if (read_block_data(m, &gb, substr) < 0) return -1; - } while ((get_bits_count(&gb) < substream_data_len[substr] * 8) - && get_bits1(&gb) == 0); + if (get_bits_count(&gb) >= substream_data_len[substr] * 8) + goto substream_length_mismatch; + + } while (!get_bits1(&gb)); skip_bits(&gb, (-get_bits_count(&gb)) & 15); + if (substream_data_len[substr] * 8 - get_bits_count(&gb) >= 32) { int shorten_by; @@ -1036,10 +1134,13 @@ static int read_access_unit(AVCodecContext *avctx, void* data, int *data_size, if (substr == m->max_decoded_substream) av_log(m->avctx, AV_LOG_INFO, "End of stream indicated.\n"); } - if (substream_data_len[substr] * 8 - get_bits_count(&gb) >= 16 && - substream_parity_present[substr]) { + + if (substream_parity_present[substr]) { uint8_t parity, checksum; + if (substream_data_len[substr] * 8 - get_bits_count(&gb) != 16) + goto substream_length_mismatch; + parity = ff_mlp_calculate_parity(buf, substream_data_len[substr] - 2); checksum = ff_mlp_checksum8 (buf, substream_data_len[substr] - 2); @@ -1048,13 +1149,15 @@ static int read_access_unit(AVCodecContext *avctx, void* data, int *data_size, if ( get_bits(&gb, 8) != checksum) av_log(m->avctx, AV_LOG_ERROR, "Substream %d checksum failed.\n" , substr); } - if (substream_data_len[substr] * 8 != get_bits_count(&gb)) { - av_log(m->avctx, AV_LOG_ERROR, "substream %d length mismatch\n", - substr); - return -1; - } + + if (substream_data_len[substr] * 8 != get_bits_count(&gb)) + goto substream_length_mismatch; next_substr: + if (!s->restart_seen) + av_log(m->avctx, AV_LOG_ERROR, + "No restart header present in substream %d.\n", substr); + buf += substream_data_len[substr]; } @@ -1065,15 +1168,18 @@ next_substr: return length; +substream_length_mismatch: + av_log(m->avctx, AV_LOG_ERROR, "substream %d length mismatch\n", substr); + return -1; + error: m->params_valid = 0; return -1; } -#if CONFIG_MLP_DECODER -AVCodec mlp_decoder = { +AVCodec ff_mlp_decoder = { "mlp", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_MLP, sizeof(MLPDecodeContext), mlp_decode_init, @@ -1082,12 +1188,11 @@ AVCodec mlp_decoder = { read_access_unit, .long_name = NULL_IF_CONFIG_SMALL("MLP (Meridian Lossless Packing)"), }; -#endif /* CONFIG_MLP_DECODER */ #if CONFIG_TRUEHD_DECODER -AVCodec truehd_decoder = { +AVCodec ff_truehd_decoder = { "truehd", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_TRUEHD, sizeof(MLPDecodeContext), mlp_decode_init,