Mercurial > libavcodec.hg
changeset 191:883f184537e6 libavcodec
AC table reset (memset) optimization - patch by Michael Niedermayer <michaelni@gmx.at>
| author | uid46427 |
|---|---|
| date | Thu, 10 Jan 2002 00:53:21 +0000 |
| parents | 9e0e56869d05 |
| children | 1e5f64be86fc |
| files | mpegvideo.c mpegvideo.h |
| diffstat | 2 files changed, 19 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mpegvideo.c Thu Jan 10 00:51:45 2002 +0000 +++ b/mpegvideo.c Thu Jan 10 00:53:21 2002 +0000 @@ -180,6 +180,12 @@ s->coded_block = av_mallocz(y_size); if (!s->coded_block) goto fail; + + /* which mb is a intra block */ + s->mbintra_table = av_mallocz(y_size/4); + if (!s->mbintra_table) + goto fail; + memset(s->mbintra_table, 1, y_size/4); } /* default structure is frame */ s->picture_structure = PICT_FRAME; @@ -202,6 +208,8 @@ free(s->ac_val[0]); if (s->coded_block) free(s->coded_block); + if (s->mbintra_table) + free(s->mbintra_table); if (s->mbskip_table) free(s->mbskip_table); for(i=0;i<3;i++) { @@ -226,6 +234,7 @@ free(s->dc_val[0]); free(s->ac_val[0]); free(s->coded_block); + free(s->mbintra_table); } if (s->mbskip_table) free(s->mbskip_table); @@ -697,11 +706,16 @@ /* update DC predictors for P macroblocks */ if (!s->mb_intra) { if (s->h263_pred) { + if(s->mbintra_table[mb_x + mb_y*s->mb_width]) + { int wrap, x, y, v; + s->mbintra_table[mb_x + mb_y*s->mb_width]=0; + wrap = 2 * s->mb_width + 2; v = 1024; x = 2 * mb_x + 1; y = 2 * mb_y + 1; + s->dc_val[0][(x) + (y) * wrap] = v; s->dc_val[0][(x + 1) + (y) * wrap] = v; s->dc_val[0][(x) + (y + 1) * wrap] = v; @@ -726,13 +740,16 @@ /* ac pred */ memset(s->ac_val[1][(x) + (y) * wrap], 0, 16 * sizeof(INT16)); memset(s->ac_val[2][(x) + (y) * wrap], 0, 16 * sizeof(INT16)); + } } else { s->last_dc[0] = 128 << s->intra_dc_precision; s->last_dc[1] = 128 << s->intra_dc_precision; s->last_dc[2] = 128 << s->intra_dc_precision; } } - + else + s->mbintra_table[mb_x + mb_y*s->mb_width]=1; + /* update motion predictor */ if (s->out_format == FMT_H263) { int x, y, wrap;
--- a/mpegvideo.h Thu Jan 10 00:51:45 2002 +0000 +++ b/mpegvideo.h Thu Jan 10 00:53:21 2002 +0000 @@ -75,6 +75,7 @@ int mb_skiped; /* MUST BE SET only during DECODING */ UINT8 *mbskip_table; /* used to avoid copy if macroblock skipped (for black regions for example) */ + UINT8 *mbintra_table; /* used to kill a few memsets */ int qscale; int pict_type;