Mercurial > libavcodec.hg
changeset 10907:2d82b73b12ef libavcodec
Split fill_caches() between filter and decoder.
| author | michael |
|---|---|
| date | Sun, 17 Jan 2010 21:43:08 +0000 |
| parents | 1b5fba731e24 |
| children | 28840dfd4b52 |
| files | h264.c h264.h h264_cabac.c h264_cavlc.c |
| diffstat | 4 files changed, 15 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/h264.c Sun Jan 17 20:35:55 2010 +0000 +++ b/h264.c Sun Jan 17 21:43:08 2010 +0000 @@ -1287,7 +1287,7 @@ if(h->deblocking_filter && 0) { backup_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, simple); - fill_caches(h, mb_type, 1); //FIXME don't fill stuff which isn't used by filter_mb + fill_filter_caches(h, mb_type); //FIXME don't fill stuff which isn't used by filter_mb h->chroma_qp[0] = get_chroma_qp(h, 0, s->current_picture.qscale_table[mb_xy]); h->chroma_qp[1] = get_chroma_qp(h, 1, s->current_picture.qscale_table[mb_xy]); if (!simple && FRAME_MBAFF) { @@ -2184,7 +2184,7 @@ uvlinesize = h->mb_uvlinesize = s->uvlinesize; } backup_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, !is_complex); - fill_caches(h, mb_type, 1); //FIXME don't fill stuff which isn't used by filter_mb + fill_filter_caches(h, mb_type); //FIXME don't fill stuff which isn't used by filter_mb h->chroma_qp[0] = get_chroma_qp(h, 0, s->current_picture.qscale_table[mb_xy]); h->chroma_qp[1] = get_chroma_qp(h, 1, s->current_picture.qscale_table[mb_xy]);
--- a/h264.h Sun Jan 17 20:35:55 2010 +0000 +++ b/h264.h Sun Jan 17 21:43:08 2010 +0000 @@ -719,7 +719,7 @@ static inline void pred_pskip_motion(H264Context * const h, int * const mx, int * const my); -static void fill_caches(H264Context *h, int mb_type, int for_deblock){ +static av_always_inline void fill_caches(H264Context *h, int mb_type, int for_deblock){ MpegEncContext * const s = &h->s; const int mb_xy= h->mb_xy; int topleft_xy, top_xy, topright_xy, left_xy[2]; @@ -1177,6 +1177,14 @@ h->neighbor_transform_size= !!IS_8x8DCT(top_type) + !!IS_8x8DCT(left_type[0]); } +static void fill_decode_caches(H264Context *h, int mb_type){ + fill_caches(h, mb_type, 0); +} + +static void fill_filter_caches(H264Context *h, int mb_type){ + fill_caches(h, mb_type, 1); +} + /** * gets the predicted intra4x4 prediction mode. */ @@ -1313,7 +1321,7 @@ // just for fill_caches. pred_direct_motion will set the real mb_type mb_type|= MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2|MB_TYPE_SKIP; - fill_caches(h, mb_type, 0); //FIXME check what is needed and what not ... + fill_decode_caches(h, mb_type); //FIXME check what is needed and what not ... ff_h264_pred_direct_motion(h, &mb_type); mb_type|= MB_TYPE_SKIP; } @@ -1322,7 +1330,7 @@ int mx, my; mb_type|= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P1L0|MB_TYPE_SKIP; - fill_caches(h, mb_type, 0); //FIXME check what is needed and what not ... + fill_decode_caches(h, mb_type); //FIXME check what is needed and what not ... pred_pskip_motion(h, &mx, &my); fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, 0, 1); fill_rectangle( h->mv_cache[0][scan8[0]], 4, 4, 8, pack16to32(mx,my), 4);