Changeset 876 in 3DVCSoftware for branches/HTM-10.1-dev0/source/Lib/TLibDecoder/TDecCu.cpp

Timestamp:

27 Mar 2014, 18:52:26 (10 years ago)

Author:

tech

Message:

Cleanups part 1.

File:

• branches/HTM-10.1-dev0/source/Lib/TLibDecoder/TDecCu.cpp (modified) (2 diffs)

branches/HTM-10.1-dev0/source/Lib/TLibDecoder/TDecCu.cpp

@@ -339 +339 @@
       if( pcCU->getSlice()->getIsDepth())
       {
-#if SEC_DEPTH_DV_DERIVAITON_G0074
         DvInfo.bDV = m_ppcCU[uiDepth]->getDispforDepth(0, 0, &DvInfo);
-#else
-        DvInfo.bDV = m_ppcCU[uiDepth]->getDispNeighBlocks(0, 0, &DvInfo);
-#endif
       }
       else
@@ -414 +410 @@
     m_pcEntropyDecoder->decodeMergeIndex( pcCU, 0, uiAbsPartIdx, uiDepth );
     UInt uiMergeIndex = pcCU->getMergeIndex(uiAbsPartIdx);
-
-#if !SEC_IC_ARP_SIG_G0072
+#if H_3D_ARP
+    m_pcEntropyDecoder->decodeARPW( pcCU , uiAbsPartIdx , uiDepth );
+#endif
 #if H_3D_IC
     m_pcEntropyDecoder->decodeICFlag( pcCU, uiAbsPartIdx, uiDepth );
-#endif
-#endif
-#if H_3D_ARP
-    m_pcEntropyDecoder->decodeARPW( pcCU , uiAbsPartIdx , uiDepth );
-#endif
-#if SEC_IC_ARP_SIG_G0072
-#if H_3D_IC
-    m_pcEntropyDecoder->decodeICFlag( pcCU, uiAbsPartIdx, uiDepth );
-#endif
 #endif