Mercurial > libavcodec.hg

comparison motion_est_template.c @ 2226:4306aa6f8f16 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pre_cmp fix
author michael
date Mon, 13 Sep 2004 12:37:39 +0000
parents 70b27300a496
children 5e5cf598a48b
comparison
equal deleted inserted replaced
2225:35fc37209ea0 2226:4306aa6f8f16
853 { 853 {
854 MotionEstContext * const c= &s->me; 854 MotionEstContext * const c= &s->me;
855 int best[2]={0, 0}; 855 int best[2]={0, 0};
856 int d, dmin; 856 int d, dmin;
857 int map_generation; 857 int map_generation;
858 const int penalty_factor= c->penalty_factor; 858 int penalty_factor;
859 const int ref_mv_stride= s->mb_stride; //pass as arg FIXME 859 const int ref_mv_stride= s->mb_stride; //pass as arg FIXME
860 const int ref_mv_xy= s->mb_x + s->mb_y*ref_mv_stride; //add to last_mv beforepassing FIXME 860 const int ref_mv_xy= s->mb_x + s->mb_y*ref_mv_stride; //add to last_mv beforepassing FIXME
861 me_cmp_func cmpf, chroma_cmpf; 861 me_cmp_func cmpf, chroma_cmpf;
862 862
863 LOAD_COMMON 863 LOAD_COMMON
864 LOAD_COMMON2 864 LOAD_COMMON2
865 865
866 cmpf= s->dsp.me_cmp[size]; 866 if(c->pre_pass){
867 chroma_cmpf= s->dsp.me_cmp[size+1]; 867 penalty_factor= c->pre_penalty_factor;
868 cmpf= s->dsp.me_pre_cmp[size];
869 chroma_cmpf= s->dsp.me_pre_cmp[size+1];
870 }else{
871 penalty_factor= c->penalty_factor;
872 cmpf= s->dsp.me_cmp[size];
873 chroma_cmpf= s->dsp.me_cmp[size+1];
874 }
868 875
869 map_generation= update_map_generation(c); 876 map_generation= update_map_generation(c);
870 877
871 assert(cmpf); 878 assert(cmpf);
872 dmin= cmp(s, 0, 0, 0, 0, size, h, ref_index, src_index, cmpf, chroma_cmpf, flags); 879 dmin= cmp(s, 0, 0, 0, 0, size, h, ref_index, src_index, cmpf, chroma_cmpf, flags);