Changeset 1186 in 3DVCSoftware


Ignore:
Timestamp:
7 Apr 2015, 22:02:58 (9 years ago)
Author:
tech
Message:

Clean up. Part 2.

Location:
branches/HTM-14.0-dev0/source/Lib
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-14.0-dev0/source/Lib/TLibDecoder/TDecEntropy.cpp

    r1185 r1186  
    448448      decodeMergeIndex( pcCU, uiPartIdx, uiSubPartIdx, uiDepth );
    449449      UInt uiMergeIndex = pcCU->getMergeIndex(uiSubPartIdx);
    450       if ( pcCU->getSlice()->getPPS()->getLog2ParallelMergeLevelMinus2() && ePartSize != SIZE_2Nx2N && pcSubCU->getWidth( 0 ) <= 8 && pcCU->getDBBPFlag(uiAbsPartIdx) == false )
     450      if ( pcCU->getSlice()->getPPS()->getLog2ParallelMergeLevelMinus2() && ePartSize != SIZE_2Nx2N && pcSubCU->getWidth( 0 ) <= 8 )
    451451      {
    452452        pcSubCU->setPartSizeSubParts( SIZE_2Nx2N, 0, uiDepth );
  • branches/HTM-14.0-dev0/source/Lib/TLibEncoder/TEncCu.cpp

    r1185 r1186  
    15801580  m_pcEntropyCoder->encodeDIS( pcCU, uiAbsPartIdx );
    15811581  if(!pcCU->getDISFlag(uiAbsPartIdx))
    1582 #endif
    1583   {
     1582  {
     1583#endif
     1584
    15841585  m_pcEntropyCoder->encodePredMode( pcCU, uiAbsPartIdx );
    15851586 
     
    16021603  // prediction Info ( Intra : direction mode, Inter : Mv, reference idx )
    16031604  m_pcEntropyCoder->encodePredInfo( pcCU, uiAbsPartIdx );
     1605#if H_3D
    16041606  m_pcEntropyCoder->encodeDBBPFlag( pcCU, uiAbsPartIdx );
     1607#endif
    16051608#if H_3D_DIM_SDC
    16061609  m_pcEntropyCoder->encodeSDCFlag( pcCU, uiAbsPartIdx, false );
Note: See TracChangeset for help on using the changeset viewer.