Ticket #651: 20120806-bug-fix.patch

source/Lib/TLibDecoder/TDecCu.cpp

@@ -287 +287 @@
     pcCU->setQPSubParts( pcCU->getRefQP(uiAbsPartIdx), uiAbsPartIdx, uiDepth ); // set QP to default QP
   }
 
-  if (pcCU->getSlice()->getPPS()->getTransquantBypassEnableFlag())
+  if (pcCU->getSlice()->getPPS()->getTransquantBypassEnableFlag() && pcCU->getNumSucIPCM() == 0 )
   {
     m_pcEntropyDecoder->decodeCUTransquantBypassFlag( pcCU, uiAbsPartIdx, uiDepth );
   }

source/Lib/TLibEncoder/TEncCu.cpp

@@ -1470 +1470 @@
 {
   UInt uiDepth = rpcTempCU->getDepth( 0 );
 
+  rpcTempCU->setCUTransquantBypassSubParts(false, 0, uiDepth);
+
 #if SKIP_FLAG
   rpcTempCU->setSkipFlagSubParts( false, 0, uiDepth );
 #endif

source/Lib/TLibEncoder/TEncEntropy.cpp

@@ -134 +134 @@
 
 Void TEncEntropy::encodeCUTransquantBypassFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD )
 {
+  if( bRD )
+  {
+    uiAbsPartIdx = 0;
+  }
+  if( !bRD )
+  {
+    if( pcCU->getLastCUSucIPCMFlag() && pcCU->getIPCMFlag(uiAbsPartIdx) )
+    {
+      return;
+    }
+  }
   m_pcEntropyCoderIf->codeCUTransquantBypassFlag( pcCU, uiAbsPartIdx );
 }