har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

eamad: pass & check errors

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-12-19 16:30:30 +01:00
parent 03a9c9932d
commit 1d0ae92a25
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/eamad.c
View File

@ -119,7 +119,7 @@ static inline void idct_put(MadContext *t, DCTELEM *block, int mb_x, int mb_y, i
} }
} }
static inline void decode_block_intra(MadContext * t, DCTELEM * block) static inline int decode_block_intra(MadContext * t, DCTELEM * block)
{ {
MpegEncContext *s = &t->s; MpegEncContext *s = &t->s;
int level, i, j, run; int level, i, j, run;
@ -170,13 +170,14 @@ static inline void decode_block_intra(MadContext * t, DCTELEM * block)
} }
if (i > 63) { if (i > 63) {
av_log(s->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n", s->mb_x, s->mb_y); av_log(s->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n", s->mb_x, s->mb_y);
return; return -1;
} }
block[j] = level; block[j] = level;
} }
CLOSE_READER(re, &s->gb); CLOSE_READER(re, &s->gb);
} }
return 0;
} }
static int decode_motion(GetBitContext *gb) static int decode_motion(GetBitContext *gb)
@ -190,7 +191,7 @@ static int decode_motion(GetBitContext *gb)
return value; return value;
} }
static void decode_mb(MadContext *t, int inter) static int decode_mb(MadContext *t, int inter)
{ {
MpegEncContext *s = &t->s; MpegEncContext *s = &t->s;
int mv_map = 0; int mv_map = 0;
@ -215,10 +216,12 @@ static void decode_mb(MadContext *t, int inter)
comp_block(t, s->mb_x, s->mb_y, j, mv_x, mv_y, add); comp_block(t, s->mb_x, s->mb_y, j, mv_x, mv_y, add);
} else { } else {
s->dsp.clear_block(t->block); s->dsp.clear_block(t->block);
decode_block_intra(t, t->block); if(decode_block_intra(t, t->block) < 0)
return -1;
idct_put(t, t->block, s->mb_x, s->mb_y, j); idct_put(t, t->block, s->mb_x, s->mb_y, j);
} }
} }
return 0;
} }
static void calc_intra_matrix(MadContext *t, int qscale) static void calc_intra_matrix(MadContext *t, int qscale)
@ -296,7 +299,8 @@ static int decode_frame(AVCodecContext *avctx,
for (s->mb_y=0; s->mb_y < (avctx->height+15)/16; s->mb_y++) for (s->mb_y=0; s->mb_y < (avctx->height+15)/16; s->mb_y++)
for (s->mb_x=0; s->mb_x < (avctx->width +15)/16; s->mb_x++) for (s->mb_x=0; s->mb_x < (avctx->width +15)/16; s->mb_x++)
decode_mb(t, inter); if(decode_mb(t, inter) < 0)
return -1;
*data_size = sizeof(AVFrame); *data_size = sizeof(AVFrame);
*(AVFrame*)data = t->frame; *(AVFrame*)data = t->frame;