virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit 'ca488ad480360dfafcb5766f7bfbb567a0638979'

Browse Source 
* commit 'ca488ad480360dfafcb5766f7bfbb567a0638979':
  alsdec: Clean up error paths

Conflicts:
	libavcodec/alsdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-07-24 10:28:38 +02:00
commit a550926705
1 changed files with 75 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
libavcodec/alsdec.c
View File

@ -293,12 +293,12 @@ static av_cold int read_specific_config(ALSDecContext *ctx)
avctx->extradata_size * 8, 1); avctx->extradata_size * 8, 1);
if (config_offset < 0) if (config_offset < 0)
return -1; return AVERROR_INVALIDDATA;
skip_bits_long(&gb, config_offset); skip_bits_long(&gb, config_offset);
if (get_bits_left(&gb) < (30 << 3)) if (get_bits_left(&gb) < (30 << 3))
return -1; return AVERROR_INVALIDDATA;
// read the fixed items // read the fixed items
als_id = get_bits_long(&gb, 32); als_id = get_bits_long(&gb, 32);
@ -333,7 +333,7 @@ static av_cold int read_specific_config(ALSDecContext *ctx)
// check for ALSSpecificConfig struct // check for ALSSpecificConfig struct
if (als_id != MKBETAG('A','L','S','\0')) if (als_id != MKBETAG('A','L','S','\0'))
return -1; return AVERROR_INVALIDDATA;
ctx->cur_frame_length = sconf->frame_length; ctx->cur_frame_length = sconf->frame_length;
@ -348,7 +348,7 @@ static av_cold int read_specific_config(ALSDecContext *ctx)
int chan_pos_bits = av_ceil_log2(avctx->channels); int chan_pos_bits = av_ceil_log2(avctx->channels);
int bits_needed = avctx->channels * chan_pos_bits + 7; int bits_needed = avctx->channels * chan_pos_bits + 7;
if (get_bits_left(&gb) < bits_needed) if (get_bits_left(&gb) < bits_needed)
return -1; return AVERROR_INVALIDDATA;
if (!(sconf->chan_pos = av_malloc(avctx->channels * sizeof(*sconf->chan_pos)))) if (!(sconf->chan_pos = av_malloc(avctx->channels * sizeof(*sconf->chan_pos))))
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
@ -374,7 +374,7 @@ static av_cold int read_specific_config(ALSDecContext *ctx)
// read fixed header and trailer sizes, // read fixed header and trailer sizes,
// if size = 0xFFFFFFFF then there is no data field! // if size = 0xFFFFFFFF then there is no data field!
if (get_bits_left(&gb) < 64) if (get_bits_left(&gb) < 64)
return -1; return AVERROR_INVALIDDATA;
header_size = get_bits_long(&gb, 32); header_size = get_bits_long(&gb, 32);
trailer_size = get_bits_long(&gb, 32); trailer_size = get_bits_long(&gb, 32);
@ -388,10 +388,10 @@ static av_cold int read_specific_config(ALSDecContext *ctx)
// skip the header and trailer data // skip the header and trailer data
if (get_bits_left(&gb) < ht_size) if (get_bits_left(&gb) < ht_size)
return -1; return AVERROR_INVALIDDATA;
if (ht_size > INT32_MAX) if (ht_size > INT32_MAX)
return -1; return AVERROR_PATCHWELCOME;
skip_bits_long(&gb, ht_size); skip_bits_long(&gb, ht_size);
@ -399,7 +399,7 @@ static av_cold int read_specific_config(ALSDecContext *ctx)
// initialize CRC calculation // initialize CRC calculation
if (sconf->crc_enabled) { if (sconf->crc_enabled) {
if (get_bits_left(&gb) < 32) if (get_bits_left(&gb) < 32)
return -1; return AVERROR_INVALIDDATA;
if (avctx->err_recognition & (AV_EF_CRCCHECK|AV_EF_CAREFUL)) { if (avctx->err_recognition & (AV_EF_CRCCHECK|AV_EF_CAREFUL)) {
ctx->crc_table = av_crc_get_table(AV_CRC_32_IEEE_LE); ctx->crc_table = av_crc_get_table(AV_CRC_32_IEEE_LE);
@ -644,7 +644,7 @@ static int read_var_block_data(ALSDecContext *ctx, ALSBlockData *bd)
if (bd->block_length & (sub_blocks - 1)) { if (bd->block_length & (sub_blocks - 1)) {
av_log(avctx, AV_LOG_WARNING, av_log(avctx, AV_LOG_WARNING,
"Block length is not evenly divisible by the number of subblocks.\n"); "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; sb_length = bd->block_length >> log2_sub_blocks;
@ -975,20 +975,19 @@ static int decode_var_block_data(ALSDecContext *ctx, ALSBlockData *bd)
*/ */
static int read_block(ALSDecContext *ctx, ALSBlockData *bd) static int read_block(ALSDecContext *ctx, ALSBlockData *bd)
{ {
GetBitContext *gb = &ctx->gb;
int ret; int ret;
GetBitContext *gb = &ctx->gb;
*bd->shift_lsbs = 0; *bd->shift_lsbs = 0;
// read block type flag and read the samples accordingly // read block type flag and read the samples accordingly
if (get_bits1(gb)) { if (get_bits1(gb)) {
if ((ret = read_var_block_data(ctx, bd)) < 0) ret = read_var_block_data(ctx, bd);
return ret;
} else { } else {
if ((ret = read_const_block_data(ctx, bd)) < 0) if ((ret = read_const_block_data(ctx, bd)) < 0)
return ret; return ret;
} }
return 0; return ret;
} }
@ -997,12 +996,16 @@ static int read_block(ALSDecContext *ctx, ALSBlockData *bd)
static int decode_block(ALSDecContext *ctx, ALSBlockData *bd) static int decode_block(ALSDecContext *ctx, ALSBlockData *bd)
{ {
unsigned int smp; unsigned int smp;
int ret = 0;
// read block type flag and read the samples accordingly // read block type flag and read the samples accordingly
if (*bd->const_block) if (*bd->const_block)
decode_const_block_data(ctx, bd); decode_const_block_data(ctx, bd);
else if (decode_var_block_data(ctx, bd)) else
return -1; ret = decode_var_block_data(ctx, bd); // always return 0
if (ret < 0)
return ret;
// TODO: read RLSLMS extension data // TODO: read RLSLMS extension data
@ -1020,14 +1023,10 @@ static int read_decode_block(ALSDecContext *ctx, ALSBlockData *bd)
{ {
int ret; int ret;
ret = read_block(ctx, bd); if ((ret = read_block(ctx, bd)) < 0)
if (ret)
return ret; return ret;
ret = decode_block(ctx, bd); return decode_block(ctx, bd);
return ret;
} }
@ -1053,6 +1052,7 @@ static int decode_blocks_ind(ALSDecContext *ctx, unsigned int ra_frame,
unsigned int c, const unsigned int *div_blocks, unsigned int c, const unsigned int *div_blocks,
unsigned int *js_blocks) unsigned int *js_blocks)
{ {
int ret;
unsigned int b; unsigned int b;
ALSBlockData bd = { 0 }; ALSBlockData bd = { 0 };
@ -1073,10 +1073,10 @@ static int decode_blocks_ind(ALSDecContext *ctx, unsigned int ra_frame,
for (b = 0; b < ctx->num_blocks; b++) { for (b = 0; b < ctx->num_blocks; b++) {
bd.block_length = div_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 // damaged block, write zero for the rest of the frame
zero_remaining(b, ctx->num_blocks, div_blocks, bd.raw_samples); zero_remaining(b, ctx->num_blocks, div_blocks, bd.raw_samples);
return -1; return ret;
} }
bd.raw_samples += div_blocks[b]; bd.raw_samples += div_blocks[b];
bd.ra_block = 0; bd.ra_block = 0;
@ -1095,6 +1095,7 @@ static int decode_blocks(ALSDecContext *ctx, unsigned int ra_frame,
ALSSpecificConfig *sconf = &ctx->sconf; ALSSpecificConfig *sconf = &ctx->sconf;
unsigned int offset = 0; unsigned int offset = 0;
unsigned int b; unsigned int b;
int ret;
ALSBlockData bd[2] = { { 0 } }; ALSBlockData bd[2] = { { 0 } };
bd[0].ra_block = ra_frame; bd[0].ra_block = ra_frame;
@ -1136,12 +1137,9 @@ static int decode_blocks(ALSDecContext *ctx, unsigned int ra_frame,
bd[0].raw_other = bd[1].raw_samples; bd[0].raw_other = bd[1].raw_samples;
bd[1].raw_other = bd[0].raw_samples; bd[1].raw_other = bd[0].raw_samples;
if(read_decode_block(ctx, &bd[0]) || read_decode_block(ctx, &bd[1])) { if ((ret = read_decode_block(ctx, &bd[0])) < 0 ||
// damaged block, write zero for the rest of the frame (ret = read_decode_block(ctx, &bd[1])) < 0)
zero_remaining(b, ctx->num_blocks, div_blocks, bd[0].raw_samples); goto fail;
zero_remaining(b, ctx->num_blocks, div_blocks, bd[1].raw_samples);
return -1;
}
// reconstruct joint-stereo blocks // reconstruct joint-stereo blocks
if (bd[0].js_blocks) { if (bd[0].js_blocks) {
@ -1167,6 +1165,11 @@ static int decode_blocks(ALSDecContext *ctx, unsigned int ra_frame,
sizeof(*ctx->raw_samples[c]) * sconf->max_order); sizeof(*ctx->raw_samples[c]) * sconf->max_order);
return 0; 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(GetBitContext *gb, int k, int off) static inline int als_weighting(GetBitContext *gb, int k, int off)
@ -1190,7 +1193,7 @@ static int read_channel_data(ALSDecContext *ctx, ALSChannelData *cd, int c)
if (current->master_channel >= channels) { if (current->master_channel >= channels) {
av_log(ctx->avctx, AV_LOG_ERROR, "Invalid master channel.\n"); av_log(ctx->avctx, AV_LOG_ERROR, "Invalid master channel.\n");
return -1; return AVERROR_INVALIDDATA;
} }
if (current->master_channel != c) { if (current->master_channel != c) {
@ -1215,7 +1218,7 @@ static int read_channel_data(ALSDecContext *ctx, ALSChannelData *cd, int c)
if (entries == channels) { if (entries == channels) {
av_log(ctx->avctx, AV_LOG_ERROR, "Damaged channel data.\n"); av_log(ctx->avctx, AV_LOG_ERROR, "Damaged channel data.\n");
return -1; return AVERROR_INVALIDDATA;
} }
align_get_bits(gb); align_get_bits(gb);
@ -1247,7 +1250,7 @@ static int revert_channel_correlation(ALSDecContext *ctx, ALSBlockData *bd,
if (dep == channels) { if (dep == channels) {
av_log(ctx->avctx, AV_LOG_WARNING, "Invalid channel correlation.\n"); av_log(ctx->avctx, AV_LOG_WARNING, "Invalid channel correlation.\n");
return -1; return AVERROR_INVALIDDATA;
} }
bd->const_block = ctx->const_block + c; bd->const_block = ctx->const_block + c;
@ -1318,8 +1321,8 @@ static int read_frame_data(ALSDecContext *ctx, unsigned int ra_frame)
unsigned int div_blocks[32]; ///< block sizes. unsigned int div_blocks[32]; ///< block sizes.
unsigned int c; unsigned int c;
unsigned int js_blocks[2]; unsigned int js_blocks[2];
uint32_t bs_info = 0; uint32_t bs_info = 0;
int ret;
// skip the size of the ra unit if present in the frame // skip the size of the ra unit if present in the frame
if (sconf->ra_flag == RA_FLAG_FRAMES && ra_frame) if (sconf->ra_flag == RA_FLAG_FRAMES && ra_frame)
@ -1350,13 +1353,15 @@ static int read_frame_data(ALSDecContext *ctx, unsigned int ra_frame)
independent_bs = 1; independent_bs = 1;
if (independent_bs) { if (independent_bs) {
if (decode_blocks_ind(ctx, ra_frame, c, div_blocks, js_blocks)) ret = decode_blocks_ind(ctx, ra_frame, c,
return -1; div_blocks, js_blocks);
if (ret < 0)
return ret;
independent_bs--; independent_bs--;
} else { } else {
if (decode_blocks(ctx, ra_frame, c, div_blocks, js_blocks)) ret = decode_blocks(ctx, ra_frame, c, div_blocks, js_blocks);
return -1; if (ret < 0)
return ret;
c++; c++;
} }
@ -1375,7 +1380,7 @@ static int read_frame_data(ALSDecContext *ctx, unsigned int ra_frame)
for (c = 0; c < avctx->channels; c++) for (c = 0; c < avctx->channels; c++)
if (ctx->chan_data[c] < ctx->chan_data_buffer) { if (ctx->chan_data[c] < ctx->chan_data_buffer) {
av_log(ctx->avctx, AV_LOG_ERROR, "Invalid channel data.\n"); 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); memset(reverted_channels, 0, sizeof(*reverted_channels) * avctx->channels);
@ -1407,11 +1412,12 @@ static int read_frame_data(ALSDecContext *ctx, unsigned int ra_frame)
return ret; return ret;
} }
for (c = 0; c < avctx->channels; c++) for (c = 0; c < avctx->channels; c++) {
if (revert_channel_correlation(ctx, &bd, ctx->chan_data, ret = revert_channel_correlation(ctx, &bd, ctx->chan_data,
reverted_channels, offset, c)) reverted_channels, offset, c);
return -1; if (ret < 0)
return ret;
}
for (c = 0; c < avctx->channels; c++) { for (c = 0; c < avctx->channels; c++) {
bd.const_block = ctx->const_block + c; bd.const_block = ctx->const_block + c;
bd.shift_lsbs = ctx->shift_lsbs + c; bd.shift_lsbs = ctx->shift_lsbs + c;
@ -1613,30 +1619,30 @@ static av_cold int decode_init(AVCodecContext *avctx)
{ {
unsigned int c; unsigned int c;
unsigned int channel_size; unsigned int channel_size;
int num_buffers; int num_buffers, ret;
ALSDecContext *ctx = avctx->priv_data; ALSDecContext *ctx = avctx->priv_data;
ALSSpecificConfig *sconf = &ctx->sconf; ALSSpecificConfig *sconf = &ctx->sconf;
ctx->avctx = avctx; ctx->avctx = avctx;
if (!avctx->extradata) { if (!avctx->extradata) {
av_log(avctx, AV_LOG_ERROR, "Missing required ALS extradata.\n"); 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"); av_log(avctx, AV_LOG_ERROR, "Reading ALSSpecificConfig failed.\n");
decode_end(avctx); goto fail;
return -1;
} }
if (check_specific_config(ctx)) { if ((ret = check_specific_config(ctx)) < 0) {
decode_end(avctx); goto fail;
return -1;
} }
if (sconf->bgmc) if (sconf->bgmc) {
ff_bgmc_init(avctx, &ctx->bgmc_lut, &ctx->bgmc_lut_status); ret = ff_bgmc_init(avctx, &ctx->bgmc_lut, &ctx->bgmc_lut_status);
if (ret < 0)
goto fail;
}
if (sconf->floating) { if (sconf->floating) {
avctx->sample_fmt = AV_SAMPLE_FMT_FLT; avctx->sample_fmt = AV_SAMPLE_FMT_FLT;
avctx->bits_per_raw_sample = 32; avctx->bits_per_raw_sample = 32;
@ -1671,7 +1677,8 @@ static av_cold int decode_init(AVCodecContext *avctx)
!ctx->quant_cof_buffer || !ctx->lpc_cof_buffer || !ctx->quant_cof_buffer || !ctx->lpc_cof_buffer ||
!ctx->lpc_cof_reversed_buffer) { !ctx->lpc_cof_reversed_buffer) {
av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n"); av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n");
return AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto fail;
} }
// assign quantized parcor coefficient buffers // assign quantized parcor coefficient buffers
@ -1696,8 +1703,8 @@ static av_cold int decode_init(AVCodecContext *avctx)
!ctx->use_ltp || !ctx->ltp_lag || !ctx->use_ltp || !ctx->ltp_lag ||
!ctx->ltp_gain || !ctx->ltp_gain_buffer) { !ctx->ltp_gain || !ctx->ltp_gain_buffer) {
av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n"); av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n");
decode_end(avctx); ret = AVERROR(ENOMEM);
return AVERROR(ENOMEM); goto fail;
} }
for (c = 0; c < num_buffers; c++) for (c = 0; c < num_buffers; c++)
@ -1714,8 +1721,8 @@ static av_cold int decode_init(AVCodecContext *avctx)
if (!ctx->chan_data_buffer || !ctx->chan_data || !ctx->reverted_channels) { if (!ctx->chan_data_buffer || !ctx->chan_data || !ctx->reverted_channels) {
av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n"); av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n");
decode_end(avctx); ret = AVERROR(ENOMEM);
return AVERROR(ENOMEM); goto fail;
} }
for (c = 0; c < num_buffers; c++) for (c = 0; c < num_buffers; c++)
@ -1735,8 +1742,8 @@ static av_cold int decode_init(AVCodecContext *avctx)
// allocate previous raw sample buffer // allocate previous raw sample buffer
if (!ctx->prev_raw_samples || !ctx->raw_buffer|| !ctx->raw_samples) { if (!ctx->prev_raw_samples || !ctx->raw_buffer|| !ctx->raw_samples) {
av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n"); av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n");
decode_end(avctx); ret = AVERROR(ENOMEM);
return AVERROR(ENOMEM); goto fail;
} }
// assign raw samples buffers // assign raw samples buffers
@ -1753,14 +1760,18 @@ static av_cold int decode_init(AVCodecContext *avctx)
av_get_bytes_per_sample(avctx->sample_fmt)); av_get_bytes_per_sample(avctx->sample_fmt));
if (!ctx->crc_buffer) { if (!ctx->crc_buffer) {
av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n"); av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n");
decode_end(avctx); ret = AVERROR(ENOMEM);
return AVERROR(ENOMEM); goto fail;
} }
} }
ff_dsputil_init(&ctx->dsp, avctx); ff_dsputil_init(&ctx->dsp, avctx);
return 0; return 0;
fail:
decode_end(avctx);
return ret;
} }