Ticket #549: Fix-Ticket549.r2468.patch
File Fix-Ticket549.r2468.patch, 1.5 KB (added by hao, 12 years ago) |
---|
-
source/Lib/TLibCommon/TComDataCU.cpp
1954 1954 return getPic()->getCU( getAddr() )->getLastCodedQP( getZorderIdxInCU() ); 1955 1955 } 1956 1956 #if H0226 1957 else if ( ( getAddr() > 0 ) && ( !( getSlice()->getPPS()->getTilesOrEntropyCodingSyncIdc() == 2 ) || !(getAddr() % getPic()->getFrameWidthInCU() == 0 )) ) 1957 else if ( getPic()->getPicSym()->getInverseCUOrderMap(getAddr()) > 0 1958 && getPic()->getPicSym()->getTileIdxMap(getAddr()) == getPic()->getPicSym()->getTileIdxMap(getPic()->getPicSym()->getCUOrderMap(getPic()->getPicSym()->getInverseCUOrderMap(getAddr())-1)) 1959 && !( getSlice()->getPPS()->getTilesOrEntropyCodingSyncIdc() == 2 && getAddr() % getPic()->getFrameWidthInCU() == 0 ) ) 1958 1960 #else 1959 else if ( getAddr() > 0 ) 1961 else if ( getPic()->getPicSym()->getInverseCUOrderMap(getAddr()) > 0 1962 && getPic()->getPicSym()->getTileIdxMap(getAddr()) == getPic()->getPicSym()->getTileIdxMap(getPic()->getPicSym()->getCUOrderMap(getPic()->getPicSym()->getInverseCUOrderMap(getAddr())-1)) ) 1960 1963 #endif 1961 1964 { 1962 return getPic()->getCU( get Addr()-1)->getLastCodedQP( getPic()->getNumPartInCU() );1965 return getPic()->getCU( getPic()->getPicSym()->getCUOrderMap(getPic()->getPicSym()->getInverseCUOrderMap(getAddr())-1) )->getLastCodedQP( getPic()->getNumPartInCU() ); 1963 1966 } 1964 1967 else 1965 1968 {