Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavc/flacdec: Propagate and return meaningful error codes

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/13/merge
James Almer 12 years ago committed by Michael Niedermayer
parent f248b8a902
commit 45013b365e
1 changed files with 29 additions and 28 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 57
      libavcodec/flacdec.c

57
libavcodec/flacdec.c
Unescape View File

@ -101,7 +101,7 @@ static av_cold int flac_decode_init(AVCodecContext *avctx)
return 0;
if (!avpriv_flac_is_extradata_valid(avctx, &format, &streaminfo))
return -1;
return AVERROR_INVALIDDATA;
/* initialize based on the demuxer-supplied streamdata header */
avpriv_flac_parse_streaminfo(avctx, (FLACStreaminfo *)s, streaminfo);
@ -212,7 +212,7 @@ static int decode_residuals(FLACContext *s, int32_t *decoded, int pred_order)
if (method_type > 1) {
av_log(s->avctx, AV_LOG_ERROR, "illegal residual coding method %d\n",
method_type);
return -1;
return AVERROR_INVALIDDATA;
}
rice_order = get_bits(&s->gb, 4);
@ -221,7 +221,7 @@ static int decode_residuals(FLACContext *s, int32_t *decoded, int pred_order)
if (pred_order > samples) {
av_log(s->avctx, AV_LOG_ERROR, "invalid predictor order: %i > %i\n",
pred_order, samples);
return -1;
return AVERROR_INVALIDDATA;
}
rice_bits = 4 + method_type;
@ -251,14 +251,15 @@ static int decode_subframe_fixed(FLACContext *s, int32_t *decoded,
{
const int blocksize = s->blocksize;
int av_uninit(a), av_uninit(b), av_uninit(c), av_uninit(d), i;
int ret;
/* warm up samples */
for (i = 0; i < pred_order; i++) {
decoded[i] = get_sbits_long(&s->gb, bps);
}
if (decode_residuals(s, decoded, pred_order) < 0)
return -1;
if ((ret = decode_residuals(s, decoded, pred_order)) < 0)
return ret;
if (pred_order > 0)
a = decoded[pred_order-1];
@ -290,7 +291,7 @@ static int decode_subframe_fixed(FLACContext *s, int32_t *decoded,
break;
default:
av_log(s->avctx, AV_LOG_ERROR, "illegal pred order %d\n", pred_order);
return -1;
return AVERROR_INVALIDDATA;
}
return 0;
@ -299,7 +300,7 @@ static int decode_subframe_fixed(FLACContext *s, int32_t *decoded,
static int decode_subframe_lpc(FLACContext *s, int32_t *decoded, int pred_order,
int bps)
{
int i;
int i, ret;
int coeff_prec, qlevel;
int coeffs[32];
@ -311,21 +312,21 @@ static int decode_subframe_lpc(FLACContext *s, int32_t *decoded, int pred_order,
coeff_prec = get_bits(&s->gb, 4) + 1;
if (coeff_prec == 16) {
av_log(s->avctx, AV_LOG_ERROR, "invalid coeff precision\n");
return -1;
return AVERROR_INVALIDDATA;
}
qlevel = get_sbits(&s->gb, 5);
if (qlevel < 0) {
av_log(s->avctx, AV_LOG_ERROR, "qlevel %d not supported, maybe buggy stream\n",
qlevel);
return -1;
return AVERROR_INVALIDDATA;
}
for (i = 0; i < pred_order; i++) {
coeffs[pred_order - i - 1] = get_sbits(&s->gb, coeff_prec);
}
if (decode_residuals(s, decoded, pred_order) < 0)
return -1;
if ((ret = decode_residuals(s, decoded, pred_order)) < 0)
return ret;
s->dsp.lpc(decoded, coeffs, pred_order, qlevel, s->blocksize);
@ -337,7 +338,7 @@ static inline int decode_subframe(FLACContext *s, int channel)
int32_t *decoded = s->decoded[channel];
int type, wasted = 0;
int bps = s->bps;
int i, tmp;
int i, tmp, ret;
if (channel == 0) {
if (s->ch_mode == FLAC_CHMODE_RIGHT_SIDE)
@ -349,7 +350,7 @@ static inline int decode_subframe(FLACContext *s, int channel)
if (get_bits1(&s->gb)) {
av_log(s->avctx, AV_LOG_ERROR, "invalid subframe padding\n");
return -1;
return AVERROR_INVALIDDATA;
}
type = get_bits(&s->gb, 6);
@ -382,14 +383,14 @@ static inline int decode_subframe(FLACContext *s, int channel)
for (i = 0; i < s->blocksize; i++)
decoded[i] = get_sbits_long(&s->gb, bps);
} else if ((type >= 8) && (type <= 12)) {
if (decode_subframe_fixed(s, decoded, type & ~0x8, bps) < 0)
return -1;
if ((ret = decode_subframe_fixed(s, decoded, type & ~0x8, bps)) < 0)
return ret;
} else if (type >= 32) {
if (decode_subframe_lpc(s, decoded, (type & ~0x20)+1, bps) < 0)
return -1;
if ((ret = decode_subframe_lpc(s, decoded, (type & ~0x20)+1, bps)) < 0)
return ret;
} else {
av_log(s->avctx, AV_LOG_ERROR, "invalid coding type\n");
return -1;
return AVERROR_INVALIDDATA;
}
if (wasted) {
@ -409,7 +410,7 @@ static int decode_frame(FLACContext *s)
if (ff_flac_decode_frame_header(s->avctx, gb, &fi, 0)) {
av_log(s->avctx, AV_LOG_ERROR, "invalid frame header\n");
return -1;
return AVERROR_INVALIDDATA;
}
if (s->channels && fi.channels != s->channels && s->got_streaminfo) {
@ -426,7 +427,7 @@ static int decode_frame(FLACContext *s)
if (!s->bps && !fi.bps) {
av_log(s->avctx, AV_LOG_ERROR, "bps not found in STREAMINFO or frame header\n");
return -1;
return AVERROR_INVALIDDATA;
}
if (!fi.bps) {
fi.bps = s->bps;
@ -446,14 +447,14 @@ static int decode_frame(FLACContext *s)
if (fi.blocksize > s->max_blocksize) {
av_log(s->avctx, AV_LOG_ERROR, "blocksize %d > %d\n", fi.blocksize,
s->max_blocksize);
return -1;
return AVERROR_INVALIDDATA;
}
s->blocksize = fi.blocksize;
if (!s->samplerate && !fi.samplerate) {
av_log(s->avctx, AV_LOG_ERROR, "sample rate not found in STREAMINFO"
" or frame header\n");
return -1;
return AVERROR_INVALIDDATA;
}
if (fi.samplerate == 0)
fi.samplerate = s->samplerate;
@ -472,8 +473,8 @@ static int decode_frame(FLACContext *s)
/* subframes */
for (i = 0; i < s->channels; i++) {
if (decode_subframe(s, i) < 0)
return -1;
if ((ret = decode_subframe(s, i)) < 0)
return ret;
}
align_get_bits(gb);
@ -522,16 +523,16 @@ static int flac_decode_frame(AVCodecContext *avctx, void *data,
if (AV_RB32(buf) == MKBETAG('f','L','a','C')) {
if (!s->got_streaminfo && parse_streaminfo(s, buf, buf_size)) {
av_log(s->avctx, AV_LOG_ERROR, "invalid header\n");
return -1;
return AVERROR_INVALIDDATA;
}
return get_metadata_size(buf, buf_size);
}
/* decode frame */
init_get_bits(&s->gb, buf, buf_size*8);
if (decode_frame(s) < 0) {
if ((ret = decode_frame(s)) < 0) {
av_log(s->avctx, AV_LOG_ERROR, "decode_frame() failed\n");
return -1;
return ret;
}
bytes_read = get_bits_count(&s->gb)/8;
@ -553,7 +554,7 @@ static int flac_decode_frame(AVCodecContext *avctx, void *data,
if (bytes_read > buf_size) {
av_log(s->avctx, AV_LOG_ERROR, "overread: %d\n", bytes_read - buf_size);
return -1;
return AVERROR_INVALIDDATA;
}
if (bytes_read < buf_size) {
av_log(s->avctx, AV_LOG_DEBUG, "underread: %d orig size: %d\n",

Write Preview
Loading…
Cancel
Save