Mercurial > libavcodec.hg
comparison cavs.c @ 3469:c9059c843d4c libavcodec
change partition flags SYM -> FWD|SYM
author | stefang |
---|---|
date | Fri, 14 Jul 2006 18:56:17 +0000 |
parents | 804434dc50c3 |
children | c2db6e76b269 |
comparison
equal
deleted
inserted
replaced
3468:804434dc50c3 | 3469:c9059c843d4c |
---|---|
1035 assert((mb_type > B_SYM_16X16) && (mb_type < B_8X8)); | 1035 assert((mb_type > B_SYM_16X16) && (mb_type < B_8X8)); |
1036 flags = partition_flags[mb_type]; | 1036 flags = partition_flags[mb_type]; |
1037 if(mb_type & 1) { /* 16x8 macroblock types */ | 1037 if(mb_type & 1) { /* 16x8 macroblock types */ |
1038 if(flags & FWD0) | 1038 if(flags & FWD0) |
1039 mv_pred(h, MV_FWD_X0, MV_FWD_C2, MV_PRED_TOP, BLK_16X8, 1); | 1039 mv_pred(h, MV_FWD_X0, MV_FWD_C2, MV_PRED_TOP, BLK_16X8, 1); |
1040 if(flags & SYM0) { | 1040 if(flags & SYM0) |
1041 mv_pred(h, MV_FWD_X0, MV_FWD_C2, MV_PRED_TOP, BLK_16X8, 1); | |
1042 mv_pred_sym(h, &h->mv[MV_FWD_X0], BLK_16X8); | 1041 mv_pred_sym(h, &h->mv[MV_FWD_X0], BLK_16X8); |
1043 } | |
1044 if(flags & FWD1) | 1042 if(flags & FWD1) |
1045 mv_pred(h, MV_FWD_X2, MV_FWD_A1, MV_PRED_LEFT, BLK_16X8, 1); | 1043 mv_pred(h, MV_FWD_X2, MV_FWD_A1, MV_PRED_LEFT, BLK_16X8, 1); |
1046 if(flags & SYM1) { | 1044 if(flags & SYM1) |
1047 mv_pred(h, MV_FWD_X2, MV_FWD_A1, MV_PRED_LEFT, BLK_16X8, 1); | 1045 mv_pred_sym(h, &h->mv[MV_FWD_X2], BLK_16X8); |
1048 mv_pred_sym(h, &h->mv[9], BLK_16X8); | |
1049 } | |
1050 if(flags & BWD0) | 1046 if(flags & BWD0) |
1051 mv_pred(h, MV_BWD_X0, MV_BWD_C2, MV_PRED_TOP, BLK_16X8, 0); | 1047 mv_pred(h, MV_BWD_X0, MV_BWD_C2, MV_PRED_TOP, BLK_16X8, 0); |
1052 if(flags & BWD1) | 1048 if(flags & BWD1) |
1053 mv_pred(h, MV_BWD_X2, MV_BWD_A1, MV_PRED_LEFT, BLK_16X8, 0); | 1049 mv_pred(h, MV_BWD_X2, MV_BWD_A1, MV_PRED_LEFT, BLK_16X8, 0); |
1054 } else { /* 8x16 macroblock types */ | 1050 } else { /* 8x16 macroblock types */ |
1055 if(flags & FWD0) | 1051 if(flags & FWD0) |
1056 mv_pred(h, MV_FWD_X0, MV_FWD_B3, MV_PRED_LEFT, BLK_8X16, 1); | 1052 mv_pred(h, MV_FWD_X0, MV_FWD_B3, MV_PRED_LEFT, BLK_8X16, 1); |
1057 if(flags & SYM0) { | 1053 if(flags & SYM0) |
1058 mv_pred(h, MV_FWD_X0, MV_FWD_B3, MV_PRED_LEFT, BLK_8X16, 1); | |
1059 mv_pred_sym(h, &h->mv[MV_FWD_X0], BLK_8X16); | 1054 mv_pred_sym(h, &h->mv[MV_FWD_X0], BLK_8X16); |
1060 } | |
1061 if(flags & FWD1) | 1055 if(flags & FWD1) |
1062 mv_pred(h, MV_FWD_X1, MV_FWD_C2, MV_PRED_TOPRIGHT,BLK_8X16, 1); | 1056 mv_pred(h, MV_FWD_X1, MV_FWD_C2, MV_PRED_TOPRIGHT,BLK_8X16, 1); |
1063 if(flags & SYM1) { | 1057 if(flags & SYM1) |
1064 mv_pred(h, MV_FWD_X1, MV_FWD_C2, MV_PRED_TOPRIGHT,BLK_8X16, 1); | 1058 mv_pred_sym(h, &h->mv[MV_FWD_X1], BLK_8X16); |
1065 mv_pred_sym(h, &h->mv[6], BLK_8X16); | |
1066 } | |
1067 if(flags & BWD0) | 1059 if(flags & BWD0) |
1068 mv_pred(h, MV_BWD_X0, MV_BWD_B3, MV_PRED_LEFT, BLK_8X16, 0); | 1060 mv_pred(h, MV_BWD_X0, MV_BWD_B3, MV_PRED_LEFT, BLK_8X16, 0); |
1069 if(flags & BWD1) | 1061 if(flags & BWD1) |
1070 mv_pred(h, MV_BWD_X1, MV_BWD_C2, MV_PRED_TOPRIGHT,BLK_8X16, 0); | 1062 mv_pred(h, MV_BWD_X1, MV_BWD_C2, MV_PRED_TOPRIGHT,BLK_8X16, 0); |
1071 } | 1063 } |