Ticket #1373: ticket_1373.patch
File ticket_1373.patch, 2.3 KB (added by Vadim, 9 years ago) |
---|
-
Lib/TLibCommon/TComDataCU.cpp
2194 2194 } 2195 2195 else 2196 2196 { 2197 #if FIX_TICKET_1373 2198 if(getCbf( absPartIdx, COMPONENT_Y ) || (numValidComp>COMPONENT_Cb && getCbf( absPartIdx, COMPONENT_Cb )) || (numValidComp>COMPONENT_Cr && getCbf( absPartIdx, COMPONENT_Cr) ) 2199 || (getPLTModeFlag(absPartIdx) && getPLTEscape(COMPONENT_Y, absPartIdx)) 2200 ) 2201 #else 2197 2202 if(getCbf( absPartIdx, COMPONENT_Y ) || (numValidComp>COMPONENT_Cb && getCbf( absPartIdx, COMPONENT_Cb )) || (numValidComp>COMPONENT_Cr && getCbf( absPartIdx, COMPONENT_Cr) ) ) 2203 #endif 2198 2204 { 2199 2205 foundNonZeroCbf = true; 2200 2206 } -
Lib/TLibCommon/TypeDef.h
45 45 #include <vector> 46 46 #include <cstdlib> 47 47 48 #define FIX_TICKET_1373 1 49 48 50 //! \ingroup TLibCommon 49 51 //! \{ 50 52 -
Lib/TLibEncoder/TEncCu.cpp
1445 1445 { 1446 1446 if( ( rpcTempCU->getCbf(uiBlkIdx, COMPONENT_Y) 1447 1447 || (rpcTempCU->getCbf(uiBlkIdx, COMPONENT_Cb) && (numberValidComponents > COMPONENT_Cb)) 1448 || (rpcTempCU->getCbf(uiBlkIdx, COMPONENT_Cr) && (numberValidComponents > COMPONENT_Cr)) ) ) 1448 || (rpcTempCU->getCbf(uiBlkIdx, COMPONENT_Cr) && (numberValidComponents > COMPONENT_Cr)) ) 1449 #if FIX_TICKET_1373 1450 || ( rpcTempCU->getPLTModeFlag(uiBlkIdx) && rpcTempCU->getPLTEscape(COMPONENT_Y, uiBlkIdx) ) 1451 #endif 1452 ) 1449 1453 { 1450 1454 hasResidual = true; 1451 1455 break; … … 3305 3309 const TComPPS &pps = *(pcCU->getSlice()->getPPS()); 3306 3310 if ( pps.getUseDQP() && uiDepth <= pps.getMaxCuDQPDepth() ) 3307 3311 { 3312 #if FIX_TICKET_1373 3313 if( pcCU->getQtRootCbf(0) || ( pcCU->getPLTModeFlag(0) && pcCU->getPLTEscape(COMPONENT_Y, 0) ) ) 3314 #else 3308 3315 if ( pcCU->getQtRootCbf( 0) ) 3316 #endif 3309 3317 { 3310 3318 m_pcEntropyCoder->resetBits(); 3311 3319 m_pcEntropyCoder->encodeQP( pcCU, 0, false );