Changeset 1186 in 3DVCSoftware for branches

Timestamp:

7 Apr 2015, 22:02:58 (10 years ago)

Author:

tech

Message:

Clean up. Part 2.

Location:

branches/HTM-14.0-dev0/source/Lib

Files:

• TLibDecoder/TDecEntropy.cpp (modified) (1 diff)
• TLibEncoder/TEncCu.cpp (modified) (2 diffs)

branches/HTM-14.0-dev0/source/Lib/TLibDecoder/TDecEntropy.cpp

@@ -448 +448 @@
       decodeMergeIndex( pcCU, uiPartIdx, uiSubPartIdx, uiDepth );
       UInt uiMergeIndex = pcCU->getMergeIndex(uiSubPartIdx);
-      if ( pcCU->getSlice()->getPPS()->getLog2ParallelMergeLevelMinus2() && ePartSize != SIZE_2Nx2N && pcSubCU->getWidth( 0 ) <= 8 && pcCU->getDBBPFlag(uiAbsPartIdx) == false )
+      if ( pcCU->getSlice()->getPPS()->getLog2ParallelMergeLevelMinus2() && ePartSize != SIZE_2Nx2N && pcSubCU->getWidth( 0 ) <= 8 ) 
       {
         pcSubCU->setPartSizeSubParts( SIZE_2Nx2N, 0, uiDepth );

branches/HTM-14.0-dev0/source/Lib/TLibEncoder/TEncCu.cpp

@@ -1580 +1580 @@
   m_pcEntropyCoder->encodeDIS( pcCU, uiAbsPartIdx );
   if(!pcCU->getDISFlag(uiAbsPartIdx))
-#endif
-  {
+  {
+#endif
+
   m_pcEntropyCoder->encodePredMode( pcCU, uiAbsPartIdx );
   
@@ -1602 +1603 @@
   // prediction Info ( Intra : direction mode, Inter : Mv, reference idx )
   m_pcEntropyCoder->encodePredInfo( pcCU, uiAbsPartIdx );
+#if H_3D
   m_pcEntropyCoder->encodeDBBPFlag( pcCU, uiAbsPartIdx );
+#endif
 #if H_3D_DIM_SDC
   m_pcEntropyCoder->encodeSDCFlag( pcCU, uiAbsPartIdx, false );