Mercurial > libavcodec.hg
changeset 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 | f8ef6f664234 |
| files | motion_est.c motion_est_template.c mpegvideo.c mpegvideo.h |
| diffstat | 4 files changed, 89 insertions(+), 87 deletions(-) [+] |
line wrap: on
line diff
--- a/motion_est.c Tue May 11 00:58:08 2004 +0000 +++ b/motion_est.c Tue May 11 01:38:46 2004 +0000 @@ -95,8 +95,8 @@ } } -static int get_flags(MpegEncContext *s, int direct, int chroma){ - return ((s->flags&CODEC_FLAG_QPEL) ? FLAG_QPEL : 0) +static int get_flags(MotionEstContext *c, int direct, int chroma){ + return ((c->avctx->flags&CODEC_FLAG_QPEL) ? FLAG_QPEL : 0) + (direct ? FLAG_DIRECT : 0) + (chroma ? FLAG_CHROMA : 0); } @@ -240,15 +240,16 @@ void ff_init_me(MpegEncContext *s){ MotionEstContext * const c= &s->me; + c->avctx= s->avctx; - ff_set_cmp(&s->dsp, s->dsp.me_pre_cmp, s->avctx->me_pre_cmp); - ff_set_cmp(&s->dsp, s->dsp.me_cmp, s->avctx->me_cmp); - ff_set_cmp(&s->dsp, s->dsp.me_sub_cmp, s->avctx->me_sub_cmp); - ff_set_cmp(&s->dsp, s->dsp.mb_cmp, s->avctx->mb_cmp); + ff_set_cmp(&s->dsp, s->dsp.me_pre_cmp, c->avctx->me_pre_cmp); + ff_set_cmp(&s->dsp, s->dsp.me_cmp, c->avctx->me_cmp); + ff_set_cmp(&s->dsp, s->dsp.me_sub_cmp, c->avctx->me_sub_cmp); + ff_set_cmp(&s->dsp, s->dsp.mb_cmp, c->avctx->mb_cmp); - c->flags = get_flags(s, 0, s->avctx->me_cmp &FF_CMP_CHROMA); - c->sub_flags= get_flags(s, 0, s->avctx->me_sub_cmp&FF_CMP_CHROMA); - c->mb_flags = get_flags(s, 0, s->avctx->mb_cmp &FF_CMP_CHROMA); + c->flags = get_flags(c, 0, c->avctx->me_cmp &FF_CMP_CHROMA); + c->sub_flags= get_flags(c, 0, c->avctx->me_sub_cmp&FF_CMP_CHROMA); + c->mb_flags = get_flags(c, 0, c->avctx->mb_cmp &FF_CMP_CHROMA); /*FIXME s->no_rounding b_type*/ if(s->flags&CODEC_FLAG_QPEL){ @@ -257,11 +258,11 @@ if(s->no_rounding) c->qpel_put= s->dsp.put_no_rnd_qpel_pixels_tab; else c->qpel_put= s->dsp.put_qpel_pixels_tab; }else{ - if(s->avctx->me_sub_cmp&FF_CMP_CHROMA) + if(c->avctx->me_sub_cmp&FF_CMP_CHROMA) c->sub_motion_search= hpel_motion_search; - else if( s->avctx->me_sub_cmp == FF_CMP_SAD - && s->avctx-> me_cmp == FF_CMP_SAD - && s->avctx-> mb_cmp == FF_CMP_SAD) + else if( c->avctx->me_sub_cmp == FF_CMP_SAD + && c->avctx-> me_cmp == FF_CMP_SAD + && c->avctx-> mb_cmp == FF_CMP_SAD) c->sub_motion_search= sad_hpel_motion_search; // 2050 vs. 2450 cycles else c->sub_motion_search= hpel_motion_search; @@ -681,7 +682,7 @@ { MotionEstContext * const c= &s->me; /* - if(s->avctx->me_range) c->range= s->avctx->me_range >> 1; + if(c->avctx->me_range) c->range= c->avctx->me_range >> 1; else c->range= 16; */ if (s->unrestricted_mv) { @@ -697,9 +698,8 @@ } } -static inline void init_mv4_ref(MpegEncContext *s){ - MotionEstContext * const c= &s->me; - const int stride= s->linesize; +static inline void init_mv4_ref(MotionEstContext *c){ + const int stride= c->stride; c->ref[1][0] = c->ref[0][0] + 8; c->ref[2][0] = c->ref[0][0] + 8*stride; @@ -718,11 +718,11 @@ int P[10][2]; int dmin_sum=0, mx4_sum=0, my4_sum=0; int same=1; - const int stride= s->linesize; - const int uvstride= s->uvlinesize; + const int stride= c->stride; + const int uvstride= c->uvstride; uint8_t *mv_penalty= c->current_mv_penalty; - init_mv4_ref(s); + init_mv4_ref(c); for(block=0; block<4; block++){ int mx4, my4; @@ -810,7 +810,7 @@ dmin_sum += s->dsp.mb_cmp[0](s, s->new_picture.data[0] + s->mb_x*16 + s->mb_y*16*stride, c->scratchpad, stride, 16); } - if(s->avctx->mb_cmp&FF_CMP_CHROMA){ + if(c->avctx->mb_cmp&FF_CMP_CHROMA){ int dxy; int mx, my; int offset; @@ -836,7 +836,7 @@ c->pred_x= mx; c->pred_y= my; - switch(s->avctx->mb_cmp&0xFF){ + switch(c->avctx->mb_cmp&0xFF){ /*case FF_CMP_SSE: return dmin_sum+ 32*s->qscale*s->qscale;*/ case FF_CMP_RD: @@ -970,7 +970,7 @@ if(same) return INT_MAX; - switch(s->avctx->mb_cmp&0xFF){ + switch(c->avctx->mb_cmp&0xFF){ /*case FF_CMP_SSE: return dmin_sum+ 32*s->qscale*s->qscale;*/ case FF_CMP_RD: @@ -1004,7 +1004,7 @@ c->uvstride<<=1; if(!(s->flags & CODEC_FLAG_INTERLACED_ME)){ - av_log(s->avctx, AV_LOG_ERROR, "Interlaced macroblock selected but interlaced motion estimation disabled\n"); + av_log(c->avctx, AV_LOG_ERROR, "Interlaced macroblock selected but interlaced motion estimation disabled\n"); return -1; } @@ -1065,12 +1065,12 @@ c->uvstride>>=1; }else if(IS_8X8(mb_type)){ if(!(s->flags & CODEC_FLAG_4MV)){ - av_log(s->avctx, AV_LOG_ERROR, "4MV macroblock selected but 4MV encoding disabled\n"); + av_log(c->avctx, AV_LOG_ERROR, "4MV macroblock selected but 4MV encoding disabled\n"); return -1; } cmpf= s->dsp.sse[1]; chroma_cmpf= s->dsp.sse[1]; - init_mv4_ref(s); + init_mv4_ref(c); for(i=0; i<4; i++){ xy= s->block_index[i]; x= p->motion_val[0][xy][0]; @@ -1124,9 +1124,9 @@ assert(s->linesize == c->stride); assert(s->uvlinesize == c->uvstride); - c->penalty_factor = get_penalty_factor(s, s->avctx->me_cmp); - c->sub_penalty_factor= get_penalty_factor(s, s->avctx->me_sub_cmp); - c->mb_penalty_factor = get_penalty_factor(s, s->avctx->mb_cmp); + c->penalty_factor = get_penalty_factor(s, c->avctx->me_cmp); + c->sub_penalty_factor= get_penalty_factor(s, c->avctx->me_sub_cmp); + c->mb_penalty_factor = get_penalty_factor(s, c->avctx->mb_cmp); c->current_mv_penalty= c->mv_penalty[s->f_code] + MAX_MV; get_limits(s, 16*mb_x, 16*mb_y); @@ -1139,22 +1139,22 @@ pic->mb_mean[s->mb_stride * mb_y + mb_x] = (sum+128)>>8; pic->mb_var [s->mb_stride * mb_y + mb_x] = varc; - s->mb_var_sum_temp += varc; + c->mb_var_sum_temp += varc; - if(s->avctx->me_threshold){ + if(c->avctx->me_threshold){ vard= (check_input_motion(s, mb_x, mb_y, 1)+128)>>8; - if(vard<s->avctx->me_threshold){ + if(vard<c->avctx->me_threshold){ pic->mc_mb_var[s->mb_stride * mb_y + mb_x] = vard; - s->mc_mb_var_sum_temp += vard; + c->mc_mb_var_sum_temp += vard; if (vard <= 64 || vard < varc) { //FIXME - s->scene_change_score+= ff_sqrt(vard) - ff_sqrt(varc); + c->scene_change_score+= ff_sqrt(vard) - ff_sqrt(varc); }else{ - s->scene_change_score+= s->qscale; + c->scene_change_score+= s->qscale; } return; } - if(vard<s->avctx->mb_threshold) + if(vard<c->avctx->mb_threshold) mb_type= s->mb_type[mb_x + mb_y*s->mb_stride]; } @@ -1231,7 +1231,7 @@ pic->mc_mb_var[s->mb_stride * mb_y + mb_x] = vard; // pic->mb_cmp_score[s->mb_stride * mb_y + mb_x] = dmin; - s->mc_mb_var_sum_temp += vard; + c->mc_mb_var_sum_temp += vard; #if 0 printf("varc=%4d avg_var=%4d (sum=%4d) vard=%4d mx=%2d my=%2d\n", @@ -1239,9 +1239,9 @@ #endif if(mb_type){ if (vard <= 64 || vard < varc) - s->scene_change_score+= ff_sqrt(vard) - ff_sqrt(varc); + c->scene_change_score+= ff_sqrt(vard) - ff_sqrt(varc); else - s->scene_change_score+= s->qscale; + c->scene_change_score+= s->qscale; if(mb_type == CANDIDATE_MB_TYPE_INTER){ c->sub_motion_search(s, &mx, &my, dmin, 0, 0, 0, 16); @@ -1258,11 +1258,11 @@ if(mb_type == CANDIDATE_MB_TYPE_INTER_I){ interlaced_search(s, 0, s->p_field_mv_table, s->p_field_select_table, mx, my, 1); } - }else if(s->avctx->mb_decision > FF_MB_DECISION_SIMPLE){ + }else if(c->avctx->mb_decision > FF_MB_DECISION_SIMPLE){ if (vard <= 64 || vard < varc) - s->scene_change_score+= ff_sqrt(vard) - ff_sqrt(varc); + c->scene_change_score+= ff_sqrt(vard) - ff_sqrt(varc); else - s->scene_change_score+= s->qscale; + c->scene_change_score+= s->qscale; if (vard*2 + 200 > varc) mb_type|= CANDIDATE_MB_TYPE_INTRA; @@ -1294,7 +1294,7 @@ mb_type= CANDIDATE_MB_TYPE_INTER; dmin= c->sub_motion_search(s, &mx, &my, dmin, 0, 0, 0, 16); - if(s->avctx->me_sub_cmp != s->avctx->mb_cmp && !c->skip) + if(c->avctx->me_sub_cmp != c->avctx->mb_cmp && !c->skip) dmin= get_mb_score(s, mx, my, 0, 0); if((s->flags&CODEC_FLAG_4MV) @@ -1318,7 +1318,7 @@ set_p_mv_tables(s, mx, my, mb_type!=CANDIDATE_MB_TYPE_INTER4V); /* get intra luma score */ - if((s->avctx->mb_cmp&0xFF)==FF_CMP_SSE){ + if((c->avctx->mb_cmp&0xFF)==FF_CMP_SSE){ intra_score= (varc<<8) - 500; //FIXME dont scale it down so we dont have to fix it }else{ int mean= (sum+128)>>8; @@ -1335,7 +1335,7 @@ } #if 0 //FIXME /* get chroma score */ - if(s->avctx->mb_cmp&FF_CMP_CHROMA){ + if(c->avctx->mb_cmp&FF_CMP_CHROMA){ for(i=1; i<3; i++){ uint8_t *dest_c; int mean; @@ -1366,9 +1366,9 @@ s->current_picture.mb_type[mb_y*s->mb_stride + mb_x]= 0; if (vard <= 64 || vard < varc) { //FIXME - s->scene_change_score+= ff_sqrt(vard) - ff_sqrt(varc); + c->scene_change_score+= ff_sqrt(vard) - ff_sqrt(varc); }else{ - s->scene_change_score+= s->qscale; + c->scene_change_score+= s->qscale; } } @@ -1387,7 +1387,7 @@ assert(s->quarter_sample==0 || s->quarter_sample==1); - c->pre_penalty_factor = get_penalty_factor(s, s->avctx->me_pre_cmp); + c->pre_penalty_factor = get_penalty_factor(s, c->avctx->me_pre_cmp); c->current_mv_penalty= c->mv_penalty[s->f_code] + MAX_MV; get_limits(s, 16*mb_x, 16*mb_y); @@ -1440,9 +1440,9 @@ uint8_t * const mv_penalty= c->mv_penalty[f_code] + MAX_MV; int mv_scale; - c->penalty_factor = get_penalty_factor(s, s->avctx->me_cmp); - c->sub_penalty_factor= get_penalty_factor(s, s->avctx->me_sub_cmp); - c->mb_penalty_factor = get_penalty_factor(s, s->avctx->mb_cmp); + c->penalty_factor = get_penalty_factor(s, c->avctx->me_cmp); + c->sub_penalty_factor= get_penalty_factor(s, c->avctx->me_sub_cmp); + c->mb_penalty_factor = get_penalty_factor(s, c->avctx->mb_cmp); c->current_mv_penalty= mv_penalty; get_limits(s, 16*mb_x, 16*mb_y); @@ -1510,7 +1510,7 @@ dmin= c->sub_motion_search(s, &mx, &my, dmin, 0, ref_index, 0, 16); - if(s->avctx->me_sub_cmp != s->avctx->mb_cmp && !c->skip) + if(c->avctx->me_sub_cmp != c->avctx->mb_cmp && !c->skip) dmin= get_mb_score(s, mx, my, 0, ref_index); //printf("%d %d %d %d//", s->mb_x, s->mb_y, mx, my); @@ -1578,7 +1578,7 @@ +(mv_penalty[motion_bx-pred_bx] + mv_penalty[motion_by-pred_by])*c->mb_penalty_factor + s->dsp.mb_cmp[size](s, src_data[0], dest_y, stride, h); //FIXME new_pic - if(s->avctx->mb_cmp&FF_CMP_CHROMA){ + if(c->avctx->mb_cmp&FF_CMP_CHROMA){ } //FIXME CHROMA !!! @@ -1700,7 +1700,7 @@ else dmin = hpel_motion_search(s, &mx, &my, dmin, 0, 0, 0, 16); - if(s->avctx->me_sub_cmp != s->avctx->mb_cmp && !c->skip) + if(c->avctx->me_sub_cmp != c->avctx->mb_cmp && !c->skip) dmin= get_mb_score(s, mx, my, 0, 0); get_limits(s, 16*mb_x, 16*mb_y); //restore c->?min/max, maybe not needed @@ -1725,10 +1725,10 @@ c->skip=0; - if(s->avctx->me_threshold){ + if(c->avctx->me_threshold){ int vard= (check_input_motion(s, mb_x, mb_y, 0)+128)>>8; - if(vard<s->avctx->me_threshold){ + if(vard<c->avctx->me_threshold){ // pix = c->src[0][0]; // sum = s->dsp.pix_sum(pix, s->linesize); // varc = (s->dsp.pix_norm1(pix, s->linesize) - (((unsigned)(sum*sum))>>8) + 500 + 128)>>8; @@ -1736,16 +1736,16 @@ // pic->mb_var [s->mb_stride * mb_y + mb_x] = varc; s->current_picture.mc_mb_var[s->mb_stride * mb_y + mb_x] = vard; /* pic->mb_mean [s->mb_stride * mb_y + mb_x] = (sum+128)>>8; - s->mb_var_sum_temp += varc;*/ - s->mc_mb_var_sum_temp += vard; + c->mb_var_sum_temp += varc;*/ + c->mc_mb_var_sum_temp += vard; /* if (vard <= 64 || vard < varc) { - s->scene_change_score+= ff_sqrt(vard) - ff_sqrt(varc); + c->scene_change_score+= ff_sqrt(vard) - ff_sqrt(varc); }else{ - s->scene_change_score+= s->qscale; + c->scene_change_score+= s->qscale; }*/ return; } - if(vard<s->avctx->mb_threshold){ + if(vard<c->avctx->mb_threshold){ type= s->mb_type[mb_y*s->mb_stride + mb_x]; if(type == CANDIDATE_MB_TYPE_DIRECT){ direct_search(s, mb_x, mb_y); @@ -1832,11 +1832,11 @@ } score= ((unsigned)(score*score + 128*256))>>16; - s->mc_mb_var_sum_temp += score; + c->mc_mb_var_sum_temp += score; s->current_picture.mc_mb_var[mb_y*s->mb_stride + mb_x] = score; //FIXME use SSE } - if(s->avctx->mb_decision > FF_MB_DECISION_SIMPLE){ + if(c->avctx->mb_decision > FF_MB_DECISION_SIMPLE){ type= CANDIDATE_MB_TYPE_FORWARD | CANDIDATE_MB_TYPE_BACKWARD | CANDIDATE_MB_TYPE_BIDIR | CANDIDATE_MB_TYPE_DIRECT; if(fimin < INT_MAX) type |= CANDIDATE_MB_TYPE_FORWARD_I; @@ -1907,6 +1907,7 @@ void ff_fix_long_p_mvs(MpegEncContext * s) { + MotionEstContext * const c= &s->me; const int f_code= s->f_code; int y, range; assert(s->pict_type==P_TYPE); @@ -1915,7 +1916,7 @@ if(s->msmpeg4_version) range= 16; - if(s->avctx->me_range && range > s->avctx->me_range) range= s->avctx->me_range; + if(c->avctx->me_range && range > c->avctx->me_range) range= c->avctx->me_range; //printf("%d no:%d %d//\n", clip, noclip, f_code); if(s->flags&CODEC_FLAG_4MV){ @@ -1957,13 +1958,14 @@ void ff_fix_long_mvs(MpegEncContext * s, uint8_t *field_select_table, int field_select, int16_t (*mv_table)[2], int f_code, int type, int truncate) { + MotionEstContext * const c= &s->me; int y, h_range, v_range; // RAL: 8 in MPEG-1, 16 in MPEG-4 int range = (((s->out_format == FMT_MPEG1) ? 8 : 16) << f_code); if(s->msmpeg4_version) range= 16; - if(s->avctx->me_range && range > s->avctx->me_range) range= s->avctx->me_range; + if(c->avctx->me_range && range > c->avctx->me_range) range= c->avctx->me_range; h_range= range; v_range= field_select_table ? range>>1 : range;
--- 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);
--- a/mpegvideo.c Tue May 11 00:58:08 2004 +0000 +++ b/mpegvideo.c Tue May 11 01:38:46 2004 +0000 @@ -3958,7 +3958,7 @@ s->current_picture.mb_var [s->mb_stride * mb_y + mb_x] = varc; s->current_picture.mb_mean[s->mb_stride * mb_y + mb_x] = (sum+128)>>8; - s->mb_var_sum_temp += varc; + s->me.mb_var_sum_temp += varc; } } return 0; @@ -4552,9 +4552,9 @@ #define MERGE(field) dst->field += src->field; src->field=0 static void merge_context_after_me(MpegEncContext *dst, MpegEncContext *src){ - MERGE(scene_change_score); - MERGE(mc_mb_var_sum_temp); - MERGE(mb_var_sum_temp); + MERGE(me.scene_change_score); + MERGE(me.mc_mb_var_sum_temp); + MERGE(me.mb_var_sum_temp); } static void merge_context_after_encode(MpegEncContext *dst, MpegEncContext *src){ @@ -4595,8 +4595,8 @@ s->picture_number = picture_number; /* Reset the average MB variance */ - s->mb_var_sum_temp = - s->mc_mb_var_sum_temp = 0; + s->me.mb_var_sum_temp = + s->me.mc_mb_var_sum_temp = 0; #ifdef CONFIG_RISKY /* we need to initialize some time vars before we can encode b-frames */ @@ -4605,7 +4605,7 @@ ff_set_mpeg4_time(s, s->picture_number); //FIXME rename and use has_b_frames or similar #endif - s->scene_change_score=0; + s->me.scene_change_score=0; s->lambda= s->current_picture_ptr->quality; //FIXME qscale / ... stuff for ME ratedistoration @@ -4646,11 +4646,11 @@ for(i=1; i<s->avctx->thread_count; i++){ merge_context_after_me(s, s->thread_context[i]); } - s->current_picture.mc_mb_var_sum= s->current_picture_ptr->mc_mb_var_sum= s->mc_mb_var_sum_temp; - s->current_picture. mb_var_sum= s->current_picture_ptr-> mb_var_sum= s-> mb_var_sum_temp; + s->current_picture.mc_mb_var_sum= s->current_picture_ptr->mc_mb_var_sum= s->me.mc_mb_var_sum_temp; + s->current_picture. mb_var_sum= s->current_picture_ptr-> mb_var_sum= s->me. mb_var_sum_temp; emms_c(); - if(s->scene_change_score > s->avctx->scenechange_threshold && s->pict_type == P_TYPE){ + if(s->me.scene_change_score > s->avctx->scenechange_threshold && s->pict_type == P_TYPE){ s->pict_type= I_TYPE; for(i=0; i<s->mb_stride*s->mb_height; i++) s->mb_type[i]= CANDIDATE_MB_TYPE_INTRA;
--- a/mpegvideo.h Tue May 11 00:58:08 2004 +0000 +++ b/mpegvideo.h Tue May 11 01:38:46 2004 +0000 @@ -196,6 +196,7 @@ * Motion estimation context. */ typedef struct MotionEstContext{ + AVCodecContext *avctx; int skip; ///< set if ME is skiped for the current MB int co_located_mv[4][2]; ///< mv from last p frame for direct mode ME int direct_basis_mv[4][2]; @@ -226,6 +227,10 @@ uint8_t *ref[4][4]; int stride; int uvstride; + /* temp variables for picture complexity calculation */ + int mc_mb_var_sum_temp; + int mb_var_sum_temp; + int scene_change_score; /* cmp, chroma_cmp;*/ op_pixels_func (*hpel_put)[4]; op_pixels_func (*hpel_avg)[4]; @@ -393,7 +398,6 @@ uint8_t (*p_field_select_table[2]); uint8_t (*b_field_select_table[2][2]); int me_method; ///< ME algorithm - int scene_change_score; int mv_dir; #define MV_DIR_BACKWARD 1 #define MV_DIR_FORWARD 2 @@ -508,10 +512,6 @@ int misc_bits; ///< cbp, mb_type int last_bits; ///< temp var used for calculating the above vars - /* temp variables for picture complexity calculation */ - int mc_mb_var_sum_temp; - int mb_var_sum_temp; - /* error concealment / resync */ int error_count; uint8_t *error_status_table; ///< table of the error status of each MB