Ticket #552: 552_patch.patch

File 552_patch.patch, 1.3 KB (added by ChristianFeldmann, 12 years ago)
  • source/Lib/TLibEncoder/TEncSlice.cpp

     
    843843        uiCUAddr!=rpcPic->getPicSym()->getPicSCUAddr(rpcPic->getSlice(rpcPic->getCurrSliceIdx())->getSliceCurStartCUAddr())/rpcPic->getNumPartInCU())     // cannot be first CU of slice
    844844    {
    845845      SliceType sliceType = pcSlice->getSliceType();
    846       if (!pcSlice->isIntra() && pcSlice->getPPS()->getCabacInitPresentFlag() && pcSlice->getPPS()->getEncCABACTableIdx()!=0)
     846      if (!pcSlice->isIntra() && pcSlice->getPPS()->getCabacInitPresentFlag() && pcSlice->getPPS()->getEncCABACTableIdx()!=2)
    847847      {
    848848        sliceType = (SliceType) pcSlice->getPPS()->getEncCABACTableIdx();
    849849      }
     
    10821082        else
    10831083        {
    10841084          SliceType sliceType  = pcSlice->getSliceType();
    1085           if (!pcSlice->isIntra() && pcSlice->getPPS()->getCabacInitPresentFlag() && pcSlice->getPPS()->getEncCABACTableIdx()!=0)
     1085          if (!pcSlice->isIntra() && pcSlice->getPPS()->getCabacInitPresentFlag() && pcSlice->getPPS()->getEncCABACTableIdx()!=2)
    10861086          {
    10871087            sliceType = (SliceType) pcSlice->getPPS()->getEncCABACTableIdx();
    10881088          }