X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Falsdec.c;h=17c54900f7fb19d2a00a3f76a5af84b2ac30606e;hb=6efe6028ed182d82d4ac8b9801fbcee91a88c053;hp=1c6af25f21b1d8da70f09bb184a00c491ea102be;hpb=8e14fbe89bf1903b2df37399d961dad5458288a1;p=ffmpeg diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c index 1c6af25f21b..17c54900f7f 100644 --- a/libavcodec/alsdec.c +++ b/libavcodec/alsdec.c @@ -2,25 +2,25 @@ * MPEG-4 ALS decoder * Copyright (c) 2009 Thilo Borgmann * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav 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, + * Libav 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 + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /** - * @file libavcodec/alsdec.c + * @file * MPEG-4 ALS decoder * @author Thilo Borgmann */ @@ -34,11 +34,15 @@ #include "unary.h" #include "mpeg4audio.h" #include "bytestream.h" +#include "bgmc.h" +#include "dsputil.h" +#include "libavutil/samplefmt.h" +#include "libavutil/crc.h" #include /** Rice parameters and corresponding index offsets for decoding the - * indices of scaled PARCOR values. The table choosen is set globally + * indices of scaled PARCOR values. The table chosen is set globally * by the encoder and stored in ALSSpecificConfig. */ static const int8_t parcor_rice_table[3][20][2] = { @@ -120,6 +124,28 @@ static const int16_t mcc_weightings[] = { }; +/** Tail codes used in arithmetic coding using block Gilbert-Moore codes. + */ +static const uint8_t tail_code[16][6] = { + { 74, 44, 25, 13, 7, 3}, + { 68, 42, 24, 13, 7, 3}, + { 58, 39, 23, 13, 7, 3}, + {126, 70, 37, 19, 10, 5}, + {132, 70, 37, 20, 10, 5}, + {124, 70, 38, 20, 10, 5}, + {120, 69, 37, 20, 11, 5}, + {116, 67, 37, 20, 11, 5}, + {108, 66, 36, 20, 10, 5}, + {102, 62, 36, 20, 10, 5}, + { 88, 58, 34, 19, 10, 5}, + {162, 89, 49, 25, 13, 7}, + {156, 87, 49, 26, 14, 7}, + {150, 86, 47, 26, 14, 7}, + {142, 84, 47, 26, 14, 7}, + {131, 79, 46, 26, 14, 7} +}; + + enum RA_Flag { RA_FLAG_NONE, RA_FLAG_FRAMES, @@ -131,6 +157,7 @@ typedef struct { uint32_t samples; ///< number of samples, 0xFFFFFFFF if unknown int resolution; ///< 000 = 8-bit; 001 = 16-bit; 010 = 24-bit; 011 = 32-bit int floating; ///< 1 = IEEE 32-bit floating-point, 0 = integer + int msb_first; ///< 1 = original CRC calculated on big-endian system, 0 = little-endian int frame_length; ///< frame length for each frame (last frame may differ) int ra_distance; ///< distance between RA frames (in frames, 0...255) enum RA_Flag ra_flag; ///< indicates where the size of ra units is stored @@ -148,6 +175,7 @@ typedef struct { int rlslms; ///< use "Recursive Least Square-Least Mean Square" predictor: 1 = on, 0 = off int chan_config_info; ///< mapping of channels to loudspeaker locations. Unused until setting channel configuration is implemented. int *chan_pos; ///< original channel positions + int crc_enabled; ///< enable Cyclic Redundancy Checksum } ALSSpecificConfig; @@ -165,11 +193,22 @@ typedef struct { AVCodecContext *avctx; ALSSpecificConfig sconf; GetBitContext gb; + DSPContext dsp; + const AVCRC *crc_table; + uint32_t crc_org; ///< CRC value of the original input data + uint32_t crc; ///< CRC value calculated from decoded data unsigned int cur_frame_length; ///< length of the current frame to decode unsigned int frame_id; ///< the frame ID / number of the current frame unsigned int js_switch; ///< if true, joint-stereo decoding is enforced unsigned int num_blocks; ///< number of blocks used in the current frame + unsigned int s_max; ///< maximum Rice parameter allowed in entropy coding + uint8_t *bgmc_lut; ///< pointer at lookup tables used for BGMC + int *bgmc_lut_status; ///< pointer at lookup table status flags used for BGMC int ltp_lag_length; ///< number of bits used for ltp lag value + int *const_block; ///< contains const_block flags for all channels + unsigned int *shift_lsbs; ///< contains shift_lsbs flags for all channels + unsigned int *opt_order; ///< contains opt_order flags for all channels + int *store_prev_samples; ///< contains store_prev_samples flags for all channels int *use_ltp; ///< contains use_ltp flags for all channels int *ltp_lag; ///< contains ltp lag values for all channels int **ltp_gain; ///< gain values for ltp 5-tap filter for a channel @@ -185,18 +224,18 @@ typedef struct { int32_t *prev_raw_samples; ///< contains unshifted raw samples from the previous block int32_t **raw_samples; ///< decoded raw samples for each channel int32_t *raw_buffer; ///< contains all decoded raw samples including carryover samples + uint8_t *crc_buffer; ///< buffer of byte order corrected samples used for CRC check } ALSDecContext; typedef struct { unsigned int block_length; ///< number of samples within the block unsigned int ra_block; ///< if true, this is a random access block - int const_block; ///< if true, this is a constant value block - int32_t const_val; ///< the sample value of a constant block + int *const_block; ///< if true, this is a constant value block int js_blocks; ///< true if this block contains a difference signal - unsigned int shift_lsbs; ///< shift of values for this block - unsigned int opt_order; ///< prediction order of this block - int store_prev_samples;///< if true, carryover samples have to be stored + unsigned int *shift_lsbs; ///< shift of values for this block + unsigned int *opt_order; ///< prediction order of this block + int *store_prev_samples;///< if true, carryover samples have to be stored int *use_ltp; ///< if true, long-term prediction is used int *ltp_lag; ///< lag value for long-term prediction int *ltp_gain; ///< gain values for ltp 5-tap filter @@ -214,35 +253,35 @@ static av_cold void dprint_specific_config(ALSDecContext *ctx) AVCodecContext *avctx = ctx->avctx; ALSSpecificConfig *sconf = &ctx->sconf; - dprintf(avctx, "resolution = %i\n", sconf->resolution); - dprintf(avctx, "floating = %i\n", sconf->floating); - dprintf(avctx, "frame_length = %i\n", sconf->frame_length); - dprintf(avctx, "ra_distance = %i\n", sconf->ra_distance); - dprintf(avctx, "ra_flag = %i\n", sconf->ra_flag); - dprintf(avctx, "adapt_order = %i\n", sconf->adapt_order); - dprintf(avctx, "coef_table = %i\n", sconf->coef_table); - dprintf(avctx, "long_term_prediction = %i\n", sconf->long_term_prediction); - dprintf(avctx, "max_order = %i\n", sconf->max_order); - dprintf(avctx, "block_switching = %i\n", sconf->block_switching); - dprintf(avctx, "bgmc = %i\n", sconf->bgmc); - dprintf(avctx, "sb_part = %i\n", sconf->sb_part); - dprintf(avctx, "joint_stereo = %i\n", sconf->joint_stereo); - dprintf(avctx, "mc_coding = %i\n", sconf->mc_coding); - dprintf(avctx, "chan_config = %i\n", sconf->chan_config); - dprintf(avctx, "chan_sort = %i\n", sconf->chan_sort); - dprintf(avctx, "RLSLMS = %i\n", sconf->rlslms); - dprintf(avctx, "chan_config_info = %i\n", sconf->chan_config_info); + av_dlog(avctx, "resolution = %i\n", sconf->resolution); + av_dlog(avctx, "floating = %i\n", sconf->floating); + av_dlog(avctx, "frame_length = %i\n", sconf->frame_length); + av_dlog(avctx, "ra_distance = %i\n", sconf->ra_distance); + av_dlog(avctx, "ra_flag = %i\n", sconf->ra_flag); + av_dlog(avctx, "adapt_order = %i\n", sconf->adapt_order); + av_dlog(avctx, "coef_table = %i\n", sconf->coef_table); + av_dlog(avctx, "long_term_prediction = %i\n", sconf->long_term_prediction); + av_dlog(avctx, "max_order = %i\n", sconf->max_order); + av_dlog(avctx, "block_switching = %i\n", sconf->block_switching); + av_dlog(avctx, "bgmc = %i\n", sconf->bgmc); + av_dlog(avctx, "sb_part = %i\n", sconf->sb_part); + av_dlog(avctx, "joint_stereo = %i\n", sconf->joint_stereo); + av_dlog(avctx, "mc_coding = %i\n", sconf->mc_coding); + av_dlog(avctx, "chan_config = %i\n", sconf->chan_config); + av_dlog(avctx, "chan_sort = %i\n", sconf->chan_sort); + av_dlog(avctx, "RLSLMS = %i\n", sconf->rlslms); + av_dlog(avctx, "chan_config_info = %i\n", sconf->chan_config_info); #endif } -/** Reads an ALSSpecificConfig from a buffer into the output struct. +/** Read an ALSSpecificConfig from a buffer into the output struct. */ static av_cold int read_specific_config(ALSDecContext *ctx) { GetBitContext gb; uint64_t ht_size; - int i, config_offset, crc_enabled; + int i, config_offset; MPEG4AudioConfig m4ac; ALSSpecificConfig *sconf = &ctx->sconf; AVCodecContext *avctx = ctx->avctx; @@ -271,7 +310,7 @@ static av_cold int read_specific_config(ALSDecContext *ctx) skip_bits(&gb, 3); // skip file_type sconf->resolution = get_bits(&gb, 3); sconf->floating = get_bits1(&gb); - skip_bits1(&gb); // skip msb_first + sconf->msb_first = get_bits1(&gb); sconf->frame_length = get_bits(&gb, 16) + 1; sconf->ra_distance = get_bits(&gb, 8); sconf->ra_flag = get_bits(&gb, 2); @@ -286,7 +325,7 @@ static av_cold int read_specific_config(ALSDecContext *ctx) sconf->mc_coding = get_bits1(&gb); sconf->chan_config = get_bits1(&gb); sconf->chan_sort = get_bits1(&gb); - crc_enabled = get_bits1(&gb); + sconf->crc_enabled = get_bits1(&gb); sconf->rlslms = get_bits1(&gb); skip_bits(&gb, 5); // skip 5 reserved bits skip_bits1(&gb); // skip aux_data_enabled @@ -349,12 +388,17 @@ static av_cold int read_specific_config(ALSDecContext *ctx) skip_bits_long(&gb, ht_size); - // skip the crc data - if (crc_enabled) { + // initialize CRC calculation + if (sconf->crc_enabled) { if (get_bits_left(&gb) < 32) return -1; - skip_bits_long(&gb, 32); + if (avctx->error_recognition >= FF_ER_CAREFUL) { + ctx->crc_table = av_crc_get_table(AV_CRC_32_IEEE_LE); + ctx->crc = 0xFFFFFFFF; + ctx->crc_org = ~get_bits_long(&gb, 32); + } else + skip_bits_long(&gb, 32); } @@ -366,7 +410,7 @@ static av_cold int read_specific_config(ALSDecContext *ctx) } -/** Checks the ALSSpecificConfig for unsupported features. +/** Check the ALSSpecificConfig for unsupported features. */ static int check_specific_config(ALSDecContext *ctx) { @@ -383,7 +427,6 @@ static int check_specific_config(ALSDecContext *ctx) } MISSING_ERR(sconf->floating, "Floating point decoding", -1); - MISSING_ERR(sconf->bgmc, "BGMC entropy decoding", -1); MISSING_ERR(sconf->rlslms, "Adaptive RLS-LMS prediction", -1); MISSING_ERR(sconf->chan_sort, "Channel sorting", 0); @@ -391,7 +434,7 @@ static int check_specific_config(ALSDecContext *ctx) } -/** Parses the bs_info field to extract the block partitioning used in +/** Parse the bs_info field to extract the block partitioning used in * block switching mode, refer to ISO/IEC 14496-3, section 11.6.2. */ static void parse_bs_info(const uint32_t bs_info, unsigned int n, @@ -415,7 +458,7 @@ static void parse_bs_info(const uint32_t bs_info, unsigned int n, } -/** Reads and decodes a Rice codeword. +/** Read and decode a Rice codeword. */ static int32_t decode_rice(GetBitContext *gb, unsigned int k) { @@ -433,7 +476,7 @@ static int32_t decode_rice(GetBitContext *gb, unsigned int k) } -/** Converts PARCOR coefficient k to direct filter coefficient. +/** Convert PARCOR coefficient k to direct filter coefficient. */ static void parcor_to_lpc(unsigned int k, const int32_t *par, int32_t *cof) { @@ -451,8 +494,8 @@ static void parcor_to_lpc(unsigned int k, const int32_t *par, int32_t *cof) } -/** Reads block switching field if necessary and sets actual block sizes. - * Also assures that the block sizes of the last frame correspond to the +/** Read block switching field if necessary and set actual block sizes. + * Also assure that the block sizes of the last frame correspond to the * actual number of samples. */ static void get_block_sizes(ALSDecContext *ctx, unsigned int *div_blocks, @@ -494,7 +537,7 @@ static void get_block_sizes(ALSDecContext *ctx, unsigned int *div_blocks, unsigned int remaining = ctx->cur_frame_length; for (b = 0; b < ctx->num_blocks; b++) { - if (remaining < div_blocks[b]) { + if (remaining <= div_blocks[b]) { div_blocks[b] = remaining; ctx->num_blocks = b + 1; break; @@ -506,7 +549,7 @@ static void get_block_sizes(ALSDecContext *ctx, unsigned int *div_blocks, } -/** Reads the block data for a constant block +/** Read the block data for a constant block */ static void read_const_block_data(ALSDecContext *ctx, ALSBlockData *bd) { @@ -514,30 +557,30 @@ static void read_const_block_data(ALSDecContext *ctx, ALSBlockData *bd) AVCodecContext *avctx = ctx->avctx; GetBitContext *gb = &ctx->gb; - bd->const_val = 0; - bd->const_block = get_bits1(gb); // 1 = constant value, 0 = zero block (silence) + *bd->raw_samples = 0; + *bd->const_block = get_bits1(gb); // 1 = constant value, 0 = zero block (silence) bd->js_blocks = get_bits1(gb); // skip 5 reserved bits skip_bits(gb, 5); - if (bd->const_block) { + if (*bd->const_block) { unsigned int const_val_bits = sconf->floating ? 24 : avctx->bits_per_raw_sample; - bd->const_val = get_sbits_long(gb, const_val_bits); + *bd->raw_samples = get_sbits_long(gb, const_val_bits); } // ensure constant block decoding by reusing this field - bd->const_block = 1; + *bd->const_block = 1; } -/** Decodes the block data for a constant block +/** Decode the block data for a constant block */ static void decode_const_block_data(ALSDecContext *ctx, ALSBlockData *bd) { - int smp = bd->block_length; - int32_t val = bd->const_val; - int32_t *dst = bd->raw_samples; + int smp = bd->block_length - 1; + int32_t val = *bd->raw_samples; + int32_t *dst = bd->raw_samples + 1; // write raw samples into buffer for (; smp; smp--) @@ -545,7 +588,7 @@ static void decode_const_block_data(ALSDecContext *ctx, ALSBlockData *bd) } -/** Reads the block data for a non-constant block +/** Read the block data for a non-constant block */ static int read_var_block_data(ALSDecContext *ctx, ALSBlockData *bd) { @@ -554,20 +597,22 @@ static int read_var_block_data(ALSDecContext *ctx, ALSBlockData *bd) GetBitContext *gb = &ctx->gb; unsigned int k; unsigned int s[8]; + unsigned int sx[8]; unsigned int sub_blocks, log2_sub_blocks, sb_length; unsigned int start = 0; unsigned int opt_order; int sb; int32_t *quant_cof = bd->quant_cof; + int32_t *current_res; // ensure variable block decoding by reusing this field - bd->const_block = 0; + *bd->const_block = 0; - bd->opt_order = 1; + *bd->opt_order = 1; bd->js_blocks = get_bits1(gb); - opt_order = bd->opt_order; + opt_order = *bd->opt_order; // determine the number of subblocks for entropy decoding if (!sconf->bgmc && !sconf->sb_part) { @@ -591,9 +636,15 @@ static int read_var_block_data(ALSDecContext *ctx, ALSBlockData *bd) sb_length = bd->block_length >> log2_sub_blocks; - if (sconf->bgmc) { - // TODO: BGMC mode + s[0] = get_bits(gb, 8 + (sconf->resolution > 1)); + for (k = 1; k < sub_blocks; k++) + s[k] = s[k - 1] + decode_rice(gb, 2); + + for (k = 0; k < sub_blocks; k++) { + sx[k] = s[k] & 0x0F; + s [k] >>= 4; + } } else { s[0] = get_bits(gb, 4 + (sconf->resolution > 1)); for (k = 1; k < sub_blocks; k++) @@ -601,21 +652,21 @@ static int read_var_block_data(ALSDecContext *ctx, ALSBlockData *bd) } if (get_bits1(gb)) - bd->shift_lsbs = get_bits(gb, 4) + 1; + *bd->shift_lsbs = get_bits(gb, 4) + 1; - bd->store_prev_samples = (bd->js_blocks && bd->raw_other) || bd->shift_lsbs; + *bd->store_prev_samples = (bd->js_blocks && bd->raw_other) || *bd->shift_lsbs; if (!sconf->rlslms) { if (sconf->adapt_order) { int opt_order_length = av_ceil_log2(av_clip((bd->block_length >> 3) - 1, 2, sconf->max_order + 1)); - bd->opt_order = get_bits(gb, opt_order_length); + *bd->opt_order = get_bits(gb, opt_order_length); } else { - bd->opt_order = sconf->max_order; + *bd->opt_order = sconf->max_order; } - opt_order = bd->opt_order; + opt_order = *bd->opt_order; if (opt_order) { int add_base; @@ -670,10 +721,14 @@ static int read_var_block_data(ALSDecContext *ctx, ALSBlockData *bd) *bd->use_ltp = get_bits1(gb); if (*bd->use_ltp) { + int r, c; + bd->ltp_gain[0] = decode_rice(gb, 1) << 3; bd->ltp_gain[1] = decode_rice(gb, 2) << 3; - bd->ltp_gain[2] = ltp_gain_values[get_unary(gb, 0, 4)][get_bits(gb, 2)]; + r = get_unary(gb, 0, 4); + c = get_bits(gb, 2); + bd->ltp_gain[2] = ltp_gain_values[r][c]; bd->ltp_gain[3] = decode_rice(gb, 2) << 3; bd->ltp_gain[4] = decode_rice(gb, 1) << 3; @@ -688,18 +743,85 @@ static int read_var_block_data(ALSDecContext *ctx, ALSBlockData *bd) if (opt_order) bd->raw_samples[0] = decode_rice(gb, avctx->bits_per_raw_sample - 4); if (opt_order > 1) - bd->raw_samples[1] = decode_rice(gb, s[0] + 3); + bd->raw_samples[1] = decode_rice(gb, FFMIN(s[0] + 3, ctx->s_max)); if (opt_order > 2) - bd->raw_samples[2] = decode_rice(gb, s[0] + 1); + bd->raw_samples[2] = decode_rice(gb, FFMIN(s[0] + 1, ctx->s_max)); start = FFMIN(opt_order, 3); } // read all residuals if (sconf->bgmc) { - // TODO: BGMC mode + int delta[8]; + unsigned int k [8]; + unsigned int b = av_clip((av_ceil_log2(bd->block_length) - 3) >> 1, 0, 5); + unsigned int i = start; + + // read most significant bits + unsigned int high; + unsigned int low; + unsigned int value; + + ff_bgmc_decode_init(gb, &high, &low, &value); + + current_res = bd->raw_samples + start; + + for (sb = 0; sb < sub_blocks; sb++, i = 0) { + k [sb] = s[sb] > b ? s[sb] - b : 0; + delta[sb] = 5 - s[sb] + k[sb]; + + ff_bgmc_decode(gb, sb_length, current_res, + delta[sb], sx[sb], &high, &low, &value, ctx->bgmc_lut, ctx->bgmc_lut_status); + + current_res += sb_length; + } + + ff_bgmc_decode_end(gb); + + + // read least significant bits and tails + i = start; + current_res = bd->raw_samples + start; + + for (sb = 0; sb < sub_blocks; sb++, i = 0) { + unsigned int cur_tail_code = tail_code[sx[sb]][delta[sb]]; + unsigned int cur_k = k[sb]; + unsigned int cur_s = s[sb]; + + for (; i < sb_length; i++) { + int32_t res = *current_res; + + if (res == cur_tail_code) { + unsigned int max_msb = (2 + (sx[sb] > 2) + (sx[sb] > 10)) + << (5 - delta[sb]); + + res = decode_rice(gb, cur_s); + + if (res >= 0) { + res += (max_msb ) << cur_k; + } else { + res -= (max_msb - 1) << cur_k; + } + } else { + if (res > cur_tail_code) + res--; + + if (res & 1) + res = -res; + + res >>= 1; + + if (cur_k) { + res <<= cur_k; + res |= get_bits_long(gb, cur_k); + } + } + + *current_res++ = res; + } + } } else { - int32_t *current_res = bd->raw_samples + start; + current_res = bd->raw_samples + start; for (sb = 0; sb < sub_blocks; sb++, start = 0) for (; start < sb_length; start++) @@ -713,7 +835,7 @@ static int read_var_block_data(ALSDecContext *ctx, ALSBlockData *bd) } -/** Decodes the block data for a non-constant block +/** Decode the block data for a non-constant block */ static int decode_var_block_data(ALSDecContext *ctx, ALSBlockData *bd) { @@ -721,7 +843,7 @@ static int decode_var_block_data(ALSDecContext *ctx, ALSBlockData *bd) unsigned int block_length = bd->block_length; unsigned int smp = 0; unsigned int k; - int opt_order = bd->opt_order; + int opt_order = *bd->opt_order; int sb; int64_t y; int32_t *quant_cof = bd->quant_cof; @@ -766,7 +888,7 @@ static int decode_var_block_data(ALSDecContext *ctx, ALSBlockData *bd) parcor_to_lpc(k, quant_cof, lpc_cof); // store previous samples in case that they have to be altered - if (bd->store_prev_samples) + if (*bd->store_prev_samples) memcpy(bd->prev_raw_samples, raw_samples - sconf->max_order, sizeof(*bd->prev_raw_samples) * sconf->max_order); @@ -787,9 +909,9 @@ static int decode_var_block_data(ALSDecContext *ctx, ALSBlockData *bd) } // reconstruct shifted signal - if (bd->shift_lsbs) + if (*bd->shift_lsbs) for (sb = -1; sb >= -sconf->max_order; sb--) - raw_samples[sb] >>= bd->shift_lsbs; + raw_samples[sb] >>= *bd->shift_lsbs; } // reverse linear prediction coefficients for efficiency @@ -814,7 +936,7 @@ static int decode_var_block_data(ALSDecContext *ctx, ALSBlockData *bd) raw_samples = bd->raw_samples; // restore previous samples in case that they have been altered - if (bd->store_prev_samples) + if (*bd->store_prev_samples) memcpy(raw_samples - sconf->max_order, bd->prev_raw_samples, sizeof(*raw_samples) * sconf->max_order); @@ -822,12 +944,13 @@ static int decode_var_block_data(ALSDecContext *ctx, ALSBlockData *bd) } -/** Reads the block data. +/** Read the block data. */ static int read_block(ALSDecContext *ctx, ALSBlockData *bd) { GetBitContext *gb = &ctx->gb; + *bd->shift_lsbs = 0; // read block type flag and read the samples accordingly if (get_bits1(gb)) { if (read_var_block_data(ctx, bd)) @@ -840,29 +963,29 @@ static int read_block(ALSDecContext *ctx, ALSBlockData *bd) } -/** Decodes the block data. +/** Decode the block data. */ static int decode_block(ALSDecContext *ctx, ALSBlockData *bd) { unsigned int smp; // read block type flag and read the samples accordingly - if (bd->const_block) + if (*bd->const_block) decode_const_block_data(ctx, bd); else if (decode_var_block_data(ctx, bd)) return -1; // TODO: read RLSLMS extension data - if (bd->shift_lsbs) + if (*bd->shift_lsbs) for (smp = 0; smp < bd->block_length; smp++) - bd->raw_samples[smp] <<= bd->shift_lsbs; + bd->raw_samples[smp] <<= *bd->shift_lsbs; return 0; } -/** Reads and decodes block data successively. +/** Read and decode block data successively. */ static int read_decode_block(ALSDecContext *ctx, ALSBlockData *bd) { @@ -879,7 +1002,7 @@ static int read_decode_block(ALSDecContext *ctx, ALSBlockData *bd) } -/** Computes the number of samples left to decode for the current frame and +/** Compute the number of samples left to decode for the current frame and * sets these samples to zero. */ static void zero_remaining(unsigned int b, unsigned int b_max, @@ -895,7 +1018,7 @@ static void zero_remaining(unsigned int b, unsigned int b_max, } -/** Decodes blocks independently. +/** Decode blocks independently. */ static int decode_blocks_ind(ALSDecContext *ctx, unsigned int ra_frame, unsigned int c, const unsigned int *div_blocks, @@ -907,6 +1030,10 @@ static int decode_blocks_ind(ALSDecContext *ctx, unsigned int ra_frame, memset(&bd, 0, sizeof(ALSBlockData)); bd.ra_block = ra_frame; + bd.const_block = ctx->const_block; + bd.shift_lsbs = ctx->shift_lsbs; + bd.opt_order = ctx->opt_order; + bd.store_prev_samples = ctx->store_prev_samples; bd.use_ltp = ctx->use_ltp; bd.ltp_lag = ctx->ltp_lag; bd.ltp_gain = ctx->ltp_gain[0]; @@ -917,7 +1044,6 @@ static int decode_blocks_ind(ALSDecContext *ctx, unsigned int ra_frame, for (b = 0; b < ctx->num_blocks; b++) { - bd.shift_lsbs = 0; bd.block_length = div_blocks[b]; if (read_decode_block(ctx, &bd)) { @@ -933,7 +1059,7 @@ static int decode_blocks_ind(ALSDecContext *ctx, unsigned int ra_frame, } -/** Decodes blocks dependently. +/** Decode blocks dependently. */ static int decode_blocks(ALSDecContext *ctx, unsigned int ra_frame, unsigned int c, const unsigned int *div_blocks, @@ -947,6 +1073,10 @@ static int decode_blocks(ALSDecContext *ctx, unsigned int ra_frame, memset(bd, 0, 2 * sizeof(ALSBlockData)); bd[0].ra_block = ra_frame; + bd[0].const_block = ctx->const_block; + bd[0].shift_lsbs = ctx->shift_lsbs; + bd[0].opt_order = ctx->opt_order; + bd[0].store_prev_samples = ctx->store_prev_samples; bd[0].use_ltp = ctx->use_ltp; bd[0].ltp_lag = ctx->ltp_lag; bd[0].ltp_gain = ctx->ltp_gain[0]; @@ -956,6 +1086,10 @@ static int decode_blocks(ALSDecContext *ctx, unsigned int ra_frame, bd[0].js_blocks = *js_blocks; bd[1].ra_block = ra_frame; + bd[1].const_block = ctx->const_block; + bd[1].shift_lsbs = ctx->shift_lsbs; + bd[1].opt_order = ctx->opt_order; + bd[1].store_prev_samples = ctx->store_prev_samples; bd[1].use_ltp = ctx->use_ltp; bd[1].ltp_lag = ctx->ltp_lag; bd[1].ltp_gain = ctx->ltp_gain[0]; @@ -968,9 +1102,6 @@ static int decode_blocks(ALSDecContext *ctx, unsigned int ra_frame, for (b = 0; b < ctx->num_blocks; b++) { unsigned int s; - bd[0].shift_lsbs = 0; - bd[1].shift_lsbs = 0; - bd[0].block_length = div_blocks[b]; bd[1].block_length = div_blocks[b]; @@ -1014,7 +1145,7 @@ static int decode_blocks(ALSDecContext *ctx, unsigned int ra_frame, } -/** Reads the channel data. +/** Read the channel data. */ static int read_channel_data(ALSDecContext *ctx, ALSChannelData *cd, int c) { @@ -1088,6 +1219,10 @@ static int revert_channel_correlation(ALSDecContext *ctx, ALSBlockData *bd, return -1; } + bd->const_block = ctx->const_block + c; + bd->shift_lsbs = ctx->shift_lsbs + c; + bd->opt_order = ctx->opt_order + c; + bd->store_prev_samples = ctx->store_prev_samples + c; bd->use_ltp = ctx->use_ltp + c; bd->ltp_lag = ctx->ltp_lag + c; bd->ltp_gain = ctx->ltp_gain[c]; @@ -1142,7 +1277,7 @@ static int revert_channel_correlation(ALSDecContext *ctx, ALSBlockData *bd, } -/** Reads the frame data. +/** Read the frame data. */ static int read_frame_data(ALSDecContext *ctx, unsigned int ra_frame) { @@ -1221,10 +1356,13 @@ static int read_frame_data(ALSDecContext *ctx, unsigned int ra_frame) get_block_sizes(ctx, div_blocks, &bs_info); for (b = 0; b < ctx->num_blocks; b++) { - bd.shift_lsbs = 0; bd.block_length = div_blocks[b]; for (c = 0; c < avctx->channels; c++) { + bd.const_block = ctx->const_block + c; + bd.shift_lsbs = ctx->shift_lsbs + c; + bd.opt_order = ctx->opt_order + c; + bd.store_prev_samples = ctx->store_prev_samples + c; bd.use_ltp = ctx->use_ltp + c; bd.ltp_lag = ctx->ltp_lag + c; bd.ltp_gain = ctx->ltp_gain[c]; @@ -1244,6 +1382,10 @@ static int read_frame_data(ALSDecContext *ctx, unsigned int ra_frame) return -1; for (c = 0; c < avctx->channels; c++) { + bd.const_block = ctx->const_block + c; + bd.shift_lsbs = ctx->shift_lsbs + c; + bd.opt_order = ctx->opt_order + c; + bd.store_prev_samples = ctx->store_prev_samples + c; bd.use_ltp = ctx->use_ltp + c; bd.ltp_lag = ctx->ltp_lag + c; bd.ltp_gain = ctx->ltp_gain[c]; @@ -1271,7 +1413,7 @@ static int read_frame_data(ALSDecContext *ctx, unsigned int ra_frame) } -/** Decodes an ALS frame. +/** Decode an ALS frame. */ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, @@ -1308,7 +1450,7 @@ static int decode_frame(AVCodecContext *avctx, // check for size of decoded data size = ctx->cur_frame_length * avctx->channels * - (av_get_bits_per_sample_format(avctx->sample_fmt) >> 3); + (av_get_bits_per_sample_fmt(avctx->sample_fmt) >> 3); if (size > *data_size) { av_log(avctx, AV_LOG_ERROR, "Decoded data exceeds buffer size.\n"); @@ -1333,6 +1475,59 @@ static int decode_frame(AVCodecContext *avctx, INTERLEAVE_OUTPUT(32) } + // update CRC + if (sconf->crc_enabled && avctx->error_recognition >= FF_ER_CAREFUL) { + int swap = HAVE_BIGENDIAN != sconf->msb_first; + + if (ctx->avctx->bits_per_raw_sample == 24) { + int32_t *src = data; + + for (sample = 0; + sample < ctx->cur_frame_length * avctx->channels; + sample++) { + int32_t v; + + if (swap) + v = av_bswap32(src[sample]); + else + v = src[sample]; + if (!HAVE_BIGENDIAN) + v >>= 8; + + ctx->crc = av_crc(ctx->crc_table, ctx->crc, (uint8_t*)(&v), 3); + } + } else { + uint8_t *crc_source; + + if (swap) { + if (ctx->avctx->bits_per_raw_sample <= 16) { + int16_t *src = (int16_t*) data; + int16_t *dest = (int16_t*) ctx->crc_buffer; + for (sample = 0; + sample < ctx->cur_frame_length * avctx->channels; + sample++) + *dest++ = av_bswap16(src[sample]); + } else { + ctx->dsp.bswap_buf((uint32_t*)ctx->crc_buffer, data, + ctx->cur_frame_length * avctx->channels); + } + crc_source = ctx->crc_buffer; + } else { + crc_source = data; + } + + ctx->crc = av_crc(ctx->crc_table, ctx->crc, crc_source, size); + } + + + // check CRC sums if this is the last frame + if (ctx->cur_frame_length != sconf->frame_length && + ctx->crc_org != ctx->crc) { + av_log(avctx, AV_LOG_ERROR, "CRC error.\n"); + } + } + + bytes_read = invalid_frame ? buffer_size : (get_bits_count(&ctx->gb) + 7) >> 3; @@ -1340,7 +1535,7 @@ static int decode_frame(AVCodecContext *avctx, } -/** Uninitializes the ALS decoder. +/** Uninitialize the ALS decoder. */ static av_cold int decode_end(AVCodecContext *avctx) { @@ -1348,6 +1543,12 @@ static av_cold int decode_end(AVCodecContext *avctx) av_freep(&ctx->sconf.chan_pos); + ff_bgmc_end(&ctx->bgmc_lut, &ctx->bgmc_lut_status); + + av_freep(&ctx->const_block); + av_freep(&ctx->shift_lsbs); + av_freep(&ctx->opt_order); + av_freep(&ctx->store_prev_samples); av_freep(&ctx->use_ltp); av_freep(&ctx->ltp_lag); av_freep(&ctx->ltp_gain); @@ -1363,12 +1564,13 @@ static av_cold int decode_end(AVCodecContext *avctx) av_freep(&ctx->chan_data); av_freep(&ctx->chan_data_buffer); av_freep(&ctx->reverted_channels); + av_freep(&ctx->crc_buffer); return 0; } -/** Initializes the ALS decoder. +/** Initialize the ALS decoder. */ static av_cold int decode_init(AVCodecContext *avctx) { @@ -1395,15 +1597,23 @@ static av_cold int decode_init(AVCodecContext *avctx) return -1; } + if (sconf->bgmc) + ff_bgmc_init(avctx, &ctx->bgmc_lut, &ctx->bgmc_lut_status); + if (sconf->floating) { - avctx->sample_fmt = SAMPLE_FMT_FLT; + avctx->sample_fmt = AV_SAMPLE_FMT_FLT; avctx->bits_per_raw_sample = 32; } else { avctx->sample_fmt = sconf->resolution > 1 - ? SAMPLE_FMT_S32 : SAMPLE_FMT_S16; + ? AV_SAMPLE_FMT_S32 : AV_SAMPLE_FMT_S16; avctx->bits_per_raw_sample = (sconf->resolution + 1) * 8; } + // set maximum Rice parameter for progressive decoding based on resolution + // This is not specified in 14496-3 but actually done by the reference + // codec RM22 revision 2. + ctx->s_max = sconf->resolution > 1 ? 31 : 15; + // set lag value for long-term prediction ctx->ltp_lag_length = 8 + (avctx->sample_rate >= 96000) + (avctx->sample_rate >= 192000); @@ -1434,13 +1644,19 @@ static av_cold int decode_init(AVCodecContext *avctx) } // allocate and assign lag and gain data buffer for ltp mode + ctx->const_block = av_malloc (sizeof(*ctx->const_block) * num_buffers); + ctx->shift_lsbs = av_malloc (sizeof(*ctx->shift_lsbs) * num_buffers); + ctx->opt_order = av_malloc (sizeof(*ctx->opt_order) * num_buffers); + ctx->store_prev_samples = av_malloc(sizeof(*ctx->store_prev_samples) * num_buffers); ctx->use_ltp = av_mallocz(sizeof(*ctx->use_ltp) * num_buffers); ctx->ltp_lag = av_malloc (sizeof(*ctx->ltp_lag) * num_buffers); ctx->ltp_gain = av_malloc (sizeof(*ctx->ltp_gain) * num_buffers); ctx->ltp_gain_buffer = av_malloc (sizeof(*ctx->ltp_gain_buffer) * num_buffers * 5); - if (!ctx->use_ltp || !ctx->ltp_lag || + if (!ctx->const_block || !ctx->shift_lsbs || + !ctx->opt_order || !ctx->store_prev_samples || + !ctx->use_ltp || !ctx->ltp_lag || !ctx->ltp_gain || !ctx->ltp_gain_buffer) { av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n"); decode_end(avctx); @@ -1453,8 +1669,8 @@ static av_cold int decode_init(AVCodecContext *avctx) // allocate and assign channel data buffer for mcc mode if (sconf->mc_coding) { ctx->chan_data_buffer = av_malloc(sizeof(*ctx->chan_data_buffer) * - num_buffers); - ctx->chan_data = av_malloc(sizeof(ALSChannelData) * + num_buffers * num_buffers); + ctx->chan_data = av_malloc(sizeof(*ctx->chan_data) * num_buffers); ctx->reverted_channels = av_malloc(sizeof(*ctx->reverted_channels) * num_buffers); @@ -1466,7 +1682,7 @@ static av_cold int decode_init(AVCodecContext *avctx) } for (c = 0; c < num_buffers; c++) - ctx->chan_data[c] = ctx->chan_data_buffer + c; + ctx->chan_data[c] = ctx->chan_data_buffer + c * num_buffers; } else { ctx->chan_data = NULL; ctx->chan_data_buffer = NULL; @@ -1492,11 +1708,27 @@ static av_cold int decode_init(AVCodecContext *avctx) for (c = 1; c < avctx->channels; c++) ctx->raw_samples[c] = ctx->raw_samples[c - 1] + channel_size; + // allocate crc buffer + if (HAVE_BIGENDIAN != sconf->msb_first && sconf->crc_enabled && + avctx->error_recognition >= FF_ER_CAREFUL) { + ctx->crc_buffer = av_malloc(sizeof(*ctx->crc_buffer) * + ctx->cur_frame_length * + avctx->channels * + (av_get_bits_per_sample_fmt(avctx->sample_fmt) >> 3)); + if (!ctx->crc_buffer) { + av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n"); + decode_end(avctx); + return AVERROR(ENOMEM); + } + } + + dsputil_init(&ctx->dsp, avctx); + return 0; } -/** Flushes (resets) the frame ID after seeking. +/** Flush (reset) the frame ID after seeking. */ static av_cold void flush(AVCodecContext *avctx) { @@ -1506,9 +1738,9 @@ static av_cold void flush(AVCodecContext *avctx) } -AVCodec als_decoder = { +AVCodec ff_als_decoder = { "als", - CODEC_TYPE_AUDIO, + AVMEDIA_TYPE_AUDIO, CODEC_ID_MP4ALS, sizeof(ALSDecContext), decode_init,