Ignore:
Timestamp:
29 Aug 2013, 15:10:30 (11 years ago)
Author:
tech
Message:

Merged dev3: DEV-2.0-DEV3-KWU@589

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-DEV-2.0-dev0/source/Lib/TLibCommon/TComDataCU.cpp

    r600 r601  
    120120    m_dmmWedgeTabIdx[i] = NULL;
    121121  }
     122#if !SEC_DMM2_E0146
    122123  m_dmm2DeltaEnd    = NULL;
     124#endif
    123125  m_dmm3IntraTabIdx = NULL;
    124126#endif
     
    278280      m_dmmWedgeTabIdx[i]    = (UInt*)xMalloc(UInt, uiNumPartition);
    279281    }
     282#if !SEC_DMM2_E0146
    280283    m_dmm2DeltaEnd    = (Int* )xMalloc(Int,  uiNumPartition);
     284#endif
    281285    m_dmm3IntraTabIdx = (UInt*)xMalloc(UInt, uiNumPartition);
    282286#endif
     
    415419      if ( m_dmmWedgeTabIdx[i] ) { xFree( m_dmmWedgeTabIdx[i] ); m_dmmWedgeTabIdx[i] = NULL; }
    416420    }
     421#if !SEC_DMM2_E0146
    417422    if ( m_dmm2DeltaEnd    ) { xFree( m_dmm2DeltaEnd    ); m_dmm2DeltaEnd    = NULL; }
     423#endif
    418424    if ( m_dmm3IntraTabIdx ) { xFree( m_dmm3IntraTabIdx ); m_dmm3IntraTabIdx = NULL; }
    419425#endif
     
    640646      memset( m_dmmWedgeTabIdx[i] + firstElement, 0,                      numElements * sizeof( *m_dmmWedgeTabIdx[i] ) );
    641647    }
     648#if !SEC_DMM2_E0146
    642649    memset( m_dmm2DeltaEnd      + firstElement, 0,                        numElements * sizeof( *m_dmm2DeltaEnd    ) );
     650#endif
    643651    memset( m_dmm3IntraTabIdx   + firstElement, 0,                        numElements * sizeof( *m_dmm3IntraTabIdx ) );
    644652#endif
     
    821829        m_dmmWedgeTabIdx[i] [ui] = 0;
    822830      }
     831#if !SEC_DMM2_E0146
    823832      m_dmm2DeltaEnd    [ui] = 0;
     833#endif
    824834      m_dmm3IntraTabIdx [ui] = 0;
    825835#endif
     
    936946    memset( m_dmmWedgeTabIdx[i], 0, sizeof(UInt) * m_uiNumPartition );
    937947  }
     948#if !SEC_DMM2_E0146
    938949  memset( m_dmm2DeltaEnd   , 0, sizeof(Int ) * m_uiNumPartition );
     950#endif
    939951  memset( m_dmm3IntraTabIdx, 0, sizeof(UInt) * m_uiNumPartition );
    940952#endif
     
    10241036        m_dmmWedgeTabIdx[i] [ui] = pcCU->m_dmmWedgeTabIdx[i] [uiPartOffset+ui];
    10251037      }
     1038#if !SEC_DMM2_E0146
    10261039      m_dmm2DeltaEnd    [ui] = pcCU->m_dmm2DeltaEnd   [uiPartOffset+ui];
     1040#endif
    10271041      m_dmm3IntraTabIdx [ui] = pcCU->m_dmm3IntraTabIdx[uiPartOffset+ui];
    10281042#endif
     
    11821196    m_dmmWedgeTabIdx[i] = pcCU->getDmmWedgeTabIdx( i ) + uiPart;
    11831197  }
     1198#if !SEC_DMM2_E0146
    11841199  m_dmm2DeltaEnd    = pcCU->getDmm2DeltaEnd()    + uiPart;
     1200#endif
    11851201  m_dmm3IntraTabIdx = pcCU->getDmm3IntraTabIdx() + uiPart;
    11861202#endif
     
    13881404    memcpy( m_dmmWedgeTabIdx[i] + uiOffset, pcCU->getDmmWedgeTabIdx( i ), sizeof(UInt) * uiNumPartition );
    13891405  }
     1406#if !SEC_DMM2_E0146
    13901407  memcpy( m_dmm2DeltaEnd    + uiOffset, pcCU->getDmm2DeltaEnd()   , sizeof(Int ) * uiNumPartition );
     1408#endif
    13911409  memcpy( m_dmm3IntraTabIdx + uiOffset, pcCU->getDmm3IntraTabIdx(), sizeof(UInt) * uiNumPartition );
    13921410#endif
     
    15211539    memcpy( rpcCU->getDmmWedgeTabIdx( i ) + m_uiAbsIdxInLCU, m_dmmWedgeTabIdx[i], sizeof(UInt) * m_uiNumPartition );
    15221540  }
     1541#if !SEC_DMM2_E0146
    15231542  memcpy( rpcCU->getDmm2DeltaEnd()    + m_uiAbsIdxInLCU, m_dmm2DeltaEnd   , sizeof(Int ) * m_uiNumPartition );
     1543#endif
    15241544  memcpy( rpcCU->getDmm3IntraTabIdx() + m_uiAbsIdxInLCU, m_dmm3IntraTabIdx, sizeof(UInt) * m_uiNumPartition );
    15251545#endif
     
    16381658    memcpy( rpcCU->getDmmWedgeTabIdx( i ) + uiPartOffset, m_dmmWedgeTabIdx[i], sizeof(UInt) * uiQNumPart );
    16391659  }
     1660#if !SEC_DMM2_E0146
    16401661  memcpy( rpcCU->getDmm2DeltaEnd()    + uiPartOffset, m_dmm2DeltaEnd   , sizeof(Int ) * uiQNumPart );
     1662#endif
    16411663  memcpy( rpcCU->getDmm3IntraTabIdx() + uiPartOffset, m_dmm3IntraTabIdx, sizeof(UInt) * uiQNumPart );
    16421664#endif
     
    27132735  // check prediction mode
    27142736  UInt uiLumaPredMode = getLumaIntraDir( uiAbsPartIdx ); 
     2737#if LGE_SDC_REMOVE_DC_E0158
     2738  if( uiLumaPredMode == PLANAR_IDX || ( getDimType( uiLumaPredMode ) == DMM1_IDX && !isDimDeltaDC( uiLumaPredMode ) ) )
     2739#else
    27152740  if( uiLumaPredMode == DC_IDX || uiLumaPredMode == PLANAR_IDX || ( getDimType( uiLumaPredMode ) == DMM1_IDX && !isDimDeltaDC( uiLumaPredMode ) ) )
     2741#endif
    27162742    return true;
    27172743 
     
    63806406  for( UInt ui = 0; ui < uiCurrPartNumb; ui++ ) { m_dmmWedgeTabIdx[dmmType][uiAbsPartIdx+ui] = tabIdx; }
    63816407}
     6408#if !SEC_DMM2_E0146
    63826409Void  TComDataCU::setDmm2DeltaEndSubParts( Int iDelta, UInt uiAbsPartIdx, UInt uiDepth )
    63836410{
     
    63856412  for( UInt ui = 0; ui < uiCurrPartNumb; ui++ ) { m_dmm2DeltaEnd[uiAbsPartIdx+ui] = iDelta; }
    63866413}
     6414#endif
    63876415Void  TComDataCU::setDmm3IntraTabIdxSubParts( UInt uiTIdx, UInt uiAbsPartIdx, UInt uiDepth )
    63886416{
Note: See TracChangeset for help on using the changeset viewer.