Mercurial > libavcodec.hg
changeset 9350:1432fb0ee5d7 libavcodec
mlpdec: Filters and matrices may change only once per substream per access unit.
| author | ramiro |
|---|---|
| date | Mon, 06 Apr 2009 00:58:03 +0000 |
| parents | 1a3bb292b65d |
| children | 4b801f9ae493 |
| files | mlpdec.c |
| diffstat | 1 files changed, 22 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/mlpdec.c Sun Apr 05 20:54:19 2009 +0000 +++ b/mlpdec.c Mon Apr 06 00:58:03 2009 +0000 @@ -138,6 +138,9 @@ 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]; @@ -443,6 +446,8 @@ // Filter is 0 for FIR, 1 for IIR. assert(filter < 2); + m->filter_changed[channel][filter]++; + order = get_bits(gbp, 4); if (order > max_order) { av_log(m->avctx, AV_LOG_ERROR, @@ -504,6 +509,7 @@ unsigned int mat, ch; s->num_primitive_matrices = get_bits(gbp, 4); + m->matrix_changed++; for (mat = 0; mat < s->num_primitive_matrices; mat++) { int frac_bits, max_chan; @@ -1000,8 +1006,13 @@ 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 { + unsigned int ch; + if (get_bits1(&gb)) { if (get_bits1(&gb)) { /* A restart header should be present. */ @@ -1018,6 +1029,17 @@ goto next_substr; } + if (m->matrix_changed > 1) { + av_log(m->avctx, AV_LOG_ERROR, "Matrices may change only once per access unit.\n"); + goto next_substr; + } + for (ch = 0; ch < s->max_channel; ch++) + if (m->filter_changed[ch][FIR] > 1 || + m->filter_changed[ch][IIR] > 1) { + av_log(m->avctx, AV_LOG_ERROR, "Filters may change only once per access unit.\n"); + goto next_substr; + } + if (!s->restart_seen) { goto next_substr; }