RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '1b20d0f581f01f2df601c9e68d0d321672d97af7' 

* commit '1b20d0f581f01f2df601c9e68d0d321672d97af7':
  cavs: Return meaningful error values

Conflicts:
	libavcodec/cavsdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-10-14 02:10:43 +02:00
parent fb8a10db5d 1b20d0f581
commit d794b7db14
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavcodec/cavsdec.c
View File

@ -535,7 +535,7 @@ static inline int dequant(AVSContext *h, int16_t *level_buf, uint8_t *run_buf,
av_log(h->avctx, AV_LOG_ERROR, av_log(h->avctx, AV_LOG_ERROR,
"position out of block bounds at pic %d MB(%d,%d)\n", "position out of block bounds at pic %d MB(%d,%d)\n",
h->cur.poc, h->mbx, h->mby); h->cur.poc, h->mbx, h->mby);
return -1; return AVERROR_INVALIDDATA;
} }
dst[scantab[pos]] = (level_buf[coeff_num] * mul + round) >> shift; dst[scantab[pos]] = (level_buf[coeff_num] * mul + round) >> shift;
} }
@ -555,7 +555,7 @@ static int decode_residual_block(AVSContext *h, GetBitContext *gb,
const struct dec_2dvlc *r, int esc_golomb_order, const struct dec_2dvlc *r, int esc_golomb_order,
int qp, uint8_t *dst, int stride) int qp, uint8_t *dst, int stride)
{ {
int i, esc_code, level, mask; int i, esc_code, level, mask, ret;
unsigned int level_code, run; unsigned int level_code, run;
int16_t level_buf[65]; int16_t level_buf[65];
uint8_t run_buf[65]; uint8_t run_buf[65];
@ -583,9 +583,9 @@ static int decode_residual_block(AVSContext *h, GetBitContext *gb,
level_buf[i] = level; level_buf[i] = level;
run_buf[i] = run; run_buf[i] = run;
} }
if (dequant(h, level_buf, run_buf, block, dequant_mul[qp], if ((ret = dequant(h, level_buf, run_buf, block, dequant_mul[qp],
dequant_shift[qp], i)) dequant_shift[qp], i)) < 0)
return -1; return ret;
h->cdsp.cavs_idct8_add(dst, block, stride); h->cdsp.cavs_idct8_add(dst, block, stride);
h->dsp.clear_block(block); h->dsp.clear_block(block);
return 0; return 0;
@ -610,7 +610,7 @@ static inline int decode_residual_inter(AVSContext *h)
int cbp = get_ue_golomb(&h->gb); int cbp = get_ue_golomb(&h->gb);
if (cbp > 63U) { if (cbp > 63U) {
av_log(h->avctx, AV_LOG_ERROR, "illegal inter cbp\n"); av_log(h->avctx, AV_LOG_ERROR, "illegal inter cbp\n");
return -1; return AVERROR_INVALIDDATA;
} }
h->cbp = cbp_tab[cbp][1]; h->cbp = cbp_tab[cbp][1];
@ -672,7 +672,7 @@ static int decode_mb_i(AVSContext *h, int cbp_code)
pred_mode_uv = get_ue_golomb(gb); pred_mode_uv = get_ue_golomb(gb);
if (pred_mode_uv > 6) { if (pred_mode_uv > 6) {
av_log(h->avctx, AV_LOG_ERROR, "illegal intra chroma pred mode\n"); av_log(h->avctx, AV_LOG_ERROR, "illegal intra chroma pred mode\n");
return -1; return AVERROR_INVALIDDATA;
} }
ff_cavs_modify_mb_i(h, &pred_mode_uv); ff_cavs_modify_mb_i(h, &pred_mode_uv);
@ -681,7 +681,7 @@ static int decode_mb_i(AVSContext *h, int cbp_code)
cbp_code = get_ue_golomb(gb); cbp_code = get_ue_golomb(gb);
if (cbp_code > 63U) { if (cbp_code > 63U) {
av_log(h->avctx, AV_LOG_ERROR, "illegal intra cbp\n"); av_log(h->avctx, AV_LOG_ERROR, "illegal intra cbp\n");
return -1; return AVERROR_INVALIDDATA;
} }
h->cbp = cbp_tab[cbp_code][0]; h->cbp = cbp_tab[cbp_code][0];
if (h->cbp && !h->qp_fixed) if (h->cbp && !h->qp_fixed)
@ -960,12 +960,12 @@ static int decode_pic(AVSContext *h)
h->cur.f->pict_type = get_bits(&h->gb, 2) + AV_PICTURE_TYPE_I; h->cur.f->pict_type = get_bits(&h->gb, 2) + AV_PICTURE_TYPE_I;
if (h->cur.f->pict_type > AV_PICTURE_TYPE_B) { if (h->cur.f->pict_type > AV_PICTURE_TYPE_B) {
av_log(h->avctx, AV_LOG_ERROR, "illegal picture type\n"); av_log(h->avctx, AV_LOG_ERROR, "illegal picture type\n");
return -1; return AVERROR_INVALIDDATA;
} }
/* make sure we have the reference frames we need */ /* make sure we have the reference frames we need */
if (!h->DPB[0].f->data[0] || if (!h->DPB[0].f->data[0] ||
(!h->DPB[1].f->data[0] && h->cur.f->pict_type == AV_PICTURE_TYPE_B)) (!h->DPB[1].f->data[0] && h->cur.f->pict_type == AV_PICTURE_TYPE_B))
return -1; return AVERROR_INVALIDDATA;
} else { } else {
h->cur.f->pict_type = AV_PICTURE_TYPE_I; h->cur.f->pict_type = AV_PICTURE_TYPE_I;
if (get_bits1(&h->gb)) if (get_bits1(&h->gb))