Mercurial > libavcodec.hg

comparison h264.c @ 2536:943b0615fc93 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
oops, other half of the vismv patch
author lorenm
date Thu, 03 Mar 2005 12:12:44 +0000
parents e0bf024629cf
children 14fef0f3f532
comparison
equal deleted inserted replaced
2535:e0bf024629cf 2536:943b0615fc93
1075 1075
1076 if(IS_8X8(mb_type_col) && !h->sps.direct_8x8_inference_flag){ 1076 if(IS_8X8(mb_type_col) && !h->sps.direct_8x8_inference_flag){
1077 /* FIXME save sub mb types from previous frames (or derive from MVs) 1077 /* FIXME save sub mb types from previous frames (or derive from MVs)
1078 * so we know exactly what block size to use */ 1078 * so we know exactly what block size to use */
1079 sub_mb_type = MB_TYPE_8x8|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_4x4 */ 1079 sub_mb_type = MB_TYPE_8x8|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_4x4 */
1080 *mb_type = MB_TYPE_8x8; 1080 *mb_type = MB_TYPE_8x8|MB_TYPE_L0L1;
1081 }else if(!is_b8x8 && (IS_16X16(mb_type_col) || IS_INTRA(mb_type_col))){ 1081 }else if(!is_b8x8 && (IS_16X16(mb_type_col) || IS_INTRA(mb_type_col))){
1082 sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */ 1082 sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */
1083 *mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_16x16 */ 1083 *mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_16x16 */
1084 }else{ 1084 }else{
1085 sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */ 1085 sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */
1086 *mb_type = MB_TYPE_8x8; 1086 *mb_type = MB_TYPE_8x8|MB_TYPE_L0L1;
1087 } 1087 }
1088 if(!is_b8x8) 1088 if(!is_b8x8)
1089 *mb_type |= MB_TYPE_DIRECT2; 1089 *mb_type |= MB_TYPE_DIRECT2;
1090 1090
1091 tprintf("mb_type = %08x, sub_mb_type = %08x, is_b8x8 = %d, mb_type_col = %08x\n", *mb_type, sub_mb_type, is_b8x8, mb_type_col); 1091 tprintf("mb_type = %08x, sub_mb_type = %08x, is_b8x8 = %d, mb_type_col = %08x\n", *mb_type, sub_mb_type, is_b8x8, mb_type_col);