Mercurial > libavcodec.hg
annotate mlpdec.c @ 9282:2f82384bbe05 libavcodec
mlpdec: whitespace cosmetics.
| author | ramiro |
|---|---|
| date | Mon, 30 Mar 2009 03:12:39 +0000 |
| parents | 19a7de05b1ae |
| children | a37db17a8283 |
| rev | line source |
|---|---|
| 7194 | 1 /* |
| 2 * MLP decoder | |
| 3 * Copyright (c) 2007-2008 Ian Caulfield | |
| 4 * | |
| 5 * This file is part of FFmpeg. | |
| 6 * | |
| 7 * FFmpeg is free software; you can redistribute it and/or | |
| 8 * modify it under the terms of the GNU Lesser General Public | |
| 9 * License as published by the Free Software Foundation; either | |
| 10 * version 2.1 of the License, or (at your option) any later version. | |
| 11 * | |
| 12 * FFmpeg is distributed in the hope that it will be useful, | |
| 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 15 * Lesser General Public License for more details. | |
| 16 * | |
| 17 * You should have received a copy of the GNU Lesser General Public | |
| 18 * License along with FFmpeg; if not, write to the Free Software | |
| 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | |
| 20 */ | |
| 21 | |
| 22 /** | |
|
8718
e9d9d946f213
Use full internal pathname in doxygen @file directives.
diego
parents:
8693
diff
changeset
|
23 * @file libavcodec/mlpdec.c |
| 7194 | 24 * MLP decoder |
| 25 */ | |
| 26 | |
| 7199 | 27 #include <stdint.h> |
| 28 | |
| 7194 | 29 #include "avcodec.h" |
| 30 #include "libavutil/intreadwrite.h" | |
| 31 #include "bitstream.h" | |
| 32 #include "libavutil/crc.h" | |
| 33 #include "parser.h" | |
| 34 #include "mlp_parser.h" | |
|
7559
fd24c8628221
mlp: Split common code from parser and decoder to be used by encoder.
ramiro
parents:
7556
diff
changeset
|
35 #include "mlp.h" |
| 7194 | 36 |
| 7198 | 37 /** number of bits used for VLC lookup - longest Huffman code is 9 */ |
| 7194 | 38 #define VLC_BITS 9 |
| 39 | |
| 40 | |
| 41 static const char* sample_message = | |
| 42 "Please file a bug report following the instructions at " | |
|
8460
5b3c90656fdf
Change mplayerhq.hu references to ffmpeg.org where appropriate.
diego
parents:
8277
diff
changeset
|
43 "http://ffmpeg.org/bugreports.html and include " |
| 7194 | 44 "a sample of this file."; |
| 45 | |
| 46 typedef struct SubStream { | |
| 7198 | 47 //! Set if a valid restart header has been read. Otherwise the substream cannot be decoded. |
| 7194 | 48 uint8_t restart_seen; |
| 49 | |
| 50 //@{ | |
| 51 /** restart header data */ | |
| 52 //! The type of noise to be used in the rematrix stage. | |
| 53 uint16_t noise_type; | |
| 54 | |
| 55 //! The index of the first channel coded in this substream. | |
| 56 uint8_t min_channel; | |
| 57 //! The index of the last channel coded in this substream. | |
| 58 uint8_t max_channel; | |
| 59 //! The number of channels input into the rematrix stage. | |
| 60 uint8_t max_matrix_channel; | |
| 9203 | 61 //! For each channel output by the matrix, the output channel to map it to |
| 62 uint8_t ch_assign[MAX_CHANNELS]; | |
| 7194 | 63 |
| 64 //! The left shift applied to random noise in 0x31ea substreams. | |
| 65 uint8_t noise_shift; | |
| 66 //! The current seed value for the pseudorandom noise generator(s). | |
| 67 uint32_t noisegen_seed; | |
| 68 | |
| 69 //! Set if the substream contains extra info to check the size of VLC blocks. | |
| 70 uint8_t data_check_present; | |
| 71 | |
| 72 //! Bitmask of which parameter sets are conveyed in a decoding parameter block. | |
| 73 uint8_t param_presence_flags; | |
| 74 #define PARAM_BLOCKSIZE (1 << 7) | |
| 75 #define PARAM_MATRIX (1 << 6) | |
| 76 #define PARAM_OUTSHIFT (1 << 5) | |
| 77 #define PARAM_QUANTSTEP (1 << 4) | |
| 78 #define PARAM_FIR (1 << 3) | |
| 79 #define PARAM_IIR (1 << 2) | |
| 80 #define PARAM_HUFFOFFSET (1 << 1) | |
| 9202 | 81 #define PARAM_PRESENCE (1 << 0) |
| 7194 | 82 //@} |
| 83 | |
| 84 //@{ | |
| 85 /** matrix data */ | |
| 86 | |
| 87 //! Number of matrices to be applied. | |
| 88 uint8_t num_primitive_matrices; | |
| 89 | |
| 90 //! matrix output channel | |
| 91 uint8_t matrix_out_ch[MAX_MATRICES]; | |
| 92 | |
| 93 //! Whether the LSBs of the matrix output are encoded in the bitstream. | |
| 94 uint8_t lsb_bypass[MAX_MATRICES]; | |
| 95 //! Matrix coefficients, stored as 2.14 fixed point. | |
| 96 int32_t matrix_coeff[MAX_MATRICES][MAX_CHANNELS+2]; | |
| 97 //! Left shift to apply to noise values in 0x31eb substreams. | |
| 98 uint8_t matrix_noise_shift[MAX_MATRICES]; | |
| 99 //@} | |
| 100 | |
| 7198 | 101 //! Left shift to apply to Huffman-decoded residuals. |
| 7194 | 102 uint8_t quant_step_size[MAX_CHANNELS]; |
| 103 | |
| 7198 | 104 //! number of PCM samples in current audio block |
| 7194 | 105 uint16_t blocksize; |
| 106 //! Number of PCM samples decoded so far in this frame. | |
| 107 uint16_t blockpos; | |
| 108 | |
| 109 //! Left shift to apply to decoded PCM values to get final 24-bit output. | |
| 110 int8_t output_shift[MAX_CHANNELS]; | |
| 111 | |
| 112 //! Running XOR of all output samples. | |
| 113 int32_t lossless_check_data; | |
| 114 | |
| 115 } SubStream; | |
| 116 | |
| 117 typedef struct MLPDecodeContext { | |
| 118 AVCodecContext *avctx; | |
| 119 | |
| 120 //! Set if a valid major sync block has been read. Otherwise no decoding is possible. | |
| 121 uint8_t params_valid; | |
| 122 | |
| 123 //! Number of substreams contained within this stream. | |
| 124 uint8_t num_substreams; | |
| 125 | |
| 126 //! Index of the last substream to decode - further substreams are skipped. | |
| 127 uint8_t max_decoded_substream; | |
| 128 | |
| 7198 | 129 //! number of PCM samples contained in each frame |
| 7194 | 130 int access_unit_size; |
| 7198 | 131 //! next power of two above the number of samples in each frame |
| 7194 | 132 int access_unit_size_pow2; |
| 133 | |
| 134 SubStream substream[MAX_SUBSTREAMS]; | |
| 135 | |
|
7555
8d00a2dfcb7a
mlpdec: Split channel parameters from context into their own struct.
ramiro
parents:
7553
diff
changeset
|
136 ChannelParams channel_params[MAX_CHANNELS]; |
| 7194 | 137 |
| 138 int8_t noise_buffer[MAX_BLOCKSIZE_POW2]; | |
| 139 int8_t bypassed_lsbs[MAX_BLOCKSIZE][MAX_CHANNELS]; | |
| 140 int32_t sample_buffer[MAX_BLOCKSIZE][MAX_CHANNELS+2]; | |
| 141 } MLPDecodeContext; | |
| 142 | |
| 143 static VLC huff_vlc[3]; | |
| 144 | |
| 145 /** Initialize static data, constant between all invocations of the codec. */ | |
| 146 | |
|
8693
18737839ed27
Add missing void keyword to parameterless function declarations.
diego
parents:
8460
diff
changeset
|
147 static av_cold void init_static(void) |
| 7194 | 148 { |
| 149 INIT_VLC_STATIC(&huff_vlc[0], VLC_BITS, 18, | |
|
7559
fd24c8628221
mlp: Split common code from parser and decoder to be used by encoder.
ramiro
parents:
7556
diff
changeset
|
150 &ff_mlp_huffman_tables[0][0][1], 2, 1, |
|
fd24c8628221
mlp: Split common code from parser and decoder to be used by encoder.
ramiro
parents:
7556
diff
changeset
|
151 &ff_mlp_huffman_tables[0][0][0], 2, 1, 512); |
| 7194 | 152 INIT_VLC_STATIC(&huff_vlc[1], VLC_BITS, 16, |
|
7559
fd24c8628221
mlp: Split common code from parser and decoder to be used by encoder.
ramiro
parents:
7556
diff
changeset
|
153 &ff_mlp_huffman_tables[1][0][1], 2, 1, |
|
fd24c8628221
mlp: Split common code from parser and decoder to be used by encoder.
ramiro
parents:
7556
diff
changeset
|
154 &ff_mlp_huffman_tables[1][0][0], 2, 1, 512); |
| 7194 | 155 INIT_VLC_STATIC(&huff_vlc[2], VLC_BITS, 15, |
|
7559
fd24c8628221
mlp: Split common code from parser and decoder to be used by encoder.
ramiro
parents:
7556
diff
changeset
|
156 &ff_mlp_huffman_tables[2][0][1], 2, 1, |
|
fd24c8628221
mlp: Split common code from parser and decoder to be used by encoder.
ramiro
parents:
7556
diff
changeset
|
157 &ff_mlp_huffman_tables[2][0][0], 2, 1, 512); |
| 7194 | 158 |
|
7559
fd24c8628221
mlp: Split common code from parser and decoder to be used by encoder.
ramiro
parents:
7556
diff
changeset
|
159 ff_mlp_init_crc(); |
| 7194 | 160 } |
| 161 | |
| 162 static inline int32_t calculate_sign_huff(MLPDecodeContext *m, | |
| 163 unsigned int substr, unsigned int ch) | |
| 164 { | |
|
7555
8d00a2dfcb7a
mlpdec: Split channel parameters from context into their own struct.
ramiro
parents:
7553
diff
changeset
|
165 ChannelParams *cp = &m->channel_params[ch]; |
| 7194 | 166 SubStream *s = &m->substream[substr]; |
|
7555
8d00a2dfcb7a
mlpdec: Split channel parameters from context into their own struct.
ramiro
parents:
7553
diff
changeset
|
167 int lsb_bits = cp->huff_lsbs - s->quant_step_size[ch]; |
|
8d00a2dfcb7a
mlpdec: Split channel parameters from context into their own struct.
ramiro
parents:
7553
diff
changeset
|
168 int sign_shift = lsb_bits + (cp->codebook ? 2 - cp->codebook : -1); |
|
8d00a2dfcb7a
mlpdec: Split channel parameters from context into their own struct.
ramiro
parents:
7553
diff
changeset
|
169 int32_t sign_huff_offset = cp->huff_offset; |
| 7194 | 170 |
|
7555
8d00a2dfcb7a
mlpdec: Split channel parameters from context into their own struct.
ramiro
parents:
7553
diff
changeset
|
171 if (cp->codebook > 0) |
| 7194 | 172 sign_huff_offset -= 7 << lsb_bits; |
| 173 | |
| 174 if (sign_shift >= 0) | |
| 175 sign_huff_offset -= 1 << sign_shift; | |
| 176 | |
| 177 return sign_huff_offset; | |
| 178 } | |
| 179 | |
| 180 /** Read a sample, consisting of either, both or neither of entropy-coded MSBs | |
| 181 * and plain LSBs. */ | |
| 182 | |
| 183 static inline int read_huff_channels(MLPDecodeContext *m, GetBitContext *gbp, | |
| 184 unsigned int substr, unsigned int pos) | |
| 185 { | |
| 186 SubStream *s = &m->substream[substr]; | |
| 187 unsigned int mat, channel; | |
| 188 | |
| 189 for (mat = 0; mat < s->num_primitive_matrices; mat++) | |
| 190 if (s->lsb_bypass[mat]) | |
| 191 m->bypassed_lsbs[pos + s->blockpos][mat] = get_bits1(gbp); | |
| 192 | |
| 193 for (channel = s->min_channel; channel <= s->max_channel; channel++) { | |
|
7555
8d00a2dfcb7a
mlpdec: Split channel parameters from context into their own struct.
ramiro
parents:
7553
diff
changeset
|
194 ChannelParams *cp = &m->channel_params[channel]; |
|
8d00a2dfcb7a
mlpdec: Split channel parameters from context into their own struct.
ramiro
parents:
7553
diff
changeset
|
195 int codebook = cp->codebook; |
| 7194 | 196 int quant_step_size = s->quant_step_size[channel]; |
|
7555
8d00a2dfcb7a
mlpdec: Split channel parameters from context into their own struct.
ramiro
parents:
7553
diff
changeset
|
197 int lsb_bits = cp->huff_lsbs - quant_step_size; |
| 7194 | 198 int result = 0; |
| 199 | |
| 200 if (codebook > 0) | |
| 201 result = get_vlc2(gbp, huff_vlc[codebook-1].table, | |
| 202 VLC_BITS, (9 + VLC_BITS - 1) / VLC_BITS); | |
| 203 | |
| 204 if (result < 0) | |
| 205 return -1; | |
| 206 | |
| 207 if (lsb_bits > 0) | |
| 208 result = (result << lsb_bits) + get_bits(gbp, lsb_bits); | |
| 209 | |
|
7555
8d00a2dfcb7a
mlpdec: Split channel parameters from context into their own struct.
ramiro
parents:
7553
diff
changeset
|
210 result += cp->sign_huff_offset; |
| 7194 | 211 result <<= quant_step_size; |
| 212 | |
| 213 m->sample_buffer[pos + s->blockpos][channel] = result; | |
| 214 } | |
| 215 | |
| 216 return 0; | |
| 217 } | |
| 218 | |
| 219 static av_cold int mlp_decode_init(AVCodecContext *avctx) | |
| 220 { | |
| 221 MLPDecodeContext *m = avctx->priv_data; | |
| 222 int substr; | |
| 223 | |
| 224 init_static(); | |
| 225 m->avctx = avctx; | |
| 226 for (substr = 0; substr < MAX_SUBSTREAMS; substr++) | |
| 227 m->substream[substr].lossless_check_data = 0xffffffff; | |
|
8276
9149588e5cc9
mlp: support bit-depths greater than 16 by default.
ramiro
parents:
8274
diff
changeset
|
228 |
| 7194 | 229 return 0; |
| 230 } | |
| 231 | |
| 232 /** Read a major sync info header - contains high level information about | |
| 233 * the stream - sample rate, channel arrangement etc. Most of this | |
| 234 * information is not actually necessary for decoding, only for playback. | |
| 235 */ | |
| 236 | |
| 237 static int read_major_sync(MLPDecodeContext *m, GetBitContext *gb) | |
| 238 { | |
| 239 MLPHeaderInfo mh; | |
| 240 int substr; | |
| 241 | |
| 242 if (ff_mlp_read_major_sync(m->avctx, &mh, gb) != 0) | |
| 243 return -1; | |
| 244 | |
| 245 if (mh.group1_bits == 0) { | |
| 7198 | 246 av_log(m->avctx, AV_LOG_ERROR, "invalid/unknown bits per sample\n"); |
| 7194 | 247 return -1; |
| 248 } | |
| 249 if (mh.group2_bits > mh.group1_bits) { | |
| 250 av_log(m->avctx, AV_LOG_ERROR, | |
| 7198 | 251 "Channel group 2 cannot have more bits per sample than group 1.\n"); |
| 7194 | 252 return -1; |
| 253 } | |
| 254 | |
| 255 if (mh.group2_samplerate && mh.group2_samplerate != mh.group1_samplerate) { | |
| 256 av_log(m->avctx, AV_LOG_ERROR, | |
| 7198 | 257 "Channel groups with differing sample rates are not currently supported.\n"); |
| 7194 | 258 return -1; |
| 259 } | |
| 260 | |
| 261 if (mh.group1_samplerate == 0) { | |
| 7198 | 262 av_log(m->avctx, AV_LOG_ERROR, "invalid/unknown sampling rate\n"); |
| 7194 | 263 return -1; |
| 264 } | |
| 265 if (mh.group1_samplerate > MAX_SAMPLERATE) { | |
| 266 av_log(m->avctx, AV_LOG_ERROR, | |
| 7198 | 267 "Sampling rate %d is greater than the supported maximum (%d).\n", |
| 7194 | 268 mh.group1_samplerate, MAX_SAMPLERATE); |
| 269 return -1; | |
| 270 } | |
| 271 if (mh.access_unit_size > MAX_BLOCKSIZE) { | |
| 272 av_log(m->avctx, AV_LOG_ERROR, | |
| 7198 | 273 "Block size %d is greater than the supported maximum (%d).\n", |
| 7194 | 274 mh.access_unit_size, MAX_BLOCKSIZE); |
| 275 return -1; | |
| 276 } | |
| 277 if (mh.access_unit_size_pow2 > MAX_BLOCKSIZE_POW2) { | |
| 278 av_log(m->avctx, AV_LOG_ERROR, | |
| 7198 | 279 "Block size pow2 %d is greater than the supported maximum (%d).\n", |
| 7194 | 280 mh.access_unit_size_pow2, MAX_BLOCKSIZE_POW2); |
| 281 return -1; | |
| 282 } | |
| 283 | |
| 284 if (mh.num_substreams == 0) | |
| 285 return -1; | |
| 9201 | 286 if (m->avctx->codec_id == CODEC_ID_MLP && mh.num_substreams > 2) { |
| 287 av_log(m->avctx, AV_LOG_ERROR, "MLP only supports up to 2 substreams.\n"); | |
| 288 return -1; | |
| 289 } | |
| 7194 | 290 if (mh.num_substreams > MAX_SUBSTREAMS) { |
| 291 av_log(m->avctx, AV_LOG_ERROR, | |
| 7198 | 292 "Number of substreams %d is larger than the maximum supported " |
| 293 "by the decoder. %s\n", mh.num_substreams, sample_message); | |
| 7194 | 294 return -1; |
| 295 } | |
| 296 | |
| 297 m->access_unit_size = mh.access_unit_size; | |
| 298 m->access_unit_size_pow2 = mh.access_unit_size_pow2; | |
| 299 | |
| 300 m->num_substreams = mh.num_substreams; | |
| 301 m->max_decoded_substream = m->num_substreams - 1; | |
| 302 | |
| 303 m->avctx->sample_rate = mh.group1_samplerate; | |
| 304 m->avctx->frame_size = mh.access_unit_size; | |
| 305 | |
| 8274 | 306 m->avctx->bits_per_raw_sample = mh.group1_bits; |
| 8277 | 307 if (mh.group1_bits > 16) |
| 7194 | 308 m->avctx->sample_fmt = SAMPLE_FMT_S32; |
|
8276
9149588e5cc9
mlp: support bit-depths greater than 16 by default.
ramiro
parents:
8274
diff
changeset
|
309 else |
|
9149588e5cc9
mlp: support bit-depths greater than 16 by default.
ramiro
parents:
8274
diff
changeset
|
310 m->avctx->sample_fmt = SAMPLE_FMT_S16; |
| 7194 | 311 |
| 312 m->params_valid = 1; | |
| 313 for (substr = 0; substr < MAX_SUBSTREAMS; substr++) | |
| 314 m->substream[substr].restart_seen = 0; | |
| 315 | |
| 316 return 0; | |
| 317 } | |
| 318 | |
| 319 /** Read a restart header from a block in a substream. This contains parameters | |
| 320 * required to decode the audio that do not change very often. Generally | |
| 321 * (always) present only in blocks following a major sync. */ | |
| 322 | |
| 323 static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp, | |
| 324 const uint8_t *buf, unsigned int substr) | |
| 325 { | |
| 326 SubStream *s = &m->substream[substr]; | |
| 327 unsigned int ch; | |
| 328 int sync_word, tmp; | |
| 329 uint8_t checksum; | |
| 330 uint8_t lossless_check; | |
| 331 int start_count = get_bits_count(gbp); | |
| 332 | |
| 333 sync_word = get_bits(gbp, 13); | |
| 334 | |
| 335 if (sync_word != 0x31ea >> 1) { | |
| 336 av_log(m->avctx, AV_LOG_ERROR, | |
| 7198 | 337 "restart header sync incorrect (got 0x%04x)\n", sync_word); |
| 7194 | 338 return -1; |
| 339 } | |
| 340 s->noise_type = get_bits1(gbp); | |
| 341 | |
| 342 skip_bits(gbp, 16); /* Output timestamp */ | |
| 343 | |
| 344 s->min_channel = get_bits(gbp, 4); | |
| 345 s->max_channel = get_bits(gbp, 4); | |
| 346 s->max_matrix_channel = get_bits(gbp, 4); | |
| 347 | |
| 348 if (s->min_channel > s->max_channel) { | |
| 349 av_log(m->avctx, AV_LOG_ERROR, | |
| 350 "Substream min channel cannot be greater than max channel.\n"); | |
| 351 return -1; | |
| 352 } | |
| 353 | |
| 354 if (m->avctx->request_channels > 0 | |
| 355 && s->max_channel + 1 >= m->avctx->request_channels | |
| 356 && substr < m->max_decoded_substream) { | |
| 357 av_log(m->avctx, AV_LOG_INFO, | |
| 358 "Extracting %d channel downmix from substream %d. " | |
| 359 "Further substreams will be skipped.\n", | |
| 360 s->max_channel + 1, substr); | |
| 361 m->max_decoded_substream = substr; | |
| 362 } | |
| 363 | |
| 364 s->noise_shift = get_bits(gbp, 4); | |
| 365 s->noisegen_seed = get_bits(gbp, 23); | |
| 366 | |
| 367 skip_bits(gbp, 19); | |
| 368 | |
| 369 s->data_check_present = get_bits1(gbp); | |
| 370 lossless_check = get_bits(gbp, 8); | |
| 371 if (substr == m->max_decoded_substream | |
| 372 && s->lossless_check_data != 0xffffffff) { | |
|
7566
d112b4655bbd
mlp: split simple inline function that xors 4 bytes into one.
ramiro
parents:
7559
diff
changeset
|
373 tmp = xor_32_to_8(s->lossless_check_data); |
| 7194 | 374 if (tmp != lossless_check) |
| 375 av_log(m->avctx, AV_LOG_WARNING, | |
| 7198 | 376 "Lossless check failed - expected %02x, calculated %02x.\n", |
| 7194 | 377 lossless_check, tmp); |
| 378 } | |
| 379 | |
| 380 skip_bits(gbp, 16); | |
| 381 | |
| 9203 | 382 memset(s->ch_assign, 0, sizeof(s->ch_assign)); |
| 383 | |
| 7194 | 384 for (ch = 0; ch <= s->max_matrix_channel; ch++) { |
| 385 int ch_assign = get_bits(gbp, 6); | |
| 9203 | 386 if (ch_assign > s->max_matrix_channel) { |
| 7194 | 387 av_log(m->avctx, AV_LOG_ERROR, |
| 9203 | 388 "Assignment of matrix channel %d to invalid output channel %d. %s\n", |
| 389 ch, ch_assign, sample_message); | |
| 7194 | 390 return -1; |
| 391 } | |
| 9203 | 392 s->ch_assign[ch_assign] = ch; |
| 7194 | 393 } |
| 394 | |
|
7559
fd24c8628221
mlp: Split common code from parser and decoder to be used by encoder.
ramiro
parents:
7556
diff
changeset
|
395 checksum = ff_mlp_restart_checksum(buf, get_bits_count(gbp) - start_count); |
| 7194 | 396 |
| 397 if (checksum != get_bits(gbp, 8)) | |
| 7198 | 398 av_log(m->avctx, AV_LOG_ERROR, "restart header checksum error\n"); |
| 7194 | 399 |
| 7198 | 400 /* Set default decoding parameters. */ |
| 7194 | 401 s->param_presence_flags = 0xff; |
| 402 s->num_primitive_matrices = 0; | |
| 403 s->blocksize = 8; | |
| 404 s->lossless_check_data = 0; | |
| 405 | |
| 406 memset(s->output_shift , 0, sizeof(s->output_shift )); | |
| 407 memset(s->quant_step_size, 0, sizeof(s->quant_step_size)); | |
| 408 | |
| 409 for (ch = s->min_channel; ch <= s->max_channel; ch++) { | |
|
7555
8d00a2dfcb7a
mlpdec: Split channel parameters from context into their own struct.
ramiro
parents:
7553
diff
changeset
|
410 ChannelParams *cp = &m->channel_params[ch]; |
|
8d00a2dfcb7a
mlpdec: Split channel parameters from context into their own struct.
ramiro
parents:
7553
diff
changeset
|
411 cp->filter_params[FIR].order = 0; |
|
8d00a2dfcb7a
mlpdec: Split channel parameters from context into their own struct.
ramiro
parents:
7553
diff
changeset
|
412 cp->filter_params[IIR].order = 0; |
|
8d00a2dfcb7a
mlpdec: Split channel parameters from context into their own struct.
ramiro
parents:
7553
diff
changeset
|
413 cp->filter_params[FIR].shift = 0; |
|
8d00a2dfcb7a
mlpdec: Split channel parameters from context into their own struct.
ramiro
parents:
7553
diff
changeset
|
414 cp->filter_params[IIR].shift = 0; |
| 7194 | 415 |
| 7198 | 416 /* Default audio coding is 24-bit raw PCM. */ |
|
7555
8d00a2dfcb7a
mlpdec: Split channel parameters from context into their own struct.
ramiro
parents:
7553
diff
changeset
|
417 cp->huff_offset = 0; |
|
8d00a2dfcb7a
mlpdec: Split channel parameters from context into their own struct.
ramiro
parents:
7553
diff
changeset
|
418 cp->sign_huff_offset = (-1) << 23; |
|
8d00a2dfcb7a
mlpdec: Split channel parameters from context into their own struct.
ramiro
parents:
7553
diff
changeset
|
419 cp->codebook = 0; |
|
8d00a2dfcb7a
mlpdec: Split channel parameters from context into their own struct.
ramiro
parents:
7553
diff
changeset
|
420 cp->huff_lsbs = 24; |
| 7194 | 421 } |
| 422 | |
| 423 if (substr == m->max_decoded_substream) { | |
| 9203 | 424 m->avctx->channels = s->max_matrix_channel + 1; |
| 7194 | 425 } |
| 426 | |
| 427 return 0; | |
| 428 } | |
| 429 | |
| 430 /** Read parameters for one of the prediction filters. */ | |
| 431 | |
| 432 static int read_filter_params(MLPDecodeContext *m, GetBitContext *gbp, | |
| 433 unsigned int channel, unsigned int filter) | |
| 434 { | |
|
7555
8d00a2dfcb7a
mlpdec: Split channel parameters from context into their own struct.
ramiro
parents:
7553
diff
changeset
|
435 FilterParams *fp = &m->channel_params[channel].filter_params[filter]; |
|
9278
41e285948ffc
mlpdec: Max filter orders for FIR and IIR are 8 and 4 respectively.
ramiro
parents:
9268
diff
changeset
|
436 const int max_order = filter ? MAX_IIR_ORDER : MAX_FIR_ORDER; |
| 7194 | 437 const char fchar = filter ? 'I' : 'F'; |
| 438 int i, order; | |
| 439 | |
| 7198 | 440 // Filter is 0 for FIR, 1 for IIR. |
| 7194 | 441 assert(filter < 2); |
| 442 | |
| 443 order = get_bits(gbp, 4); | |
|
9278
41e285948ffc
mlpdec: Max filter orders for FIR and IIR are 8 and 4 respectively.
ramiro
parents:
9268
diff
changeset
|
444 if (order > max_order) { |
| 7194 | 445 av_log(m->avctx, AV_LOG_ERROR, |
| 7198 | 446 "%cIR filter order %d is greater than maximum %d.\n", |
|
9278
41e285948ffc
mlpdec: Max filter orders for FIR and IIR are 8 and 4 respectively.
ramiro
parents:
9268
diff
changeset
|
447 fchar, order, max_order); |
| 7194 | 448 return -1; |
| 449 } | |
|
7552
88ffd7c9c0ed
mlpdec: Split filter parameters from context into their own struct.
ramiro
parents:
7451
diff
changeset
|
450 fp->order = order; |
| 7194 | 451 |
| 452 if (order > 0) { | |
| 453 int coeff_bits, coeff_shift; | |
| 454 | |
|
7552
88ffd7c9c0ed
mlpdec: Split filter parameters from context into their own struct.
ramiro
parents:
7451
diff
changeset
|
455 fp->shift = get_bits(gbp, 4); |
| 7194 | 456 |
| 457 coeff_bits = get_bits(gbp, 5); | |
| 458 coeff_shift = get_bits(gbp, 3); | |
| 459 if (coeff_bits < 1 || coeff_bits > 16) { | |
| 460 av_log(m->avctx, AV_LOG_ERROR, | |
| 7198 | 461 "%cIR filter coeff_bits must be between 1 and 16.\n", |
| 7194 | 462 fchar); |
| 463 return -1; | |
| 464 } | |
| 465 if (coeff_bits + coeff_shift > 16) { | |
| 466 av_log(m->avctx, AV_LOG_ERROR, | |
| 7198 | 467 "Sum of coeff_bits and coeff_shift for %cIR filter must be 16 or less.\n", |
| 7194 | 468 fchar); |
| 469 return -1; | |
| 470 } | |
| 471 | |
| 472 for (i = 0; i < order; i++) | |
| 7553 | 473 fp->coeff[i] = get_sbits(gbp, coeff_bits) << coeff_shift; |
| 7194 | 474 |
| 475 if (get_bits1(gbp)) { | |
| 476 int state_bits, state_shift; | |
| 477 | |
| 478 if (filter == FIR) { | |
| 479 av_log(m->avctx, AV_LOG_ERROR, | |
| 7198 | 480 "FIR filter has state data specified.\n"); |
| 7194 | 481 return -1; |
| 482 } | |
| 483 | |
| 484 state_bits = get_bits(gbp, 4); | |
| 485 state_shift = get_bits(gbp, 4); | |
| 486 | |
| 7198 | 487 /* TODO: Check validity of state data. */ |
| 7194 | 488 |
| 489 for (i = 0; i < order; i++) | |
| 7553 | 490 fp->state[i] = get_sbits(gbp, state_bits) << state_shift; |
| 7194 | 491 } |
| 492 } | |
| 493 | |
| 494 return 0; | |
| 495 } | |
| 496 | |
|
9262
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
497 /** Read parameters for primitive matrices. */ |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
498 |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
499 static int read_matrix_params(MLPDecodeContext *m, SubStream *s, GetBitContext *gbp) |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
500 { |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
501 unsigned int mat, ch; |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
502 |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
503 s->num_primitive_matrices = get_bits(gbp, 4); |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
504 |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
505 for (mat = 0; mat < s->num_primitive_matrices; mat++) { |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
506 int frac_bits, max_chan; |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
507 s->matrix_out_ch[mat] = get_bits(gbp, 4); |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
508 frac_bits = get_bits(gbp, 4); |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
509 s->lsb_bypass [mat] = get_bits1(gbp); |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
510 |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
511 if (s->matrix_out_ch[mat] > s->max_channel) { |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
512 av_log(m->avctx, AV_LOG_ERROR, |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
513 "Invalid channel %d specified as output from matrix.\n", |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
514 s->matrix_out_ch[mat]); |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
515 return -1; |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
516 } |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
517 if (frac_bits > 14) { |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
518 av_log(m->avctx, AV_LOG_ERROR, |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
519 "Too many fractional bits specified.\n"); |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
520 return -1; |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
521 } |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
522 |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
523 max_chan = s->max_matrix_channel; |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
524 if (!s->noise_type) |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
525 max_chan+=2; |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
526 |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
527 for (ch = 0; ch <= max_chan; ch++) { |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
528 int coeff_val = 0; |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
529 if (get_bits1(gbp)) |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
530 coeff_val = get_sbits(gbp, frac_bits + 2); |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
531 |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
532 s->matrix_coeff[mat][ch] = coeff_val << (14 - frac_bits); |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
533 } |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
534 |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
535 if (s->noise_type) |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
536 s->matrix_noise_shift[mat] = get_bits(gbp, 4); |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
537 else |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
538 s->matrix_noise_shift[mat] = 0; |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
539 } |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
540 |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
541 return 0; |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
542 } |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
543 |
|
9263
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
544 /** Read channel parameters. */ |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
545 |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
546 static int read_channel_params(MLPDecodeContext *m, unsigned int substr, |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
547 GetBitContext *gbp, unsigned int ch) |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
548 { |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
549 ChannelParams *cp = &m->channel_params[ch]; |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
550 FilterParams *fir = &cp->filter_params[FIR]; |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
551 FilterParams *iir = &cp->filter_params[IIR]; |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
552 SubStream *s = &m->substream[substr]; |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
553 |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
554 if (s->param_presence_flags & PARAM_FIR) |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
555 if (get_bits1(gbp)) |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
556 if (read_filter_params(m, gbp, ch, FIR) < 0) |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
557 return -1; |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
558 |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
559 if (s->param_presence_flags & PARAM_IIR) |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
560 if (get_bits1(gbp)) |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
561 if (read_filter_params(m, gbp, ch, IIR) < 0) |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
562 return -1; |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
563 |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
564 if (fir->order && iir->order && |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
565 fir->shift != iir->shift) { |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
566 av_log(m->avctx, AV_LOG_ERROR, |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
567 "FIR and IIR filters must use the same precision.\n"); |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
568 return -1; |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
569 } |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
570 /* The FIR and IIR filters must have the same precision. |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
571 * To simplify the filtering code, only the precision of the |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
572 * FIR filter is considered. If only the IIR filter is employed, |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
573 * the FIR filter precision is set to that of the IIR filter, so |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
574 * that the filtering code can use it. */ |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
575 if (!fir->order && iir->order) |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
576 fir->shift = iir->shift; |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
577 |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
578 if (s->param_presence_flags & PARAM_HUFFOFFSET) |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
579 if (get_bits1(gbp)) |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
580 cp->huff_offset = get_sbits(gbp, 15); |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
581 |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
582 cp->codebook = get_bits(gbp, 2); |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
583 cp->huff_lsbs = get_bits(gbp, 5); |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
584 |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
585 cp->sign_huff_offset = calculate_sign_huff(m, substr, ch); |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
586 |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
587 /* TODO: validate */ |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
588 |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
589 return 0; |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
590 } |
|
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
591 |
| 7194 | 592 /** Read decoding parameters that change more often than those in the restart |
| 593 * header. */ | |
| 594 | |
| 595 static int read_decoding_params(MLPDecodeContext *m, GetBitContext *gbp, | |
| 596 unsigned int substr) | |
| 597 { | |
| 598 SubStream *s = &m->substream[substr]; | |
|
9262
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
599 unsigned int ch; |
| 7194 | 600 |
| 9202 | 601 if (s->param_presence_flags & PARAM_PRESENCE) |
| 7194 | 602 if (get_bits1(gbp)) |
| 603 s->param_presence_flags = get_bits(gbp, 8); | |
| 604 | |
| 605 if (s->param_presence_flags & PARAM_BLOCKSIZE) | |
| 606 if (get_bits1(gbp)) { | |
| 607 s->blocksize = get_bits(gbp, 9); | |
| 9267 | 608 if (s->blocksize < 8 || s->blocksize > m->access_unit_size) { |
| 609 av_log(m->avctx, AV_LOG_ERROR, "Invalid blocksize."); | |
| 7194 | 610 s->blocksize = 0; |
| 611 return -1; | |
| 612 } | |
| 613 } | |
| 614 | |
| 615 if (s->param_presence_flags & PARAM_MATRIX) | |
| 616 if (get_bits1(gbp)) { | |
|
9262
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
617 if (read_matrix_params(m, s, gbp) < 0) |
|
3c9a424163ee
mlpdec: Split read_matrix_params() into its own function.
ramiro
parents:
9203
diff
changeset
|
618 return -1; |
| 7194 | 619 } |
| 620 | |
| 621 if (s->param_presence_flags & PARAM_OUTSHIFT) | |
| 622 if (get_bits1(gbp)) | |
| 623 for (ch = 0; ch <= s->max_matrix_channel; ch++) { | |
| 9264 | 624 s->output_shift[ch] = get_sbits(gbp, 4); |
| 7194 | 625 } |
| 626 | |
| 627 if (s->param_presence_flags & PARAM_QUANTSTEP) | |
| 628 if (get_bits1(gbp)) | |
| 629 for (ch = 0; ch <= s->max_channel; ch++) { | |
|
7555
8d00a2dfcb7a
mlpdec: Split channel parameters from context into their own struct.
ramiro
parents:
7553
diff
changeset
|
630 ChannelParams *cp = &m->channel_params[ch]; |
|
8d00a2dfcb7a
mlpdec: Split channel parameters from context into their own struct.
ramiro
parents:
7553
diff
changeset
|
631 |
| 7194 | 632 s->quant_step_size[ch] = get_bits(gbp, 4); |
| 633 | |
|
7555
8d00a2dfcb7a
mlpdec: Split channel parameters from context into their own struct.
ramiro
parents:
7553
diff
changeset
|
634 cp->sign_huff_offset = calculate_sign_huff(m, substr, ch); |
| 7194 | 635 } |
| 636 | |
| 637 for (ch = s->min_channel; ch <= s->max_channel; ch++) | |
| 638 if (get_bits1(gbp)) { | |
|
9263
62774b28cde0
mlpdec: Split read_channel_params() into its own function.
ramiro
parents:
9262
diff
changeset
|
639 if (read_channel_params(m, substr, gbp, ch) < 0) |
| 7194 | 640 return -1; |
| 641 } | |
| 642 | |
| 643 return 0; | |
| 644 } | |
| 645 | |
| 646 #define MSB_MASK(bits) (-1u << bits) | |
| 647 | |
| 648 /** Generate PCM samples using the prediction filters and residual values | |
| 649 * read from the data stream, and update the filter state. */ | |
| 650 | |
| 651 static void filter_channel(MLPDecodeContext *m, unsigned int substr, | |
| 652 unsigned int channel) | |
| 653 { | |
| 654 SubStream *s = &m->substream[substr]; | |
|
9280
e3eff8a463ec
mlpdec: Split filter_state_buffer into [fi]irbuf and fp to [fi]ir.
ramiro
parents:
9279
diff
changeset
|
655 int32_t firbuf[MAX_BLOCKSIZE + MAX_FIR_ORDER]; |
|
e3eff8a463ec
mlpdec: Split filter_state_buffer into [fi]irbuf and fp to [fi]ir.
ramiro
parents:
9279
diff
changeset
|
656 int32_t iirbuf[MAX_BLOCKSIZE + MAX_IIR_ORDER]; |
|
e3eff8a463ec
mlpdec: Split filter_state_buffer into [fi]irbuf and fp to [fi]ir.
ramiro
parents:
9279
diff
changeset
|
657 FilterParams *fir = &m->channel_params[channel].filter_params[FIR]; |
|
e3eff8a463ec
mlpdec: Split filter_state_buffer into [fi]irbuf and fp to [fi]ir.
ramiro
parents:
9279
diff
changeset
|
658 FilterParams *iir = &m->channel_params[channel].filter_params[IIR]; |
|
e3eff8a463ec
mlpdec: Split filter_state_buffer into [fi]irbuf and fp to [fi]ir.
ramiro
parents:
9279
diff
changeset
|
659 unsigned int filter_shift = fir->shift; |
| 7194 | 660 int32_t mask = MSB_MASK(s->quant_step_size[channel]); |
| 661 int index = MAX_BLOCKSIZE; | |
|
9279
b65ab36734f8
mlpdec: Unroll copying filter state data and filtering for the two filters.
ramiro
parents:
9278
diff
changeset
|
662 int i; |
| 7194 | 663 |
| 9282 | 664 memcpy(&firbuf[index], fir->state, MAX_FIR_ORDER * sizeof(int32_t)); |
| 665 memcpy(&iirbuf[index], iir->state, MAX_IIR_ORDER * sizeof(int32_t)); | |
| 7194 | 666 |
| 667 for (i = 0; i < s->blocksize; i++) { | |
| 668 int32_t residual = m->sample_buffer[i + s->blockpos][channel]; | |
| 669 unsigned int order; | |
| 670 int64_t accum = 0; | |
| 671 int32_t result; | |
| 672 | |
| 673 /* TODO: Move this code to DSPContext? */ | |
| 674 | |
|
9280
e3eff8a463ec
mlpdec: Split filter_state_buffer into [fi]irbuf and fp to [fi]ir.
ramiro
parents:
9279
diff
changeset
|
675 for (order = 0; order < fir->order; order++) |
| 9282 | 676 accum += (int64_t) firbuf[index + order] * fir->coeff[order]; |
|
9280
e3eff8a463ec
mlpdec: Split filter_state_buffer into [fi]irbuf and fp to [fi]ir.
ramiro
parents:
9279
diff
changeset
|
677 for (order = 0; order < iir->order; order++) |
| 9282 | 678 accum += (int64_t) iirbuf[index + order] * iir->coeff[order]; |
| 7194 | 679 |
| 680 accum = accum >> filter_shift; | |
| 681 result = (accum + residual) & mask; | |
| 682 | |
| 683 --index; | |
| 684 | |
|
9280
e3eff8a463ec
mlpdec: Split filter_state_buffer into [fi]irbuf and fp to [fi]ir.
ramiro
parents:
9279
diff
changeset
|
685 firbuf[index] = result; |
|
e3eff8a463ec
mlpdec: Split filter_state_buffer into [fi]irbuf and fp to [fi]ir.
ramiro
parents:
9279
diff
changeset
|
686 iirbuf[index] = result - accum; |
| 7194 | 687 |
| 688 m->sample_buffer[i + s->blockpos][channel] = result; | |
| 689 } | |
| 690 | |
| 9282 | 691 memcpy(fir->state, &firbuf[index], MAX_FIR_ORDER * sizeof(int32_t)); |
| 692 memcpy(iir->state, &iirbuf[index], MAX_IIR_ORDER * sizeof(int32_t)); | |
| 7194 | 693 } |
| 694 | |
| 695 /** Read a block of PCM residual data (or actual if no filtering active). */ | |
| 696 | |
| 697 static int read_block_data(MLPDecodeContext *m, GetBitContext *gbp, | |
| 698 unsigned int substr) | |
| 699 { | |
| 700 SubStream *s = &m->substream[substr]; | |
| 701 unsigned int i, ch, expected_stream_pos = 0; | |
| 702 | |
| 703 if (s->data_check_present) { | |
| 704 expected_stream_pos = get_bits_count(gbp); | |
| 705 expected_stream_pos += get_bits(gbp, 16); | |
| 706 av_log(m->avctx, AV_LOG_WARNING, "This file contains some features " | |
| 707 "we have not tested yet. %s\n", sample_message); | |
| 708 } | |
| 709 | |
| 710 if (s->blockpos + s->blocksize > m->access_unit_size) { | |
| 7198 | 711 av_log(m->avctx, AV_LOG_ERROR, "too many audio samples in frame\n"); |
| 7194 | 712 return -1; |
| 713 } | |
| 714 | |
| 715 memset(&m->bypassed_lsbs[s->blockpos][0], 0, | |
| 716 s->blocksize * sizeof(m->bypassed_lsbs[0])); | |
| 717 | |
| 718 for (i = 0; i < s->blocksize; i++) { | |
| 719 if (read_huff_channels(m, gbp, substr, i) < 0) | |
| 720 return -1; | |
| 721 } | |
| 722 | |
| 723 for (ch = s->min_channel; ch <= s->max_channel; ch++) { | |
| 724 filter_channel(m, substr, ch); | |
| 725 } | |
| 726 | |
| 727 s->blockpos += s->blocksize; | |
| 728 | |
| 729 if (s->data_check_present) { | |
| 730 if (get_bits_count(gbp) != expected_stream_pos) | |
| 7198 | 731 av_log(m->avctx, AV_LOG_ERROR, "block data length mismatch\n"); |
| 7194 | 732 skip_bits(gbp, 8); |
| 733 } | |
| 734 | |
| 735 return 0; | |
| 736 } | |
| 737 | |
| 7198 | 738 /** Data table used for TrueHD noise generation function. */ |
| 7194 | 739 |
| 740 static const int8_t noise_table[256] = { | |
| 741 30, 51, 22, 54, 3, 7, -4, 38, 14, 55, 46, 81, 22, 58, -3, 2, | |
| 742 52, 31, -7, 51, 15, 44, 74, 30, 85, -17, 10, 33, 18, 80, 28, 62, | |
| 743 10, 32, 23, 69, 72, 26, 35, 17, 73, 60, 8, 56, 2, 6, -2, -5, | |
| 744 51, 4, 11, 50, 66, 76, 21, 44, 33, 47, 1, 26, 64, 48, 57, 40, | |
| 745 38, 16, -10, -28, 92, 22, -18, 29, -10, 5, -13, 49, 19, 24, 70, 34, | |
| 746 61, 48, 30, 14, -6, 25, 58, 33, 42, 60, 67, 17, 54, 17, 22, 30, | |
| 747 67, 44, -9, 50, -11, 43, 40, 32, 59, 82, 13, 49, -14, 55, 60, 36, | |
| 748 48, 49, 31, 47, 15, 12, 4, 65, 1, 23, 29, 39, 45, -2, 84, 69, | |
| 749 0, 72, 37, 57, 27, 41, -15, -16, 35, 31, 14, 61, 24, 0, 27, 24, | |
| 750 16, 41, 55, 34, 53, 9, 56, 12, 25, 29, 53, 5, 20, -20, -8, 20, | |
| 751 13, 28, -3, 78, 38, 16, 11, 62, 46, 29, 21, 24, 46, 65, 43, -23, | |
| 752 89, 18, 74, 21, 38, -12, 19, 12, -19, 8, 15, 33, 4, 57, 9, -8, | |
| 753 36, 35, 26, 28, 7, 83, 63, 79, 75, 11, 3, 87, 37, 47, 34, 40, | |
| 754 39, 19, 20, 42, 27, 34, 39, 77, 13, 42, 59, 64, 45, -1, 32, 37, | |
| 755 45, -5, 53, -6, 7, 36, 50, 23, 6, 32, 9, -21, 18, 71, 27, 52, | |
| 756 -25, 31, 35, 42, -1, 68, 63, 52, 26, 43, 66, 37, 41, 25, 40, 70, | |
| 757 }; | |
| 758 | |
| 759 /** Noise generation functions. | |
| 760 * I'm not sure what these are for - they seem to be some kind of pseudorandom | |
| 761 * sequence generators, used to generate noise data which is used when the | |
| 762 * channels are rematrixed. I'm not sure if they provide a practical benefit | |
| 763 * to compression, or just obfuscate the decoder. Are they for some kind of | |
| 764 * dithering? */ | |
| 765 | |
| 766 /** Generate two channels of noise, used in the matrix when | |
| 767 * restart sync word == 0x31ea. */ | |
| 768 | |
| 769 static void generate_2_noise_channels(MLPDecodeContext *m, unsigned int substr) | |
| 770 { | |
| 771 SubStream *s = &m->substream[substr]; | |
| 772 unsigned int i; | |
| 773 uint32_t seed = s->noisegen_seed; | |
| 774 unsigned int maxchan = s->max_matrix_channel; | |
| 775 | |
| 776 for (i = 0; i < s->blockpos; i++) { | |
| 777 uint16_t seed_shr7 = seed >> 7; | |
| 778 m->sample_buffer[i][maxchan+1] = ((int8_t)(seed >> 15)) << s->noise_shift; | |
| 779 m->sample_buffer[i][maxchan+2] = ((int8_t) seed_shr7) << s->noise_shift; | |
| 780 | |
| 781 seed = (seed << 16) ^ seed_shr7 ^ (seed_shr7 << 5); | |
| 782 } | |
| 783 | |
| 784 s->noisegen_seed = seed; | |
| 785 } | |
| 786 | |
| 787 /** Generate a block of noise, used when restart sync word == 0x31eb. */ | |
| 788 | |
| 789 static void fill_noise_buffer(MLPDecodeContext *m, unsigned int substr) | |
| 790 { | |
| 791 SubStream *s = &m->substream[substr]; | |
| 792 unsigned int i; | |
| 793 uint32_t seed = s->noisegen_seed; | |
| 794 | |
| 795 for (i = 0; i < m->access_unit_size_pow2; i++) { | |
| 796 uint8_t seed_shr15 = seed >> 15; | |
| 797 m->noise_buffer[i] = noise_table[seed_shr15]; | |
| 798 seed = (seed << 8) ^ seed_shr15 ^ (seed_shr15 << 5); | |
| 799 } | |
| 800 | |
| 801 s->noisegen_seed = seed; | |
| 802 } | |
| 803 | |
| 804 | |
| 805 /** Apply the channel matrices in turn to reconstruct the original audio | |
| 806 * samples. */ | |
| 807 | |
| 808 static void rematrix_channels(MLPDecodeContext *m, unsigned int substr) | |
| 809 { | |
| 810 SubStream *s = &m->substream[substr]; | |
| 811 unsigned int mat, src_ch, i; | |
| 812 unsigned int maxchan; | |
| 813 | |
| 814 maxchan = s->max_matrix_channel; | |
| 815 if (!s->noise_type) { | |
| 816 generate_2_noise_channels(m, substr); | |
| 817 maxchan += 2; | |
| 818 } else { | |
| 819 fill_noise_buffer(m, substr); | |
| 820 } | |
| 821 | |
| 822 for (mat = 0; mat < s->num_primitive_matrices; mat++) { | |
| 823 int matrix_noise_shift = s->matrix_noise_shift[mat]; | |
| 824 unsigned int dest_ch = s->matrix_out_ch[mat]; | |
| 825 int32_t mask = MSB_MASK(s->quant_step_size[dest_ch]); | |
| 826 | |
| 827 /* TODO: DSPContext? */ | |
| 828 | |
| 829 for (i = 0; i < s->blockpos; i++) { | |
| 830 int64_t accum = 0; | |
| 831 for (src_ch = 0; src_ch <= maxchan; src_ch++) { | |
| 832 accum += (int64_t)m->sample_buffer[i][src_ch] | |
| 833 * s->matrix_coeff[mat][src_ch]; | |
| 834 } | |
| 835 if (matrix_noise_shift) { | |
| 836 uint32_t index = s->num_primitive_matrices - mat; | |
| 837 index = (i * (index * 2 + 1) + index) & (m->access_unit_size_pow2 - 1); | |
| 838 accum += m->noise_buffer[index] << (matrix_noise_shift + 7); | |
| 839 } | |
| 840 m->sample_buffer[i][dest_ch] = ((accum >> 14) & mask) | |
| 841 + m->bypassed_lsbs[i][mat]; | |
| 842 } | |
| 843 } | |
| 844 } | |
| 845 | |
| 846 /** Write the audio data into the output buffer. */ | |
| 847 | |
| 848 static int output_data_internal(MLPDecodeContext *m, unsigned int substr, | |
| 849 uint8_t *data, unsigned int *data_size, int is32) | |
| 850 { | |
| 851 SubStream *s = &m->substream[substr]; | |
| 9203 | 852 unsigned int i, out_ch = 0; |
| 7194 | 853 int32_t *data_32 = (int32_t*) data; |
| 854 int16_t *data_16 = (int16_t*) data; | |
| 855 | |
| 856 if (*data_size < (s->max_channel + 1) * s->blockpos * (is32 ? 4 : 2)) | |
| 857 return -1; | |
| 858 | |
| 859 for (i = 0; i < s->blockpos; i++) { | |
| 9203 | 860 for (out_ch = 0; out_ch <= s->max_matrix_channel; out_ch++) { |
| 861 int mat_ch = s->ch_assign[out_ch]; | |
| 862 int32_t sample = m->sample_buffer[i][mat_ch] | |
| 863 << s->output_shift[mat_ch]; | |
| 864 s->lossless_check_data ^= (sample & 0xffffff) << mat_ch; | |
| 7194 | 865 if (is32) *data_32++ = sample << 8; |
| 866 else *data_16++ = sample >> 8; | |
| 867 } | |
| 868 } | |
| 869 | |
| 9203 | 870 *data_size = i * out_ch * (is32 ? 4 : 2); |
| 7194 | 871 |
| 872 return 0; | |
| 873 } | |
| 874 | |
| 875 static int output_data(MLPDecodeContext *m, unsigned int substr, | |
| 876 uint8_t *data, unsigned int *data_size) | |
| 877 { | |
| 878 if (m->avctx->sample_fmt == SAMPLE_FMT_S32) | |
| 879 return output_data_internal(m, substr, data, data_size, 1); | |
| 880 else | |
| 881 return output_data_internal(m, substr, data, data_size, 0); | |
| 882 } | |
| 883 | |
| 884 | |
| 885 /** Read an access unit from the stream. | |
| 886 * Returns < 0 on error, 0 if not enough data is present in the input stream | |
| 887 * otherwise returns the number of bytes consumed. */ | |
| 888 | |
| 889 static int read_access_unit(AVCodecContext *avctx, void* data, int *data_size, | |
| 890 const uint8_t *buf, int buf_size) | |
| 891 { | |
| 892 MLPDecodeContext *m = avctx->priv_data; | |
| 893 GetBitContext gb; | |
| 894 unsigned int length, substr; | |
| 895 unsigned int substream_start; | |
| 896 unsigned int header_size = 4; | |
| 897 unsigned int substr_header_size = 0; | |
| 898 uint8_t substream_parity_present[MAX_SUBSTREAMS]; | |
| 899 uint16_t substream_data_len[MAX_SUBSTREAMS]; | |
| 900 uint8_t parity_bits; | |
| 901 | |
| 902 if (buf_size < 4) | |
| 903 return 0; | |
| 904 | |
| 905 length = (AV_RB16(buf) & 0xfff) * 2; | |
| 906 | |
| 907 if (length > buf_size) | |
| 908 return -1; | |
| 909 | |
| 910 init_get_bits(&gb, (buf + 4), (length - 4) * 8); | |
| 911 | |
| 912 if (show_bits_long(&gb, 31) == (0xf8726fba >> 1)) { | |
| 913 if (read_major_sync(m, &gb) < 0) | |
| 914 goto error; | |
| 915 header_size += 28; | |
| 916 } | |
| 917 | |
| 918 if (!m->params_valid) { | |
| 919 av_log(m->avctx, AV_LOG_WARNING, | |
| 7198 | 920 "Stream parameters not seen; skipping frame.\n"); |
| 7194 | 921 *data_size = 0; |
| 922 return length; | |
| 923 } | |
| 924 | |
| 925 substream_start = 0; | |
| 926 | |
| 927 for (substr = 0; substr < m->num_substreams; substr++) { | |
| 928 int extraword_present, checkdata_present, end; | |
| 929 | |
| 930 extraword_present = get_bits1(&gb); | |
| 931 skip_bits1(&gb); | |
| 932 checkdata_present = get_bits1(&gb); | |
| 933 skip_bits1(&gb); | |
| 934 | |
| 935 end = get_bits(&gb, 12) * 2; | |
| 936 | |
| 937 substr_header_size += 2; | |
| 938 | |
| 939 if (extraword_present) { | |
| 940 skip_bits(&gb, 16); | |
| 941 substr_header_size += 2; | |
| 942 } | |
| 943 | |
| 944 if (end + header_size + substr_header_size > length) { | |
| 945 av_log(m->avctx, AV_LOG_ERROR, | |
| 946 "Indicated length of substream %d data goes off end of " | |
| 947 "packet.\n", substr); | |
| 948 end = length - header_size - substr_header_size; | |
| 949 } | |
| 950 | |
| 951 if (end < substream_start) { | |
| 952 av_log(avctx, AV_LOG_ERROR, | |
| 953 "Indicated end offset of substream %d data " | |
| 954 "is smaller than calculated start offset.\n", | |
| 955 substr); | |
| 956 goto error; | |
| 957 } | |
| 958 | |
| 959 if (substr > m->max_decoded_substream) | |
| 960 continue; | |
| 961 | |
| 962 substream_parity_present[substr] = checkdata_present; | |
| 963 substream_data_len[substr] = end - substream_start; | |
| 964 substream_start = end; | |
| 965 } | |
| 966 | |
|
7559
fd24c8628221
mlp: Split common code from parser and decoder to be used by encoder.
ramiro
parents:
7556
diff
changeset
|
967 parity_bits = ff_mlp_calculate_parity(buf, 4); |
|
fd24c8628221
mlp: Split common code from parser and decoder to be used by encoder.
ramiro
parents:
7556
diff
changeset
|
968 parity_bits ^= ff_mlp_calculate_parity(buf + header_size, substr_header_size); |
| 7194 | 969 |
| 970 if ((((parity_bits >> 4) ^ parity_bits) & 0xF) != 0xF) { | |
| 971 av_log(avctx, AV_LOG_ERROR, "Parity check failed.\n"); | |
| 972 goto error; | |
| 973 } | |
| 974 | |
| 975 buf += header_size + substr_header_size; | |
| 976 | |
| 977 for (substr = 0; substr <= m->max_decoded_substream; substr++) { | |
| 978 SubStream *s = &m->substream[substr]; | |
| 979 init_get_bits(&gb, buf, substream_data_len[substr] * 8); | |
| 980 | |
| 981 s->blockpos = 0; | |
| 982 do { | |
| 983 if (get_bits1(&gb)) { | |
| 984 if (get_bits1(&gb)) { | |
| 7198 | 985 /* A restart header should be present. */ |
| 7194 | 986 if (read_restart_header(m, &gb, buf, substr) < 0) |
| 987 goto next_substr; | |
| 988 s->restart_seen = 1; | |
| 989 } | |
| 990 | |
| 991 if (!s->restart_seen) { | |
| 992 av_log(m->avctx, AV_LOG_ERROR, | |
| 993 "No restart header present in substream %d.\n", | |
| 994 substr); | |
| 995 goto next_substr; | |
| 996 } | |
| 997 | |
| 998 if (read_decoding_params(m, &gb, substr) < 0) | |
| 999 goto next_substr; | |
| 1000 } | |
| 1001 | |
| 1002 if (!s->restart_seen) { | |
| 1003 av_log(m->avctx, AV_LOG_ERROR, | |
| 1004 "No restart header present in substream %d.\n", | |
| 1005 substr); | |
| 1006 goto next_substr; | |
| 1007 } | |
| 1008 | |
| 1009 if (read_block_data(m, &gb, substr) < 0) | |
| 1010 return -1; | |
| 1011 | |
| 1012 } while ((get_bits_count(&gb) < substream_data_len[substr] * 8) | |
| 1013 && get_bits1(&gb) == 0); | |
| 1014 | |
| 1015 skip_bits(&gb, (-get_bits_count(&gb)) & 15); | |
|
7262
e3822c61f2e4
mlpdec: Check for bits left before each read of End-of-Stream indicator and
ramiro
parents:
7199
diff
changeset
|
1016 if (substream_data_len[substr] * 8 - get_bits_count(&gb) >= 32 && |
|
7575
d73cd240d68c
mlp: Define End-of-Stream code in common header file and use it in decoder.
ramiro
parents:
7566
diff
changeset
|
1017 (show_bits_long(&gb, 32) == END_OF_STREAM || |
| 7194 | 1018 show_bits_long(&gb, 20) == 0xd234e)) { |
| 1019 skip_bits(&gb, 18); | |
| 1020 if (substr == m->max_decoded_substream) | |
| 7198 | 1021 av_log(m->avctx, AV_LOG_INFO, "End of stream indicated.\n"); |
| 7194 | 1022 |
| 1023 if (get_bits1(&gb)) { | |
| 1024 int shorten_by = get_bits(&gb, 13); | |
| 1025 shorten_by = FFMIN(shorten_by, s->blockpos); | |
| 1026 s->blockpos -= shorten_by; | |
| 1027 } else | |
| 1028 skip_bits(&gb, 13); | |
| 1029 } | |
|
7262
e3822c61f2e4
mlpdec: Check for bits left before each read of End-of-Stream indicator and
ramiro
parents:
7199
diff
changeset
|
1030 if (substream_data_len[substr] * 8 - get_bits_count(&gb) >= 16 && |
|
e3822c61f2e4
mlpdec: Check for bits left before each read of End-of-Stream indicator and
ramiro
parents:
7199
diff
changeset
|
1031 substream_parity_present[substr]) { |
| 7194 | 1032 uint8_t parity, checksum; |
| 1033 | |
|
7559
fd24c8628221
mlp: Split common code from parser and decoder to be used by encoder.
ramiro
parents:
7556
diff
changeset
|
1034 parity = ff_mlp_calculate_parity(buf, substream_data_len[substr] - 2); |
| 7194 | 1035 if ((parity ^ get_bits(&gb, 8)) != 0xa9) |
| 1036 av_log(m->avctx, AV_LOG_ERROR, | |
| 7198 | 1037 "Substream %d parity check failed.\n", substr); |
| 7194 | 1038 |
|
7559
fd24c8628221
mlp: Split common code from parser and decoder to be used by encoder.
ramiro
parents:
7556
diff
changeset
|
1039 checksum = ff_mlp_checksum8(buf, substream_data_len[substr] - 2); |
| 7194 | 1040 if (checksum != get_bits(&gb, 8)) |
| 7198 | 1041 av_log(m->avctx, AV_LOG_ERROR, "Substream %d checksum failed.\n", |
| 7194 | 1042 substr); |
| 1043 } | |
| 1044 if (substream_data_len[substr] * 8 != get_bits_count(&gb)) { | |
| 7198 | 1045 av_log(m->avctx, AV_LOG_ERROR, "substream %d length mismatch\n", |
| 7194 | 1046 substr); |
| 1047 return -1; | |
| 1048 } | |
| 1049 | |
| 1050 next_substr: | |
| 1051 buf += substream_data_len[substr]; | |
| 1052 } | |
| 1053 | |
| 1054 rematrix_channels(m, m->max_decoded_substream); | |
| 1055 | |
| 1056 if (output_data(m, m->max_decoded_substream, data, data_size) < 0) | |
| 1057 return -1; | |
| 1058 | |
| 1059 return length; | |
| 1060 | |
| 1061 error: | |
| 1062 m->params_valid = 0; | |
| 1063 return -1; | |
| 1064 } | |
| 1065 | |
| 9190 | 1066 #if CONFIG_MLP_DECODER |
| 7194 | 1067 AVCodec mlp_decoder = { |
| 1068 "mlp", | |
| 1069 CODEC_TYPE_AUDIO, | |
| 1070 CODEC_ID_MLP, | |
| 1071 sizeof(MLPDecodeContext), | |
| 1072 mlp_decode_init, | |
| 1073 NULL, | |
| 1074 NULL, | |
| 1075 read_access_unit, | |
| 9190 | 1076 .long_name = NULL_IF_CONFIG_SMALL("MLP (Meridian Lossless Packing)"), |
| 7194 | 1077 }; |
| 9190 | 1078 #endif /* CONFIG_MLP_DECODER */ |
| 7194 | 1079 |
| 9190 | 1080 #if CONFIG_TRUEHD_DECODER |
| 1081 AVCodec truehd_decoder = { | |
| 1082 "truehd", | |
| 1083 CODEC_TYPE_AUDIO, | |
| 1084 CODEC_ID_TRUEHD, | |
| 1085 sizeof(MLPDecodeContext), | |
| 1086 mlp_decode_init, | |
| 1087 NULL, | |
| 1088 NULL, | |
| 1089 read_access_unit, | |
| 1090 .long_name = NULL_IF_CONFIG_SMALL("TrueHD"), | |
| 1091 }; | |
| 1092 #endif /* CONFIG_TRUEHD_DECODER */ |
