Mercurial > libavcodec.hg

comparison h264.h @ 11158:81c3f88f460f libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Skiped MBs dont need the cbp stuff so skip initing that.
author michael
date Sat, 13 Feb 2010 20:13:10 +0000
parents 81ef4df2c774
children 2d5a3c03c219
comparison
equal deleted inserted replaced
11157:625a076b8038 11158:81c3f88f460f
799 top_type = h->slice_table[top_xy ] == h->slice_num ? s->current_picture.mb_type[top_xy] : 0; 799 top_type = h->slice_table[top_xy ] == h->slice_num ? s->current_picture.mb_type[top_xy] : 0;
800 topright_type= h->slice_table[topright_xy] == h->slice_num ? s->current_picture.mb_type[topright_xy]: 0; 800 topright_type= h->slice_table[topright_xy] == h->slice_num ? s->current_picture.mb_type[topright_xy]: 0;
801 left_type[0] = h->slice_table[left_xy[0] ] == h->slice_num ? s->current_picture.mb_type[left_xy[0]] : 0; 801 left_type[0] = h->slice_table[left_xy[0] ] == h->slice_num ? s->current_picture.mb_type[left_xy[0]] : 0;
802 left_type[1] = h->slice_table[left_xy[1] ] == h->slice_num ? s->current_picture.mb_type[left_xy[1]] : 0; 802 left_type[1] = h->slice_table[left_xy[1] ] == h->slice_num ? s->current_picture.mb_type[left_xy[1]] : 0;
803 803
804 if(!IS_SKIP(mb_type)){
804 if(IS_INTRA(mb_type)){ 805 if(IS_INTRA(mb_type)){
805 int type_mask= h->pps.constrained_intra_pred ? IS_INTRA(-1) : -1; 806 int type_mask= h->pps.constrained_intra_pred ? IS_INTRA(-1) : -1;
806 h->topleft_samples_available= 807 h->topleft_samples_available=
807 h->top_samples_available= 808 h->top_samples_available=
808 h->left_samples_available= 0xFFFF; 809 h->left_samples_available= 0xFFFF;
943 } 944 }
944 if (left_type[1]) { 945 if (left_type[1]) {
945 h->left_cbp |= ((h->cbp_table[left_xy[1]]>>((left_block[2]&(~1))+1))&0x1) << 3; 946 h->left_cbp |= ((h->cbp_table[left_xy[1]]>>((left_block[2]&(~1))+1))&0x1) << 3;
946 } 947 }
947 } 948 }
949 }
948 950
949 #if 1 951 #if 1
950 if(IS_INTER(mb_type) || (IS_DIRECT(mb_type) && h->direct_spatial_mv_pred)){ 952 if(IS_INTER(mb_type) || (IS_DIRECT(mb_type) && h->direct_spatial_mv_pred)){
951 int list; 953 int list;
952 for(list=0; list<h->list_count; list++){ 954 for(list=0; list<h->list_count; list++){