Mercurial > libavcodec.hg
comparison vc1.c @ 4518:e3c43b4aa9ac libavcodec
Intensity compensation for B-frames in AP was missing
author | kostya |
---|---|
date | Tue, 13 Feb 2007 07:48:23 +0000 |
parents | 0a0a9f0c9c2d |
children | a96d905dcbaa |
comparison
equal
deleted
inserted
replaced
4517:75701d9842cc | 4518:e3c43b4aa9ac |
---|---|
1682 if (pqindex < 9) v->halfpq = get_bits(gb, 1); | 1682 if (pqindex < 9) v->halfpq = get_bits(gb, 1); |
1683 else v->halfpq = 0; | 1683 else v->halfpq = 0; |
1684 if (v->quantizer_mode == QUANT_FRAME_EXPLICIT) | 1684 if (v->quantizer_mode == QUANT_FRAME_EXPLICIT) |
1685 v->pquantizer = get_bits(gb, 1); | 1685 v->pquantizer = get_bits(gb, 1); |
1686 | 1686 |
1687 if(v->s.pict_type == I_TYPE || v->s.pict_type == P_TYPE) v->use_ic = 0; | |
1688 | |
1687 switch(v->s.pict_type) { | 1689 switch(v->s.pict_type) { |
1688 case I_TYPE: | 1690 case I_TYPE: |
1689 case BI_TYPE: | 1691 case BI_TYPE: |
1690 status = bitplane_decoding(v->acpred_plane, &v->acpred_is_raw, v); | 1692 status = bitplane_decoding(v->acpred_plane, &v->acpred_is_raw, v); |
1691 if (status < 0) return -1; | 1693 if (status < 0) return -1; |
1739 } | 1741 } |
1740 for(i = 0; i < 256; i++) { | 1742 for(i = 0; i < 256; i++) { |
1741 v->luty[i] = clip_uint8((scale * i + shift + 32) >> 6); | 1743 v->luty[i] = clip_uint8((scale * i + shift + 32) >> 6); |
1742 v->lutuv[i] = clip_uint8((scale * (i - 128) + 128*64 + 32) >> 6); | 1744 v->lutuv[i] = clip_uint8((scale * (i - 128) + 128*64 + 32) >> 6); |
1743 } | 1745 } |
1746 v->use_ic = 1; | |
1744 } | 1747 } |
1745 if(v->mv_mode == MV_PMODE_1MV_HPEL || v->mv_mode == MV_PMODE_1MV_HPEL_BILIN) | 1748 if(v->mv_mode == MV_PMODE_1MV_HPEL || v->mv_mode == MV_PMODE_1MV_HPEL_BILIN) |
1746 v->s.quarter_sample = 0; | 1749 v->s.quarter_sample = 0; |
1747 else if(v->mv_mode == MV_PMODE_INTENSITY_COMP) { | 1750 else if(v->mv_mode == MV_PMODE_INTENSITY_COMP) { |
1748 if(v->mv_mode2 == MV_PMODE_1MV_HPEL || v->mv_mode2 == MV_PMODE_1MV_HPEL_BILIN) | 1751 if(v->mv_mode2 == MV_PMODE_1MV_HPEL || v->mv_mode2 == MV_PMODE_1MV_HPEL_BILIN) |