* @author Thilo Borgmann <thilo.borgmann _at_ googlemail.com>
*/
-
-//#define DEBUG
-
+#include <inttypes.h>
#include "avcodec.h"
-#include "get_bits.h"
-#include "unary.h"
+#include "bitstream.h"
#include "mpeg4audio.h"
#include "bytestream.h"
#include "bgmc.h"
-#include "dsputil.h"
+#include "bswapdsp.h"
+#include "internal.h"
+#include "unary.h"
+
#include "libavutil/samplefmt.h"
#include "libavutil/crc.h"
};
-typedef struct {
+typedef struct ALSSpecificConfig {
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
} ALSSpecificConfig;
-typedef struct {
+typedef struct ALSChannelData {
int stop_flag;
int master_channel;
int time_diff_flag;
} ALSChannelData;
-typedef struct {
+typedef struct ALSDecContext {
AVCodecContext *avctx;
- AVFrame frame;
ALSSpecificConfig sconf;
- GetBitContext gb;
- DSPContext dsp;
+ BitstreamContext bc;
+ BswapDSPContext bdsp;
const AVCRC *crc_table;
uint32_t crc_org; ///< CRC value of the original input data
uint32_t crc; ///< CRC value calculated from decoded data
} ALSDecContext;
-typedef struct {
+typedef struct ALSBlockData {
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
} ALSBlockData;
+#ifdef DEBUG
static av_cold void dprint_specific_config(ALSDecContext *ctx)
{
-#ifdef DEBUG
AVCodecContext *avctx = ctx->avctx;
ALSSpecificConfig *sconf = &ctx->sconf;
- 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
+ ff_dlog(avctx, "resolution = %i\n", sconf->resolution);
+ ff_dlog(avctx, "floating = %i\n", sconf->floating);
+ ff_dlog(avctx, "frame_length = %i\n", sconf->frame_length);
+ ff_dlog(avctx, "ra_distance = %i\n", sconf->ra_distance);
+ ff_dlog(avctx, "ra_flag = %i\n", sconf->ra_flag);
+ ff_dlog(avctx, "adapt_order = %i\n", sconf->adapt_order);
+ ff_dlog(avctx, "coef_table = %i\n", sconf->coef_table);
+ ff_dlog(avctx, "long_term_prediction = %i\n", sconf->long_term_prediction);
+ ff_dlog(avctx, "max_order = %i\n", sconf->max_order);
+ ff_dlog(avctx, "block_switching = %i\n", sconf->block_switching);
+ ff_dlog(avctx, "bgmc = %i\n", sconf->bgmc);
+ ff_dlog(avctx, "sb_part = %i\n", sconf->sb_part);
+ ff_dlog(avctx, "joint_stereo = %i\n", sconf->joint_stereo);
+ ff_dlog(avctx, "mc_coding = %i\n", sconf->mc_coding);
+ ff_dlog(avctx, "chan_config = %i\n", sconf->chan_config);
+ ff_dlog(avctx, "chan_sort = %i\n", sconf->chan_sort);
+ ff_dlog(avctx, "RLSLMS = %i\n", sconf->rlslms);
+ ff_dlog(avctx, "chan_config_info = %i\n", sconf->chan_config_info);
}
+#else
+#define dprint_specific_config(x) do {} while(0)
+#endif
/** Read an ALSSpecificConfig from a buffer into the output struct.
*/
static av_cold int read_specific_config(ALSDecContext *ctx)
{
- GetBitContext gb;
+ BitstreamContext bc;
uint64_t ht_size;
int i, config_offset;
MPEG4AudioConfig m4ac;
AVCodecContext *avctx = ctx->avctx;
uint32_t als_id, header_size, trailer_size;
- init_get_bits(&gb, avctx->extradata, avctx->extradata_size * 8);
+ bitstream_init8(&bc, avctx->extradata, avctx->extradata_size);
config_offset = avpriv_mpeg4audio_get_config(&m4ac, avctx->extradata,
avctx->extradata_size * 8, 1);
if (config_offset < 0)
- return -1;
+ return AVERROR_INVALIDDATA;
- skip_bits_long(&gb, config_offset);
+ bitstream_skip(&bc, config_offset);
- if (get_bits_left(&gb) < (30 << 3))
- return -1;
+ if (bitstream_bits_left(&bc) < (30 << 3))
+ return AVERROR_INVALIDDATA;
// read the fixed items
- als_id = get_bits_long(&gb, 32);
+ als_id = bitstream_read(&bc, 32);
avctx->sample_rate = m4ac.sample_rate;
- skip_bits_long(&gb, 32); // sample rate already known
- sconf->samples = get_bits_long(&gb, 32);
+ bitstream_skip(&bc, 32); // sample rate already known
+ sconf->samples = bitstream_read(&bc, 32);
avctx->channels = m4ac.channels;
- skip_bits(&gb, 16); // number of channels already knwon
- skip_bits(&gb, 3); // skip file_type
- sconf->resolution = get_bits(&gb, 3);
- sconf->floating = get_bits1(&gb);
- 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);
- sconf->adapt_order = get_bits1(&gb);
- sconf->coef_table = get_bits(&gb, 2);
- sconf->long_term_prediction = get_bits1(&gb);
- sconf->max_order = get_bits(&gb, 10);
- sconf->block_switching = get_bits(&gb, 2);
- sconf->bgmc = get_bits1(&gb);
- sconf->sb_part = get_bits1(&gb);
- sconf->joint_stereo = get_bits1(&gb);
- sconf->mc_coding = get_bits1(&gb);
- sconf->chan_config = get_bits1(&gb);
- sconf->chan_sort = 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
+ bitstream_skip(&bc, 16); // number of channels already known
+ bitstream_skip(&bc, 3); // skip file_type
+ sconf->resolution = bitstream_read(&bc, 3);
+ sconf->floating = bitstream_read_bit(&bc);
+ sconf->msb_first = bitstream_read_bit(&bc);
+ sconf->frame_length = bitstream_read(&bc, 16) + 1;
+ sconf->ra_distance = bitstream_read(&bc, 8);
+ sconf->ra_flag = bitstream_read(&bc, 2);
+ sconf->adapt_order = bitstream_read_bit(&bc);
+ sconf->coef_table = bitstream_read(&bc, 2);
+ sconf->long_term_prediction = bitstream_read_bit(&bc);
+ sconf->max_order = bitstream_read(&bc, 10);
+ sconf->block_switching = bitstream_read(&bc, 2);
+ sconf->bgmc = bitstream_read_bit(&bc);
+ sconf->sb_part = bitstream_read_bit(&bc);
+ sconf->joint_stereo = bitstream_read_bit(&bc);
+ sconf->mc_coding = bitstream_read_bit(&bc);
+ sconf->chan_config = bitstream_read_bit(&bc);
+ sconf->chan_sort = bitstream_read_bit(&bc);
+ sconf->crc_enabled = bitstream_read_bit(&bc);
+ sconf->rlslms = bitstream_read_bit(&bc);
+ bitstream_skip(&bc, 5); // skip 5 reserved bits
+ bitstream_skip(&bc, 1); // skip aux_data_enabled
// check for ALSSpecificConfig struct
if (als_id != MKBETAG('A','L','S','\0'))
- return -1;
+ return AVERROR_INVALIDDATA;
ctx->cur_frame_length = sconf->frame_length;
// read channel config
if (sconf->chan_config)
- sconf->chan_config_info = get_bits(&gb, 16);
+ sconf->chan_config_info = bitstream_read(&bc, 16);
// TODO: use this to set avctx->channel_layout
if (sconf->chan_sort && avctx->channels > 1) {
int chan_pos_bits = av_ceil_log2(avctx->channels);
int bits_needed = avctx->channels * chan_pos_bits + 7;
- if (get_bits_left(&gb) < bits_needed)
- return -1;
+ if (bitstream_bits_left(&bc) < bits_needed)
+ return AVERROR_INVALIDDATA;
if (!(sconf->chan_pos = av_malloc(avctx->channels * sizeof(*sconf->chan_pos))))
return AVERROR(ENOMEM);
for (i = 0; i < avctx->channels; i++)
- sconf->chan_pos[i] = get_bits(&gb, chan_pos_bits);
+ sconf->chan_pos[i] = bitstream_read(&bc, chan_pos_bits);
- align_get_bits(&gb);
+ bitstream_align(&bc);
// TODO: use this to actually do channel sorting
} else {
sconf->chan_sort = 0;
// read fixed header and trailer sizes,
// if size = 0xFFFFFFFF then there is no data field!
- if (get_bits_left(&gb) < 64)
- return -1;
+ if (bitstream_bits_left(&bc) < 64)
+ return AVERROR_INVALIDDATA;
- header_size = get_bits_long(&gb, 32);
- trailer_size = get_bits_long(&gb, 32);
+ header_size = bitstream_read(&bc, 32);
+ trailer_size = bitstream_read(&bc, 32);
if (header_size == 0xFFFFFFFF)
header_size = 0;
if (trailer_size == 0xFFFFFFFF)
// skip the header and trailer data
- if (get_bits_left(&gb) < ht_size)
- return -1;
+ if (bitstream_bits_left(&bc) < ht_size)
+ return AVERROR_INVALIDDATA;
if (ht_size > INT32_MAX)
- return -1;
+ return AVERROR_PATCHWELCOME;
- skip_bits_long(&gb, ht_size);
+ bitstream_skip(&bc, ht_size);
// initialize CRC calculation
if (sconf->crc_enabled) {
- if (get_bits_left(&gb) < 32)
- return -1;
+ if (bitstream_bits_left(&bc) < 32)
+ return AVERROR_INVALIDDATA;
if (avctx->err_recognition & AV_EF_CRCCHECK) {
ctx->crc_table = av_crc_get_table(AV_CRC_32_IEEE_LE);
ctx->crc = 0xFFFFFFFF;
- ctx->crc_org = ~get_bits_long(&gb, 32);
+ ctx->crc_org = ~bitstream_read(&bc, 32);
} else
- skip_bits_long(&gb, 32);
+ bitstream_skip(&bc, 32);
}
#define MISSING_ERR(cond, str, errval) \
{ \
if (cond) { \
- av_log_missing_feature(ctx->avctx, str, 0); \
+ avpriv_report_missing_feature(ctx->avctx, \
+ str); \
error = errval; \
} \
}
- MISSING_ERR(sconf->floating, "Floating point decoding", -1);
- MISSING_ERR(sconf->rlslms, "Adaptive RLS-LMS prediction", -1);
- MISSING_ERR(sconf->chan_sort, "Channel sorting", 0);
+ MISSING_ERR(sconf->floating, "Floating point decoding", AVERROR_PATCHWELCOME);
+ MISSING_ERR(sconf->rlslms, "Adaptive RLS-LMS prediction", AVERROR_PATCHWELCOME);
+ MISSING_ERR(sconf->chan_sort, "Channel sorting", 0);
return error;
}
/** Read and decode a Rice codeword.
*/
-static int32_t decode_rice(GetBitContext *gb, unsigned int k)
+static int32_t decode_rice(BitstreamContext *bc, unsigned int k)
{
- int max = get_bits_left(gb) - k;
- int q = get_unary(gb, 0, max);
- int r = k ? get_bits1(gb) : !(q & 1);
+ int max = bitstream_bits_left(bc) - k;
+ int q = get_unary(bc, 0, max);
+ int r = k ? bitstream_read_bit(bc) : !(q & 1);
if (k > 1) {
q <<= (k - 1);
- q += get_bits_long(gb, k - 1);
+ q += bitstream_read(bc, k - 1);
} else if (!k) {
q >>= 1;
}
uint32_t *bs_info)
{
ALSSpecificConfig *sconf = &ctx->sconf;
- GetBitContext *gb = &ctx->gb;
+ BitstreamContext *bc = &ctx->bc;
unsigned int *ptr_div_blocks = div_blocks;
unsigned int b;
if (sconf->block_switching) {
unsigned int bs_info_len = 1 << (sconf->block_switching + 2);
- *bs_info = get_bits_long(gb, bs_info_len);
+ *bs_info = bitstream_read(bc, bs_info_len);
*bs_info <<= (32 - bs_info_len);
}
{
ALSSpecificConfig *sconf = &ctx->sconf;
AVCodecContext *avctx = ctx->avctx;
- GetBitContext *gb = &ctx->gb;
+ BitstreamContext *bc = &ctx->bc;
*bd->raw_samples = 0;
- *bd->const_block = get_bits1(gb); // 1 = constant value, 0 = zero block (silence)
- bd->js_blocks = get_bits1(gb);
+ *bd->const_block = bitstream_read_bit(bc); // 1 = constant value, 0 = zero block (silence)
+ bd->js_blocks = bitstream_read_bit(bc);
// skip 5 reserved bits
- skip_bits(gb, 5);
+ bitstream_skip(bc, 5);
if (*bd->const_block) {
unsigned int const_val_bits = sconf->floating ? 24 : avctx->bits_per_raw_sample;
- *bd->raw_samples = get_sbits_long(gb, const_val_bits);
+ *bd->raw_samples = bitstream_read_signed(bc, const_val_bits);
}
// ensure constant block decoding by reusing this field
{
ALSSpecificConfig *sconf = &ctx->sconf;
AVCodecContext *avctx = ctx->avctx;
- GetBitContext *gb = &ctx->gb;
+ BitstreamContext *bc = &ctx->bc;
unsigned int k;
unsigned int s[8];
unsigned int sx[8];
*bd->const_block = 0;
*bd->opt_order = 1;
- bd->js_blocks = get_bits1(gb);
+ bd->js_blocks = bitstream_read_bit(bc);
opt_order = *bd->opt_order;
log2_sub_blocks = 0;
} else {
if (sconf->bgmc && sconf->sb_part)
- log2_sub_blocks = get_bits(gb, 2);
+ log2_sub_blocks = bitstream_read(bc, 2);
else
- log2_sub_blocks = 2 * get_bits1(gb);
+ log2_sub_blocks = 2 * bitstream_read_bit(bc);
}
sub_blocks = 1 << log2_sub_blocks;
if (bd->block_length & (sub_blocks - 1)) {
av_log(avctx, AV_LOG_WARNING,
"Block length is not evenly divisible by the number of subblocks.\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
sb_length = bd->block_length >> log2_sub_blocks;
if (sconf->bgmc) {
- s[0] = get_bits(gb, 8 + (sconf->resolution > 1));
+ s[0] = bitstream_read(bc, 8 + (sconf->resolution > 1));
for (k = 1; k < sub_blocks; k++)
- s[k] = s[k - 1] + decode_rice(gb, 2);
+ s[k] = s[k - 1] + decode_rice(bc, 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));
+ s[0] = bitstream_read(bc, 4 + (sconf->resolution > 1));
for (k = 1; k < sub_blocks; k++)
- s[k] = s[k - 1] + decode_rice(gb, 0);
+ s[k] = s[k - 1] + decode_rice(bc, 0);
}
for (k = 1; k < sub_blocks; k++)
if (s[k] > 32) {
return AVERROR_INVALIDDATA;
}
- if (get_bits1(gb))
- *bd->shift_lsbs = get_bits(gb, 4) + 1;
+ if (bitstream_read_bit(bc))
+ *bd->shift_lsbs = bitstream_read(bc, 4) + 1;
*bd->store_prev_samples = (bd->js_blocks && bd->raw_other) || *bd->shift_lsbs;
if (!sconf->rlslms) {
- if (sconf->adapt_order) {
+ if (sconf->adapt_order && sconf->max_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 = bitstream_read(bc, opt_order_length);
if (*bd->opt_order > sconf->max_order) {
*bd->opt_order = sconf->max_order;
av_log(avctx, AV_LOG_ERROR, "Predictor order too large!\n");
add_base = 0x7F;
// read coefficient 0
- quant_cof[0] = 32 * parcor_scaled_values[get_bits(gb, 7)];
+ quant_cof[0] = 32 * parcor_scaled_values[bitstream_read(bc, 7)];
// read coefficient 1
if (opt_order > 1)
- quant_cof[1] = -32 * parcor_scaled_values[get_bits(gb, 7)];
+ quant_cof[1] = -32 * parcor_scaled_values[bitstream_read(bc, 7)];
// read coefficients 2 to opt_order
for (k = 2; k < opt_order; k++)
- quant_cof[k] = get_bits(gb, 7);
+ quant_cof[k] = bitstream_read(bc, 7);
} else {
int k_max;
add_base = 1;
for (k = 0; k < k_max; k++) {
int rice_param = parcor_rice_table[sconf->coef_table][k][1];
int offset = parcor_rice_table[sconf->coef_table][k][0];
- quant_cof[k] = decode_rice(gb, rice_param) + offset;
+ quant_cof[k] = decode_rice(bc, rice_param) + offset;
if (quant_cof[k] < -64 || quant_cof[k] > 63) {
- av_log(avctx, AV_LOG_ERROR, "quant_cof %d is out of range\n", quant_cof[k]);
+ av_log(avctx, AV_LOG_ERROR,
+ "quant_cof %"PRIu32" is out of range\n",
+ quant_cof[k]);
return AVERROR_INVALIDDATA;
}
}
// read coefficients 20 to 126
k_max = FFMIN(opt_order, 127);
for (; k < k_max; k++)
- quant_cof[k] = decode_rice(gb, 2) + (k & 1);
+ quant_cof[k] = decode_rice(bc, 2) + (k & 1);
// read coefficients 127 to opt_order
for (; k < opt_order; k++)
- quant_cof[k] = decode_rice(gb, 1);
+ quant_cof[k] = decode_rice(bc, 1);
quant_cof[0] = 32 * parcor_scaled_values[quant_cof[0] + 64];
// read LTP gain and lag values
if (sconf->long_term_prediction) {
- *bd->use_ltp = get_bits1(gb);
+ *bd->use_ltp = bitstream_read_bit(bc);
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[0] = decode_rice(bc, 1) << 3;
+ bd->ltp_gain[1] = decode_rice(bc, 2) << 3;
- r = get_unary(gb, 0, 3);
- c = get_bits(gb, 2);
+ r = get_unary(bc, 0, 3);
+ c = bitstream_read(bc, 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;
+ bd->ltp_gain[3] = decode_rice(bc, 2) << 3;
+ bd->ltp_gain[4] = decode_rice(bc, 1) << 3;
- *bd->ltp_lag = get_bits(gb, ctx->ltp_lag_length);
+ *bd->ltp_lag = bitstream_read(bc, ctx->ltp_lag_length);
*bd->ltp_lag += FFMAX(4, opt_order + 1);
}
}
// read first value and residuals in case of a random access block
if (bd->ra_block) {
if (opt_order)
- bd->raw_samples[0] = decode_rice(gb, avctx->bits_per_raw_sample - 4);
+ bd->raw_samples[0] = decode_rice(bc, avctx->bits_per_raw_sample - 4);
if (opt_order > 1)
- bd->raw_samples[1] = decode_rice(gb, FFMIN(s[0] + 3, ctx->s_max));
+ bd->raw_samples[1] = decode_rice(bc, FFMIN(s[0] + 3, ctx->s_max));
if (opt_order > 2)
- bd->raw_samples[2] = decode_rice(gb, FFMIN(s[0] + 1, ctx->s_max));
+ bd->raw_samples[2] = decode_rice(bc, FFMIN(s[0] + 1, ctx->s_max));
start = FFMIN(opt_order, 3);
}
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;
// read most significant bits
unsigned int high;
unsigned int low;
unsigned int value;
- ff_bgmc_decode_init(gb, &high, &low, &value);
+ ff_bgmc_decode_init(bc, &high, &low, &value);
current_res = bd->raw_samples + start;
for (sb = 0; sb < sub_blocks; sb++) {
+ unsigned int sb_len = sb_length - (sb ? 0 : start);
+
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);
+ ff_bgmc_decode(bc, sb_len, current_res, delta[sb], sx[sb], &high,
+ &low, &value, ctx->bgmc_lut, ctx->bgmc_lut_status);
- current_res += sb_length;
+ current_res += sb_len;
}
- ff_bgmc_decode_end(gb);
+ ff_bgmc_decode_end(bc);
// read least significant bits and tails
- i = start;
current_res = bd->raw_samples + start;
- for (sb = 0; sb < sub_blocks; sb++, i = 0) {
+ for (sb = 0; sb < sub_blocks; sb++, start = 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++) {
+ for (; start < sb_length; start++) {
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);
+ res = decode_rice(bc, cur_s);
if (res >= 0) {
res += (max_msb ) << cur_k;
if (cur_k) {
res <<= cur_k;
- res |= get_bits_long(gb, cur_k);
+ res |= bitstream_read(bc, cur_k);
}
}
for (sb = 0; sb < sub_blocks; sb++, start = 0)
for (; start < sb_length; start++)
- *current_res++ = decode_rice(gb, s[sb]);
+ *current_res++ = decode_rice(bc, s[sb]);
}
if (!sconf->mc_coding || ctx->js_switch)
- align_get_bits(gb);
+ bitstream_align(bc);
return 0;
}
*/
static int read_block(ALSDecContext *ctx, ALSBlockData *bd)
{
- GetBitContext *gb = &ctx->gb;
+ int ret = 0;
+ BitstreamContext *bc = &ctx->bc;
*bd->shift_lsbs = 0;
// read block type flag and read the samples accordingly
- if (get_bits1(gb)) {
- if (read_var_block_data(ctx, bd))
- return -1;
+ if (bitstream_read_bit(bc)) {
+ ret = read_var_block_data(ctx, bd);
} else {
read_const_block_data(ctx, bd);
}
- return 0;
+ return ret;
}
static int decode_block(ALSDecContext *ctx, ALSBlockData *bd)
{
unsigned int smp;
+ int ret = 0;
// read block type flag and read the samples accordingly
if (*bd->const_block)
decode_const_block_data(ctx, bd);
- else if (decode_var_block_data(ctx, bd))
- return -1;
+ else
+ ret = decode_var_block_data(ctx, bd); // always return 0
+
+ if (ret < 0)
+ return ret;
// TODO: read RLSLMS extension data
{
int ret;
- ret = read_block(ctx, bd);
-
- if (ret)
+ if ((ret = read_block(ctx, bd)) < 0)
return ret;
- ret = decode_block(ctx, bd);
-
- return ret;
+ return decode_block(ctx, bd);
}
unsigned int c, const unsigned int *div_blocks,
unsigned int *js_blocks)
{
+ int ret;
unsigned int b;
ALSBlockData bd = { 0 };
for (b = 0; b < ctx->num_blocks; b++) {
bd.block_length = div_blocks[b];
- if (read_decode_block(ctx, &bd)) {
+ if ((ret = read_decode_block(ctx, &bd)) < 0) {
// damaged block, write zero for the rest of the frame
zero_remaining(b, ctx->num_blocks, div_blocks, bd.raw_samples);
- return -1;
+ return ret;
}
bd.raw_samples += div_blocks[b];
bd.ra_block = 0;
ALSSpecificConfig *sconf = &ctx->sconf;
unsigned int offset = 0;
unsigned int b;
+ int ret;
ALSBlockData bd[2] = { { 0 } };
bd[0].ra_block = ra_frame;
bd[0].raw_other = bd[1].raw_samples;
bd[1].raw_other = bd[0].raw_samples;
- if(read_decode_block(ctx, &bd[0]) || read_decode_block(ctx, &bd[1])) {
- // damaged block, write zero for the rest of the frame
- zero_remaining(b, ctx->num_blocks, div_blocks, bd[0].raw_samples);
- zero_remaining(b, ctx->num_blocks, div_blocks, bd[1].raw_samples);
- return -1;
- }
+ if ((ret = read_decode_block(ctx, &bd[0])) < 0 ||
+ (ret = read_decode_block(ctx, &bd[1])) < 0)
+ goto fail;
// reconstruct joint-stereo blocks
if (bd[0].js_blocks) {
sizeof(*ctx->raw_samples[c]) * sconf->max_order);
return 0;
+fail:
+ // damaged block, write zero for the rest of the frame
+ zero_remaining(b, ctx->num_blocks, div_blocks, bd[0].raw_samples);
+ zero_remaining(b, ctx->num_blocks, div_blocks, bd[1].raw_samples);
+ return ret;
}
+static inline int als_weighting(BitstreamContext *bc, int k, int off)
+{
+ int idx = av_clip(decode_rice(bc, k) + off,
+ 0, FF_ARRAY_ELEMS(mcc_weightings) - 1);
+ return mcc_weightings[idx];
+}
/** Read the channel data.
*/
static int read_channel_data(ALSDecContext *ctx, ALSChannelData *cd, int c)
{
- GetBitContext *gb = &ctx->gb;
+ BitstreamContext *bc = &ctx->bc;
ALSChannelData *current = cd;
unsigned int channels = ctx->avctx->channels;
int entries = 0;
- while (entries < channels && !(current->stop_flag = get_bits1(gb))) {
- current->master_channel = get_bits_long(gb, av_ceil_log2(channels));
+ while (entries < channels && !(current->stop_flag = bitstream_read_bit(bc))) {
+ current->master_channel = bitstream_read(bc, av_ceil_log2(channels));
if (current->master_channel >= channels) {
av_log(ctx->avctx, AV_LOG_ERROR, "Invalid master channel!\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
if (current->master_channel != c) {
- current->time_diff_flag = get_bits1(gb);
- current->weighting[0] = mcc_weightings[av_clip(decode_rice(gb, 1) + 16, 0, 32)];
- current->weighting[1] = mcc_weightings[av_clip(decode_rice(gb, 2) + 14, 0, 32)];
- current->weighting[2] = mcc_weightings[av_clip(decode_rice(gb, 1) + 16, 0, 32)];
+ current->time_diff_flag = bitstream_read_bit(bc);
+ current->weighting[0] = als_weighting(bc, 1, 16);
+ current->weighting[1] = als_weighting(bc, 2, 14);
+ current->weighting[2] = als_weighting(bc, 1, 16);
if (current->time_diff_flag) {
- current->weighting[3] = mcc_weightings[av_clip(decode_rice(gb, 1) + 16, 0, 32)];
- current->weighting[4] = mcc_weightings[av_clip(decode_rice(gb, 1) + 16, 0, 32)];
- current->weighting[5] = mcc_weightings[av_clip(decode_rice(gb, 1) + 16, 0, 32)];
+ current->weighting[3] = als_weighting(bc, 1, 16);
+ current->weighting[4] = als_weighting(bc, 1, 16);
+ current->weighting[5] = als_weighting(bc, 1, 16);
- current->time_diff_sign = get_bits1(gb);
- current->time_diff_index = get_bits(gb, ctx->ltp_lag_length - 3) + 3;
+ current->time_diff_sign = bitstream_read_bit(bc);
+ current->time_diff_index = bitstream_read(bc, ctx->ltp_lag_length - 3) + 3;
}
}
if (entries == channels) {
av_log(ctx->avctx, AV_LOG_ERROR, "Damaged channel data!\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
- align_get_bits(gb);
+ bitstream_align(bc);
return 0;
}
ALSChannelData *ch = cd[c];
unsigned int dep = 0;
unsigned int channels = ctx->avctx->channels;
+ unsigned int channel_size = ctx->sconf.frame_length + ctx->sconf.max_order;
if (reverted[c])
return 0;
if (dep == channels) {
av_log(ctx->avctx, AV_LOG_WARNING, "Invalid channel correlation!\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
bd->const_block = ctx->const_block + c;
dep = 0;
while (!ch[dep].stop_flag) {
- unsigned int smp;
- unsigned int begin = 1;
- unsigned int end = bd->block_length - 1;
+ ptrdiff_t smp;
+ ptrdiff_t begin = 1;
+ ptrdiff_t end = bd->block_length - 1;
int64_t y;
int32_t *master = ctx->raw_samples[ch[dep].master_channel] + offset;
end -= t;
}
+ if (FFMIN(begin - 1, begin - 1 + t) < ctx->raw_buffer - master ||
+ FFMAX(end + 1, end + 1 + t) > ctx->raw_buffer + channels * channel_size - master) {
+ av_log(ctx->avctx, AV_LOG_ERROR,
+ "sample pointer range [%p, %p] not contained in raw_buffer [%p, %p].\n",
+ master + FFMIN(begin - 1, begin - 1 + t), master + FFMAX(end + 1, end + 1 + t),
+ ctx->raw_buffer, ctx->raw_buffer + channels * channel_size);
+ return AVERROR_INVALIDDATA;
+ }
+
for (smp = begin; smp < end; smp++) {
y = (1 << 6) +
MUL64(ch[dep].weighting[0], master[smp - 1 ]) +
bd->raw_samples[smp] += y >> 7;
}
} else {
+
+ if (begin - 1 < ctx->raw_buffer - master ||
+ end + 1 > ctx->raw_buffer + channels * channel_size - master) {
+ av_log(ctx->avctx, AV_LOG_ERROR,
+ "sample pointer range [%p, %p] not contained in raw_buffer [%p, %p].\n",
+ master + begin - 1, master + end + 1,
+ ctx->raw_buffer, ctx->raw_buffer + channels * channel_size);
+ return AVERROR_INVALIDDATA;
+ }
+
for (smp = begin; smp < end; smp++) {
y = (1 << 6) +
MUL64(ch[dep].weighting[0], master[smp - 1]) +
{
ALSSpecificConfig *sconf = &ctx->sconf;
AVCodecContext *avctx = ctx->avctx;
- GetBitContext *gb = &ctx->gb;
+ BitstreamContext *bc = &ctx->bc;
unsigned int div_blocks[32]; ///< block sizes.
unsigned int c;
unsigned int js_blocks[2];
-
uint32_t bs_info = 0;
+ int ret;
// skip the size of the ra unit if present in the frame
if (sconf->ra_flag == RA_FLAG_FRAMES && ra_frame)
- skip_bits_long(gb, 32);
+ bitstream_skip(bc, 32);
if (sconf->mc_coding && sconf->joint_stereo) {
- ctx->js_switch = get_bits1(gb);
- align_get_bits(gb);
+ ctx->js_switch = bitstream_read_bit(bc);
+ bitstream_align(bc);
}
if (!sconf->mc_coding || ctx->js_switch) {
independent_bs = 1;
if (independent_bs) {
- if (decode_blocks_ind(ctx, ra_frame, c, div_blocks, js_blocks))
- return -1;
-
+ ret = decode_blocks_ind(ctx, ra_frame, c,
+ div_blocks, js_blocks);
+ if (ret < 0)
+ return ret;
independent_bs--;
} else {
- if (decode_blocks(ctx, ra_frame, c, div_blocks, js_blocks))
- return -1;
+ ret = decode_blocks(ctx, ra_frame, c, div_blocks, js_blocks);
+ if (ret < 0)
+ return ret;
c++;
}
}
} else { // multi-channel coding
ALSBlockData bd = { 0 };
- int b;
+ int b, ret;
int *reverted_channels = ctx->reverted_channels;
unsigned int offset = 0;
for (c = 0; c < avctx->channels; c++)
if (ctx->chan_data[c] < ctx->chan_data_buffer) {
av_log(ctx->avctx, AV_LOG_ERROR, "Invalid channel data!\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
memset(reverted_channels, 0, sizeof(*reverted_channels) * avctx->channels);
for (b = 0; b < ctx->num_blocks; b++) {
bd.block_length = div_blocks[b];
+ if (bd.block_length <= 0) {
+ av_log(ctx->avctx, AV_LOG_WARNING,
+ "Invalid block length %u in channel data!\n",
+ bd.block_length);
+ continue;
+ }
for (c = 0; c < avctx->channels; c++) {
bd.const_block = ctx->const_block + c;
bd.raw_samples = ctx->raw_samples[c] + offset;
bd.raw_other = NULL;
- read_block(ctx, &bd);
- if (read_channel_data(ctx, ctx->chan_data[c], c))
- return -1;
+ if ((ret = read_block(ctx, &bd)) < 0)
+ return ret;
+ if ((ret = read_channel_data(ctx, ctx->chan_data[c], c)) < 0)
+ return ret;
}
- for (c = 0; c < avctx->channels; c++)
- if (revert_channel_correlation(ctx, &bd, ctx->chan_data,
- reverted_channels, offset, c))
- return -1;
-
+ for (c = 0; c < avctx->channels; c++) {
+ ret = revert_channel_correlation(ctx, &bd, ctx->chan_data,
+ reverted_channels, offset, c);
+ if (ret < 0)
+ return ret;
+ }
for (c = 0; c < avctx->channels; c++) {
bd.const_block = ctx->const_block + c;
bd.shift_lsbs = ctx->shift_lsbs + c;
bd.lpc_cof = ctx->lpc_cof[c];
bd.quant_cof = ctx->quant_cof[c];
bd.raw_samples = ctx->raw_samples[c] + offset;
- decode_block(ctx, &bd);
+ if ((ret = decode_block(ctx, &bd)) < 0)
+ return ret;
}
memset(reverted_channels, 0, avctx->channels * sizeof(*reverted_channels));
AVPacket *avpkt)
{
ALSDecContext *ctx = avctx->priv_data;
+ AVFrame *frame = data;
ALSSpecificConfig *sconf = &ctx->sconf;
const uint8_t *buffer = avpkt->data;
int buffer_size = avpkt->size;
int invalid_frame, ret;
unsigned int c, sample, ra_frame, bytes_read, shift;
- init_get_bits(&ctx->gb, buffer, buffer_size * 8);
+ bitstream_init8(&ctx->bc, buffer, buffer_size);
// In the case that the distance between random access frames is set to zero
// (sconf->ra_distance == 0) no frame is treated as a random access frame.
ctx->cur_frame_length = sconf->frame_length;
// decode the frame data
- if ((invalid_frame = read_frame_data(ctx, ra_frame) < 0))
+ if ((invalid_frame = read_frame_data(ctx, ra_frame)) < 0)
av_log(ctx->avctx, AV_LOG_WARNING,
"Reading frame data failed. Skipping RA unit.\n");
ctx->frame_id++;
/* get output buffer */
- ctx->frame.nb_samples = ctx->cur_frame_length;
- if ((ret = avctx->get_buffer(avctx, &ctx->frame)) < 0) {
+ frame->nb_samples = ctx->cur_frame_length;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return ret;
}
// transform decoded frame into output format
#define INTERLEAVE_OUTPUT(bps) \
{ \
- int##bps##_t *dest = (int##bps##_t*)ctx->frame.data[0]; \
+ int##bps##_t *dest = (int##bps##_t*)frame->data[0]; \
shift = bps - ctx->avctx->bits_per_raw_sample; \
for (sample = 0; sample < ctx->cur_frame_length; sample++) \
for (c = 0; c < avctx->channels; c++) \
int swap = HAVE_BIGENDIAN != sconf->msb_first;
if (ctx->avctx->bits_per_raw_sample == 24) {
- int32_t *src = (int32_t *)ctx->frame.data[0];
+ int32_t *src = (int32_t *)frame->data[0];
for (sample = 0;
sample < ctx->cur_frame_length * avctx->channels;
if (swap) {
if (ctx->avctx->bits_per_raw_sample <= 16) {
- int16_t *src = (int16_t*) ctx->frame.data[0];
+ int16_t *src = (int16_t*) frame->data[0];
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,
- (uint32_t *)ctx->frame.data[0],
- ctx->cur_frame_length * avctx->channels);
+ ctx->bdsp.bswap_buf((uint32_t *) ctx->crc_buffer,
+ (uint32_t *) frame->data[0],
+ ctx->cur_frame_length * avctx->channels);
}
crc_source = ctx->crc_buffer;
} else {
- crc_source = ctx->frame.data[0];
+ crc_source = frame->data[0];
}
ctx->crc = av_crc(ctx->crc_table, ctx->crc, crc_source,
if (ctx->cur_frame_length != sconf->frame_length &&
ctx->crc_org != ctx->crc) {
av_log(avctx, AV_LOG_ERROR, "CRC error.\n");
+ if (avctx->err_recognition & AV_EF_EXPLODE)
+ return AVERROR_INVALIDDATA;
}
}
- *got_frame_ptr = 1;
- *(AVFrame *)data = ctx->frame;
-
+ *got_frame_ptr = 1;
bytes_read = invalid_frame ? buffer_size :
- (get_bits_count(&ctx->gb) + 7) >> 3;
+ (bitstream_tell(&ctx->bc) + 7) >> 3;
return bytes_read;
}
{
unsigned int c;
unsigned int channel_size;
- int num_buffers;
+ int num_buffers, ret;
ALSDecContext *ctx = avctx->priv_data;
ALSSpecificConfig *sconf = &ctx->sconf;
ctx->avctx = avctx;
if (!avctx->extradata) {
av_log(avctx, AV_LOG_ERROR, "Missing required ALS extradata.\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
- if (read_specific_config(ctx)) {
+ if ((ret = read_specific_config(ctx)) < 0) {
av_log(avctx, AV_LOG_ERROR, "Reading ALSSpecificConfig failed.\n");
- decode_end(avctx);
- return -1;
+ goto fail;
}
- if (check_specific_config(ctx)) {
- decode_end(avctx);
- return -1;
+ if ((ret = check_specific_config(ctx)) < 0) {
+ goto fail;
}
- if (sconf->bgmc)
- ff_bgmc_init(avctx, &ctx->bgmc_lut, &ctx->bgmc_lut_status);
-
+ if (sconf->bgmc) {
+ ret = ff_bgmc_init(avctx, &ctx->bgmc_lut, &ctx->bgmc_lut_status);
+ if (ret < 0)
+ goto fail;
+ }
if (sconf->floating) {
avctx->sample_fmt = AV_SAMPLE_FMT_FLT;
avctx->bits_per_raw_sample = 32;
avctx->sample_fmt = sconf->resolution > 1
? AV_SAMPLE_FMT_S32 : AV_SAMPLE_FMT_S16;
avctx->bits_per_raw_sample = (sconf->resolution + 1) * 8;
+ if (avctx->bits_per_raw_sample > 32) {
+ av_log(avctx, AV_LOG_ERROR, "Bits per raw sample %d larger than 32.\n",
+ avctx->bits_per_raw_sample);
+ ret = AVERROR_INVALIDDATA;
+ goto fail;
+ }
}
// set maximum Rice parameter for progressive decoding based on resolution
!ctx->quant_cof_buffer || !ctx->lpc_cof_buffer ||
!ctx->lpc_cof_reversed_buffer) {
av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n");
- return AVERROR(ENOMEM);
+ ret = AVERROR(ENOMEM);
+ goto fail;
}
// assign quantized parcor coefficient buffers
!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);
- return AVERROR(ENOMEM);
+ ret = AVERROR(ENOMEM);
+ goto fail;
}
for (c = 0; c < num_buffers; c++)
if (!ctx->chan_data_buffer || !ctx->chan_data || !ctx->reverted_channels) {
av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n");
- decode_end(avctx);
- return AVERROR(ENOMEM);
+ ret = AVERROR(ENOMEM);
+ goto fail;
}
for (c = 0; c < num_buffers; c++)
// allocate previous raw sample buffer
if (!ctx->prev_raw_samples || !ctx->raw_buffer|| !ctx->raw_samples) {
av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n");
- decode_end(avctx);
- return AVERROR(ENOMEM);
+ ret = AVERROR(ENOMEM);
+ goto fail;
}
// assign raw samples buffers
av_get_bytes_per_sample(avctx->sample_fmt));
if (!ctx->crc_buffer) {
av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n");
- decode_end(avctx);
- return AVERROR(ENOMEM);
+ ret = AVERROR(ENOMEM);
+ goto fail;
}
}
- ff_dsputil_init(&ctx->dsp, avctx);
-
- avcodec_get_frame_defaults(&ctx->frame);
- avctx->coded_frame = &ctx->frame;
+ ff_bswapdsp_init(&ctx->bdsp);
return 0;
+
+fail:
+ decode_end(avctx);
+ return ret;
}
AVCodec ff_als_decoder = {
.name = "als",
+ .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 Audio Lossless Coding (ALS)"),
.type = AVMEDIA_TYPE_AUDIO,
.id = AV_CODEC_ID_MP4ALS,
.priv_data_size = sizeof(ALSDecContext),
.close = decode_end,
.decode = decode_frame,
.flush = flush,
- .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("MPEG-4 Audio Lossless Coding (ALS)"),
+ .capabilities = AV_CODEC_CAP_SUBFRAMES | AV_CODEC_CAP_DR1,
};
projects / ffmpeg / blobdiff