Mercurial > libavcodec.hg
comparison motion_est_template.c @ 4257:ac98478e056d libavcodec
fix indention
| author | michael |
|---|---|
| date | Sat, 02 Dec 2006 11:24:41 +0000 |
| parents | b3e17d30dde2 |
| children | 9b74144471c5 |
comparison
equal
deleted
inserted
replaced
| 4256:b3e17d30dde2 | 4257:ac98478e056d |
|---|---|
| 1036 CHECK_MV( P_MEDIAN[0] >>shift , P_MEDIAN[1] >>shift) | 1036 CHECK_MV( P_MEDIAN[0] >>shift , P_MEDIAN[1] >>shift) |
| 1037 CHECK_CLIPED_MV((P_MEDIAN[0]>>shift) , (P_MEDIAN[1]>>shift)-1) | 1037 CHECK_CLIPED_MV((P_MEDIAN[0]>>shift) , (P_MEDIAN[1]>>shift)-1) |
| 1038 CHECK_CLIPED_MV((P_MEDIAN[0]>>shift) , (P_MEDIAN[1]>>shift)+1) | 1038 CHECK_CLIPED_MV((P_MEDIAN[0]>>shift) , (P_MEDIAN[1]>>shift)+1) |
| 1039 CHECK_CLIPED_MV((P_MEDIAN[0]>>shift)-1, (P_MEDIAN[1]>>shift) ) | 1039 CHECK_CLIPED_MV((P_MEDIAN[0]>>shift)-1, (P_MEDIAN[1]>>shift) ) |
| 1040 CHECK_CLIPED_MV((P_MEDIAN[0]>>shift)+1, (P_MEDIAN[1]>>shift) ) | 1040 CHECK_CLIPED_MV((P_MEDIAN[0]>>shift)+1, (P_MEDIAN[1]>>shift) ) |
| 1041 CHECK_CLIPED_MV((last_mv[ref_mv_xy][0]*ref_mv_scale + (1<<15))>>16, | 1041 CHECK_CLIPED_MV((last_mv[ref_mv_xy][0]*ref_mv_scale + (1<<15))>>16, |
| 1042 (last_mv[ref_mv_xy][1]*ref_mv_scale + (1<<15))>>16) | 1042 (last_mv[ref_mv_xy][1]*ref_mv_scale + (1<<15))>>16) |
| 1043 CHECK_MV(P_LEFT[0] >>shift, P_LEFT[1] >>shift) | 1043 CHECK_MV(P_LEFT[0] >>shift, P_LEFT[1] >>shift) |
| 1044 CHECK_MV(P_TOP[0] >>shift, P_TOP[1] >>shift) | 1044 CHECK_MV(P_TOP[0] >>shift, P_TOP[1] >>shift) |
| 1045 CHECK_MV(P_TOPRIGHT[0]>>shift, P_TOPRIGHT[1]>>shift) | 1045 CHECK_MV(P_TOPRIGHT[0]>>shift, P_TOPRIGHT[1]>>shift) |
| 1046 } | 1046 } |
| 1047 if(dmin>h*h*4){ | 1047 if(dmin>h*h*4){ |
| 1048 if(c->pre_pass){ | 1048 if(c->pre_pass){ |
| 1049 CHECK_CLIPED_MV((last_mv[ref_mv_xy-1][0]*ref_mv_scale + (1<<15))>>16, | 1049 CHECK_CLIPED_MV((last_mv[ref_mv_xy-1][0]*ref_mv_scale + (1<<15))>>16, |
| 1050 (last_mv[ref_mv_xy-1][1]*ref_mv_scale + (1<<15))>>16) | 1050 (last_mv[ref_mv_xy-1][1]*ref_mv_scale + (1<<15))>>16) |
| 1141 (last_mv[ref_mv_xy][1]*ref_mv_scale + (1<<15))>>16) | 1141 (last_mv[ref_mv_xy][1]*ref_mv_scale + (1<<15))>>16) |
| 1142 CHECK_MV(P_MV1[0]>>shift, P_MV1[1]>>shift) | 1142 CHECK_MV(P_MV1[0]>>shift, P_MV1[1]>>shift) |
| 1143 }else{ | 1143 }else{ |
| 1144 CHECK_MV(P_MV1[0]>>shift, P_MV1[1]>>shift) | 1144 CHECK_MV(P_MV1[0]>>shift, P_MV1[1]>>shift) |
| 1145 //FIXME try some early stop | 1145 //FIXME try some early stop |
| 1146 CHECK_MV(P_MEDIAN[0]>>shift, P_MEDIAN[1]>>shift) | 1146 CHECK_MV(P_MEDIAN[0]>>shift, P_MEDIAN[1]>>shift) |
| 1147 CHECK_MV(P_LEFT[0]>>shift, P_LEFT[1]>>shift) | 1147 CHECK_MV(P_LEFT[0]>>shift, P_LEFT[1]>>shift) |
| 1148 CHECK_MV(P_TOP[0]>>shift, P_TOP[1]>>shift) | 1148 CHECK_MV(P_TOP[0]>>shift, P_TOP[1]>>shift) |
| 1149 CHECK_MV(P_TOPRIGHT[0]>>shift, P_TOPRIGHT[1]>>shift) | 1149 CHECK_MV(P_TOPRIGHT[0]>>shift, P_TOPRIGHT[1]>>shift) |
| 1150 CHECK_CLIPED_MV((last_mv[ref_mv_xy][0]*ref_mv_scale + (1<<15))>>16, | 1150 CHECK_CLIPED_MV((last_mv[ref_mv_xy][0]*ref_mv_scale + (1<<15))>>16, |
| 1151 (last_mv[ref_mv_xy][1]*ref_mv_scale + (1<<15))>>16) | 1151 (last_mv[ref_mv_xy][1]*ref_mv_scale + (1<<15))>>16) |
| 1152 } | 1152 } |
| 1153 if(dmin>64*4){ | 1153 if(dmin>64*4){ |
| 1154 CHECK_CLIPED_MV((last_mv[ref_mv_xy+1][0]*ref_mv_scale + (1<<15))>>16, | 1154 CHECK_CLIPED_MV((last_mv[ref_mv_xy+1][0]*ref_mv_scale + (1<<15))>>16, |
| 1155 (last_mv[ref_mv_xy+1][1]*ref_mv_scale + (1<<15))>>16) | 1155 (last_mv[ref_mv_xy+1][1]*ref_mv_scale + (1<<15))>>16) |
| 1156 if(s->mb_y+1<s->end_mb_y) //FIXME replace at least with last_slice_line | 1156 if(s->mb_y+1<s->end_mb_y) //FIXME replace at least with last_slice_line |
| 1201 (last_mv[ref_mv_xy][1]*ref_mv_scale + (1<<15))>>16) | 1201 (last_mv[ref_mv_xy][1]*ref_mv_scale + (1<<15))>>16) |
| 1202 CHECK_MV(P_MV1[0]>>shift, P_MV1[1]>>shift) | 1202 CHECK_MV(P_MV1[0]>>shift, P_MV1[1]>>shift) |
| 1203 }else{ | 1203 }else{ |
| 1204 CHECK_MV(P_MV1[0]>>shift, P_MV1[1]>>shift) | 1204 CHECK_MV(P_MV1[0]>>shift, P_MV1[1]>>shift) |
| 1205 //FIXME try some early stop | 1205 //FIXME try some early stop |
| 1206 CHECK_MV(P_MEDIAN[0]>>shift, P_MEDIAN[1]>>shift) | 1206 CHECK_MV(P_MEDIAN[0]>>shift, P_MEDIAN[1]>>shift) |
| 1207 CHECK_MV(P_LEFT[0]>>shift, P_LEFT[1]>>shift) | 1207 CHECK_MV(P_LEFT[0]>>shift, P_LEFT[1]>>shift) |
| 1208 CHECK_MV(P_TOP[0]>>shift, P_TOP[1]>>shift) | 1208 CHECK_MV(P_TOP[0]>>shift, P_TOP[1]>>shift) |
| 1209 CHECK_MV(P_TOPRIGHT[0]>>shift, P_TOPRIGHT[1]>>shift) | 1209 CHECK_MV(P_TOPRIGHT[0]>>shift, P_TOPRIGHT[1]>>shift) |
| 1210 CHECK_CLIPED_MV((last_mv[ref_mv_xy][0]*ref_mv_scale + (1<<15))>>16, | 1210 CHECK_CLIPED_MV((last_mv[ref_mv_xy][0]*ref_mv_scale + (1<<15))>>16, |
| 1211 (last_mv[ref_mv_xy][1]*ref_mv_scale + (1<<15))>>16) | 1211 (last_mv[ref_mv_xy][1]*ref_mv_scale + (1<<15))>>16) |
| 1212 } | 1212 } |
| 1213 if(dmin>64*4){ | 1213 if(dmin>64*4){ |
| 1214 CHECK_CLIPED_MV((last_mv[ref_mv_xy+1][0]*ref_mv_scale + (1<<15))>>16, | 1214 CHECK_CLIPED_MV((last_mv[ref_mv_xy+1][0]*ref_mv_scale + (1<<15))>>16, |
| 1215 (last_mv[ref_mv_xy+1][1]*ref_mv_scale + (1<<15))>>16) | 1215 (last_mv[ref_mv_xy+1][1]*ref_mv_scale + (1<<15))>>16) |
| 1216 if(s->mb_y+1<s->end_mb_y) //FIXME replace at least with last_slice_line | 1216 if(s->mb_y+1<s->end_mb_y) //FIXME replace at least with last_slice_line |