Mercurial > libavcodec.hg
diff motion_est_template.c @ 2015:3ab8f3e2ae6a libavcodec
moving motion estimation specific variables from MpegEncContext -> MotionEstContext
author | michael |
---|---|
date | Tue, 11 May 2004 01:38:46 +0000 |
parents | 15c885db82a8 |
children | c200977cdf78 |
line wrap: on
line diff
--- a/motion_est_template.c Tue May 11 00:58:08 2004 +0000 +++ b/motion_est_template.c Tue May 11 01:38:46 2004 +0000 @@ -79,7 +79,7 @@ return dmin; } - if(s->avctx->me_cmp != s->avctx->me_sub_cmp){ + if(c->avctx->me_cmp != c->avctx->me_sub_cmp){ CMP_HPEL(dmin, 0, 0, mx, my, size); if(mx || my) dmin += (mv_penalty[2*mx - pred_x] + mv_penalty[2*my - pred_y])*penalty_factor; @@ -138,7 +138,7 @@ return dmin; } - if(s->avctx->me_cmp != s->avctx->me_sub_cmp){ + if(c->avctx->me_cmp != c->avctx->me_sub_cmp){ dmin= cmp(s, mx, my, 0, 0, size, h, ref_index, src_index, cmp_sub, chroma_cmp_sub, flags); if(mx || my || size>0) dmin += (mv_penalty[2*mx - pred_x] + mv_penalty[2*my - pred_y])*penalty_factor; @@ -243,7 +243,7 @@ chroma_cmp_sub= s->dsp.mb_cmp[size+1]; assert(!c->skip); - assert(s->avctx->me_sub_cmp != s->avctx->mb_cmp); + assert(c->avctx->me_sub_cmp != c->avctx->mb_cmp); d= cmp(s, mx>>(qpel+1), my>>(qpel+1), mx&mask, my&mask, size, h, ref_index, src_index, cmp_sub, chroma_cmp_sub, flags); //FIXME check cbp before adding penalty for (0,0) vector @@ -272,7 +272,7 @@ const int my = *my_ptr; const int penalty_factor= c->sub_penalty_factor; const int map_generation= c->map_generation; - const int subpel_quality= s->avctx->me_subpel_quality; + const int subpel_quality= c->avctx->me_subpel_quality; uint32_t *map= c->map; me_cmp_func cmpf, chroma_cmpf; me_cmp_func cmp_sub, chroma_cmp_sub; @@ -293,7 +293,7 @@ return dmin; } - if(s->avctx->me_cmp != s->avctx->me_sub_cmp){ + if(c->avctx->me_cmp != c->avctx->me_sub_cmp){ dmin= cmp(s, mx, my, 0, 0, size, h, ref_index, src_index, cmp_sub, chroma_cmp_sub, flags); if(mx || my || size>0) dmin += (mv_penalty[4*mx - pred_x] + mv_penalty[4*my - pred_y])*penalty_factor; @@ -908,8 +908,8 @@ } } - if(s->avctx->last_predictor_count){ - const int count= s->avctx->last_predictor_count; + if(c->avctx->last_predictor_count){ + const int count= c->avctx->last_predictor_count; const int xstart= FFMAX(0, s->mb_x - count); const int ystart= FFMAX(0, s->mb_y - count); const int xend= FFMIN(s->mb_width , s->mb_x + count + 1);