Mercurial > libavcodec.hg
changeset 7:1d3ac9654178 libavcodec
added skip macroblock optimization (big perf win on black regions for example)
| author | glantau |
|---|---|
| date | Tue, 24 Jul 2001 20:43:41 +0000 |
| parents | ec4642daa6fe |
| children | 1b4461b5a7fb |
| files | h263.c mpeg12.c mpegvideo.c mpegvideo.h msmpeg4.c |
| diffstat | 5 files changed, 38 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/h263.c Tue Jul 24 20:42:03 2001 +0000 +++ b/h263.c Tue Jul 24 20:43:41 2001 +0000 @@ -738,6 +738,7 @@ s->mv_type = MV_TYPE_16X16; s->mv[0][0][0] = 0; s->mv[0][0][1] = 0; + s->mb_skiped = 1; return 0; } cbpc = get_vlc(&s->gb, &inter_MCBPC_vlc);
--- a/mpeg12.c Tue Jul 24 20:42:03 2001 +0000 +++ b/mpeg12.c Tue Jul 24 20:43:41 2001 +0000 @@ -542,6 +542,7 @@ s->mv[1][0][0] = s->last_mv[1][0][0]; s->mv[1][0][1] = s->last_mv[1][0][1]; } + s->mb_skiped = 1; return 0; }
--- a/mpegvideo.c Tue Jul 24 20:42:03 2001 +0000 +++ b/mpegvideo.c Tue Jul 24 20:43:41 2001 +0000 @@ -171,6 +171,13 @@ s->non_intra_matrix[i] = default_non_intra_matrix[i]; s->chroma_non_intra_matrix[i] = default_non_intra_matrix[i]; } + /* init macroblock skip table */ + if (!s->encoding) { + s->mbskip_table = av_mallocz(s->mb_width * s->mb_height); + if (!s->mbskip_table) + goto fail; + } + s->context_initialized = 1; return 0; fail: @@ -182,6 +189,8 @@ free(s->ac_val[0]); if (s->coded_block) free(s->coded_block); + if (s->mbskip_table) + free(s->mbskip_table); for(i=0;i<3;i++) { if (s->last_picture_base[i]) free(s->last_picture_base[i]); @@ -205,6 +214,8 @@ free(s->ac_val[0]); free(s->coded_block); } + if (s->mbskip_table) + free(s->mbskip_table); for(i=0;i<3;i++) { free(s->last_picture_base[i]); free(s->next_picture_base[i]); @@ -276,6 +287,8 @@ if (s->out_format == FMT_H263) h263_encode_init_vlc(s); + s->encoding = 1; + /* init */ if (MPV_common_init(s) < 0) return -1; @@ -712,6 +725,21 @@ if (!s->intra_only) { UINT8 *dest_y, *dest_cb, *dest_cr; + UINT8 *mbskip_ptr; + + /* avoid copy if macroblock skipped in last frame too */ + if (!s->encoding) { + mbskip_ptr = &s->mbskip_table[s->mb_y * s->mb_width + s->mb_x]; + if (s->mb_skiped) { + s->mb_skiped = 0; + /* if previous was skipped too, then nothing to do ! */ + if (*mbskip_ptr != 0) + goto the_end; + *mbskip_ptr = 1; /* indicate that this time we skiped it */ + } else { + *mbskip_ptr = 0; /* not skipped */ + } + } dest_y = s->current_picture[0] + (mb_y * 16 * s->linesize) + mb_x * 16; dest_cb = s->current_picture[1] + (mb_y * 8 * (s->linesize >> 1)) + mb_x * 8; @@ -762,6 +790,8 @@ put_dct(s, block[5], 5, dest_cr, dct_linesize >> 1); } } + the_end: + emms_c(); } static void encode_picture(MpegEncContext *s, int picture_number) @@ -885,6 +915,7 @@ ptr = s->last_picture[2] + offset; sub_pixels_2(block[5], ptr, s->linesize >> 1, dxy); } + emms_c(); /* DCT & quantize */ if (s->h263_msmpeg4) {
--- a/mpegvideo.h Tue Jul 24 20:42:03 2001 +0000 +++ b/mpegvideo.h Tue Jul 24 20:43:41 2001 +0000 @@ -44,6 +44,7 @@ int h263_msmpeg4; /* generate MSMPEG4 compatible stream */ int h263_intel; /* use I263 intel h263 header */ int fixed_qscale; /* fixed qscale if non zero */ + int encoding; /* true if we are encoding (vs decoding) */ /* the following fields are managed internally by the encoder */ /* bit output */ @@ -70,6 +71,9 @@ UINT8 *coded_block; /* used for coded block pattern prediction */ INT16 (*ac_val[3])[16]; /* used for for mpeg4 AC prediction */ int ac_pred; + int mb_skiped; /* MUST BE SET only during DECODING */ + UINT8 *mbskip_table; /* used to avoid copy if macroblock + skipped (for black regions for example) */ int qscale; int pict_type;