Mercurial > libavcodec.hg
comparison h264.h @ 11166:5bd834bd759b libavcodec
Remove slice_table checks from decode_cabac_mb_cbp_luma() and set left/top_cbp so
these checks arent needed.
| author | michael |
|---|---|
| date | Sun, 14 Feb 2010 02:08:48 +0000 |
| parents | 0f74d7b5a49f |
| children | c163ffa8c59e |
comparison
equal
deleted
inserted
replaced
| 11165:0f74d7b5a49f | 11166:5bd834bd759b |
|---|---|
| 925 if( CABAC ) { | 925 if( CABAC ) { |
| 926 // top_cbp | 926 // top_cbp |
| 927 if(top_type) { | 927 if(top_type) { |
| 928 h->top_cbp = h->cbp_table[top_xy]; | 928 h->top_cbp = h->cbp_table[top_xy]; |
| 929 } else if(IS_INTRA(mb_type)) { | 929 } else if(IS_INTRA(mb_type)) { |
| 930 h->top_cbp = 0x1C0; | 930 h->top_cbp = 0x1CF; |
| 931 } else { | 931 } else { |
| 932 h->top_cbp = 0; | 932 h->top_cbp = 0x00F; |
| 933 } | 933 } |
| 934 // left_cbp | 934 // left_cbp |
| 935 if (left_type[0]) { | 935 if (left_type[0]) { |
| 936 h->left_cbp = h->cbp_table[left_xy[0]] & 0x1f0; | 936 h->left_cbp = h->cbp_table[left_xy[0]] & 0x1f0; |
| 937 } else if(IS_INTRA(mb_type)) { | 937 } else if(IS_INTRA(mb_type)) { |
| 938 h->left_cbp = 0x1C0; | 938 h->left_cbp = 0x1CF; |
| 939 } else { | 939 } else { |
| 940 h->left_cbp = 0; | 940 h->left_cbp = 0x00F; |
| 941 } | 941 } |
| 942 if (left_type[0]) { | 942 if (left_type[0]) { |
| 943 h->left_cbp |= ((h->cbp_table[left_xy[0]]>>((left_block[0]&(~1))+1))&0x1) << 1; | 943 h->left_cbp |= ((h->cbp_table[left_xy[0]]>>((left_block[0]&(~1))+1))&0x1) << 1; |
| 944 } | 944 } |
| 945 if (left_type[1]) { | 945 if (left_type[1]) { |