Ticket #580: HM-7.0-dev_r2455_lossless_coding.patch

Lib/TLibCommon/TComDataCU.cpp

@@ -1975 +1975 @@
 Bool TComDataCU::isLosslessCoded(UInt absPartIdx)
 {
 #if CU_LEVEL_TRANSQUANT_BYPASS
-  return getCUTransquantBypass (absPartIdx);
+  return (getSlice()->getPPS()->getTransquantBypassEnableFlag() && getCUTransquantBypass (absPartIdx));
 #else
   return ( getSlice()->getSPS()->getUseLossless() && ((getQP(absPartIdx) + getSlice()->getSPS()->getQpBDOffsetY()) == 0) );
 #endif

Lib/TLibEncoder/TEncCu.cpp

@@ -1282 +1282 @@
   }
   UChar uhDepth = rpcTempCU->getDepth( 0 );
   rpcTempCU->setPartSizeSubParts( SIZE_2Nx2N, 0, uhDepth ); // interprets depth relative to LCU level
+#if CU_LEVEL_TRANSQUANT_BYPASS
+  rpcTempCU->setCUTransquantBypassSubParts( m_pcEncCfg->getCUTransquantBypassFlagValue(), 0, uhDepth );
+#endif
   rpcTempCU->getInterMergeCandidates( 0, 0, uhDepth, cMvFieldNeighbours,uhInterDirNeighbours, numValidMergeCand );
 
   Int mergeCandBuffer[MRG_MAX_NUM_CANDS]={0};