Changeset 571 in 3DVCSoftware for branches/HTM-DEV-2.0-dev2-LG/source/Lib/TLibEncoder/TEncCu.cpp

Timestamp:

14 Aug 2013, 10:39:58 (11 years ago)

Author:

lg

Message:

• integration of JCT3V-E0156

File:

• branches/HTM-DEV-2.0-dev2-LG/source/Lib/TLibEncoder/TEncCu.cpp (modified) (3 diffs)

branches/HTM-DEV-2.0-dev2-LG/source/Lib/TLibEncoder/TEncCu.cpp

@@ -1527 +1527 @@
   m_pcEntropyCoder->encodeARPW( pcCU , uiAbsPartIdx );
 #endif
+#if LGE_INTER_SDC_E0156
+  m_pcEntropyCoder->encodeInterSDCFlag( pcCU, uiAbsPartIdx, false );
+#endif
 
   // Encode Coefficients
@@ -1817 +1820 @@
 
           rpcTempCU->setSkipFlagSubParts( rpcTempCU->getQtRootCbf(0) == 0, 0, uhDepth );
+#if LGE_INTER_SDC_E0156
+          TComDataCU *rpcTempCUPre = rpcTempCU;
+#endif
           Int orgQP = rpcTempCU->getQP( 0 );
           xCheckDQP( rpcTempCU );
           xCheckBestMode(rpcBestCU, rpcTempCU, uhDepth);
+#if LGE_INTER_SDC_E0156
+          if( rpcTempCU->getSlice()->getVPS()->getInterSDCFlag( rpcTempCU->getSlice()->getLayerIdInVps() ) && rpcTempCU->getSlice()->getIsDepth() && !uiNoResidual )
+          {
+            if( rpcTempCU != rpcTempCUPre )
+            {
+              rpcTempCU->initEstData( uhDepth, orgQP );
+              rpcTempCU->copyPartFrom( rpcBestCU, 0, uhDepth );
+            }
+            rpcTempCU->setSkipFlagSubParts( false, 0, uhDepth );
+            rpcTempCU->setTrIdxSubParts( 0, 0, uhDepth );
+            rpcTempCU->setCbfSubParts( 1, 1, 1, 0, uhDepth );
+#if H_3D_VSO //M2
+            if( m_pcRdCost->getUseRenModel() )
+            { //Reset
+              UInt  uiWidth     = m_ppcOrigYuv[uhDepth]->getWidth    ();
+              UInt  uiHeight    = m_ppcOrigYuv[uhDepth]->getHeight   ();
+              Pel*  piSrc       = m_ppcOrigYuv[uhDepth]->getLumaAddr ();
+              UInt  uiSrcStride = m_ppcOrigYuv[uhDepth]->getStride   ();
+              m_pcRdCost->setRenModelData( rpcTempCU, 0, piSrc, uiSrcStride, uiWidth, uiHeight );
+            }
+#endif
+            m_pcPredSearch->encodeResAndCalcRdInterSDCCU( rpcTempCU, 
+              m_ppcOrigYuv[uhDepth], 
+              ( rpcTempCU != rpcTempCUPre ) ? m_ppcPredYuvBest[uhDepth] : m_ppcPredYuvTemp[uhDepth], 
+              m_ppcResiYuvTemp[uhDepth], 
+              m_ppcRecoYuvTemp[uhDepth], 
+              uhDepth );
+
+            xCheckDQP( rpcTempCU );
+            xCheckBestMode( rpcBestCU, rpcTempCU, uhDepth );
+          }
+#endif
           rpcTempCU->initEstData( uhDepth, orgQP );
 
       if( m_pcEncCfg->getUseFastDecisionForMerge() && !bestIsSkip )
       {
+#if LGE_INTER_SDC_E0156
+        if( rpcTempCU->getSlice()->getVPS()->getInterSDCFlag( rpcTempCU->getSlice()->getLayerIdInVps() ) )
+          bestIsSkip = !rpcBestCU->getSDCFlag( 0 ) && ( rpcBestCU->getQtRootCbf(0) == 0 );
+        else
+#endif
         bestIsSkip = rpcBestCU->getQtRootCbf(0) == 0;
       }
@@ -2017 +2060 @@
 #endif
   rpcTempCU->getTotalCost()  = m_pcRdCost->calcRdCost( rpcTempCU->getTotalBits(), rpcTempCU->getTotalDistortion() );
-
+#if LGE_INTER_SDC_E0156
+  TComDataCU *rpcTempCUPre = rpcTempCU;
+#endif
   xCheckDQP( rpcTempCU );
   xCheckBestMode(rpcBestCU, rpcTempCU, uhDepth);
+#if LGE_INTER_SDC_E0156
+  if( rpcTempCU->getSlice()->getVPS()->getInterSDCFlag( rpcTempCU->getSlice()->getLayerIdInVps() ) && rpcTempCU->getSlice()->getIsDepth() )
+  {
+    if( rpcTempCU != rpcTempCUPre )
+    {
+      Int orgQP = rpcBestCU->getQP( 0 );
+      rpcTempCU->initEstData( uhDepth, orgQP );
+      rpcTempCU->copyPartFrom( rpcBestCU, 0, uhDepth );
+    }
+    rpcTempCU->setSkipFlagSubParts( false, 0, uhDepth );
+    rpcTempCU->setTrIdxSubParts( 0, 0, uhDepth );
+    rpcTempCU->setCbfSubParts( 1, 1, 1, 0, uhDepth );
+#if H_3D_VSO // M3
+    if( m_pcRdCost->getUseRenModel() )
+    {
+      UInt  uiWidth     = m_ppcOrigYuv[uhDepth]->getWidth ( );
+      UInt  uiHeight    = m_ppcOrigYuv[uhDepth]->getHeight( );
+      Pel*  piSrc       = m_ppcOrigYuv[uhDepth]->getLumaAddr( );
+      UInt  uiSrcStride = m_ppcOrigYuv[uhDepth]->getStride();
+      m_pcRdCost->setRenModelData( rpcTempCU, 0, piSrc, uiSrcStride, uiWidth, uiHeight );
+    }
+#endif
+
+    m_pcPredSearch->encodeResAndCalcRdInterSDCCU( rpcTempCU, 
+      m_ppcOrigYuv[uhDepth],
+      ( rpcTempCU != rpcTempCUPre ) ? m_ppcPredYuvBest[uhDepth] : m_ppcPredYuvTemp[uhDepth],
+      m_ppcResiYuvTemp[uhDepth],
+      m_ppcRecoYuvTemp[uhDepth],
+      uhDepth );
+
+    xCheckDQP( rpcTempCU );
+    xCheckBestMode( rpcBestCU, rpcTempCU, uhDepth );
+  }
+#endif
 #if H_3D_ARP
   }