Changeset 655 in 3DVCSoftware for trunk/source/Lib/TLibDecoder/TDecCu.cpp


Ignore:
Timestamp:
23 Oct 2013, 23:01:30 (10 years ago)
Author:
tech
Message:

Merged 8.1-Cleanup@654

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibDecoder/TDecCu.cpp

    r622 r655  
    458458  m_pcEntropyDecoder->decodeARPW    ( pcCU , uiAbsPartIdx , uiDepth ); 
    459459#endif 
    460 #if LGE_INTER_SDC_E0156
     460#if H_3D_INTER_SDC
    461461  m_pcEntropyDecoder->decodeInterSDCFlag( pcCU, uiAbsPartIdx, uiDepth );
    462462#endif
     
    525525  {
    526526    case MODE_INTER:
    527 #if LGE_INTER_SDC_E0156
     527#if H_3D_INTER_SDC
    528528      if( m_ppcCU[uiDepth]->getInterSDCFlag( 0 ) )
    529529      {
     
    534534#endif
    535535      xReconInter( m_ppcCU[uiDepth], uiDepth );
    536 #if LGE_INTER_SDC_E0156
     536#if H_3D_INTER_SDC
    537537      }
    538538#endif
     
    578578}
    579579
    580 #if LGE_INTER_SDC_E0156
     580#if H_3D_INTER_SDC
    581581Void TDecCu::xReconInterSDC( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
    582582{
     
    895895  // get DC prediction for each segment
    896896  Pel apDCPredValues[2];
    897 #if KWU_SDC_SIMPLE_DC_E0117
    898897  m_pcPrediction->analyzeSegmentsSDC(piPred, uiStride, uiWidth, apDCPredValues, uiNumSegments, pbMask, uiMaskStride, uiLumaPredMode);
    899 #else
    900   m_pcPrediction->analyzeSegmentsSDC(piPred, uiStride, uiWidth, apDCPredValues, uiNumSegments, pbMask, uiMaskStride);
    901 #endif
    902898 
    903899  // reconstruct residual based on mask + DC residuals
Note: See TracChangeset for help on using the changeset viewer.