Mercurial > libavcodec.hg
changeset 5240:1701ce572fed libavcodec
setting intra prediction modes to default values
in inter macroblocks is now in its own inline
function
| author | stefang |
|---|---|
| date | Sat, 07 Jul 2007 06:27:44 +0000 |
| parents | 5760ab0250aa |
| children | 74b6423a5a0d |
| files | cavs.c cavs.h |
| diffstat | 2 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/cavs.c Sat Jul 07 06:15:05 2007 +0000 +++ b/cavs.c Sat Jul 07 06:27:44 2007 +0000 @@ -352,9 +352,6 @@ h->s.dsp.avg_cavs_qpel_pixels_tab[1], h->s.dsp.avg_h264_chroma_pixels_tab[1],&h->mv[MV_FWD_X3]); } - /* set intra prediction modes to default values */ - h->pred_mode_Y[3] = h->pred_mode_Y[6] = INTRA_L_LP; - h->top_pred_Y[h->mbx*2+0] = h->top_pred_Y[h->mbx*2+1] = INTRA_L_LP; } /***************************************************************************** @@ -696,6 +693,7 @@ mv_pred(h, MV_FWD_X3, MV_FWD_X0, MV_PRED_MEDIAN, BLK_8X8, ref[3]); } inter_pred(h, mb_type); + set_intra_mode_default(h); store_mvs(h); if(mb_type != P_SKIP) decode_residual_inter(h); @@ -805,6 +803,7 @@ } } inter_pred(h, mb_type); + set_intra_mode_default(h); if(mb_type != B_SKIP) decode_residual_inter(h); filter_mb(h,mb_type);
--- a/cavs.h Sat Jul 07 06:15:05 2007 +0000 +++ b/cavs.h Sat Jul 07 06:27:44 2007 +0000 @@ -325,6 +325,11 @@ } } +static inline void set_intra_mode_default(AVSContext *h) { + h->pred_mode_Y[3] = h->pred_mode_Y[6] = INTRA_L_LP; + h->top_pred_Y[h->mbx*2+0] = h->top_pred_Y[h->mbx*2+1] = INTRA_L_LP; +} + static inline void set_mvs(vector_t *mv, enum block_t size) { switch(size) { case BLK_16X16: