Ticket #552: 552_patch.patch
File 552_patch.patch, 1.3 KB (added by ChristianFeldmann, 12 years ago) |
---|
-
source/Lib/TLibEncoder/TEncSlice.cpp
843 843 uiCUAddr!=rpcPic->getPicSym()->getPicSCUAddr(rpcPic->getSlice(rpcPic->getCurrSliceIdx())->getSliceCurStartCUAddr())/rpcPic->getNumPartInCU()) // cannot be first CU of slice 844 844 { 845 845 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) 847 847 { 848 848 sliceType = (SliceType) pcSlice->getPPS()->getEncCABACTableIdx(); 849 849 } … … 1082 1082 else 1083 1083 { 1084 1084 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) 1086 1086 { 1087 1087 sliceType = (SliceType) pcSlice->getPPS()->getEncCABACTableIdx(); 1088 1088 }