Ignore:
Timestamp:
3 Sep 2013, 17:46:48 (11 years ago)
Author:
hhi
Message:

SEC_DMM2_E0146_HHIFIX: Fix for SEC_DMM2_E0146, now including all DMM2 related code.

File:
1 edited

Legend:

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

    r608 r612  
    120120    m_dmmWedgeTabIdx[i] = NULL;
    121121  }
    122 #if !SEC_DMM2_E0146
     122#if !SEC_DMM2_E0146_HHIFIX
    123123  m_dmm2DeltaEnd    = NULL;
    124124#endif
     
    280280      m_dmmWedgeTabIdx[i]    = (UInt*)xMalloc(UInt, uiNumPartition);
    281281    }
    282 #if !SEC_DMM2_E0146
     282#if !SEC_DMM2_E0146_HHIFIX
    283283    m_dmm2DeltaEnd    = (Int* )xMalloc(Int,  uiNumPartition);
    284284#endif
     
    419419      if ( m_dmmWedgeTabIdx[i] ) { xFree( m_dmmWedgeTabIdx[i] ); m_dmmWedgeTabIdx[i] = NULL; }
    420420    }
    421 #if !SEC_DMM2_E0146
     421#if !SEC_DMM2_E0146_HHIFIX
    422422    if ( m_dmm2DeltaEnd    ) { xFree( m_dmm2DeltaEnd    ); m_dmm2DeltaEnd    = NULL; }
    423423#endif
     
    646646      memset( m_dmmWedgeTabIdx[i] + firstElement, 0,                      numElements * sizeof( *m_dmmWedgeTabIdx[i] ) );
    647647    }
    648 #if !SEC_DMM2_E0146
     648#if !SEC_DMM2_E0146_HHIFIX
    649649    memset( m_dmm2DeltaEnd      + firstElement, 0,                        numElements * sizeof( *m_dmm2DeltaEnd    ) );
    650650#endif
     
    829829        m_dmmWedgeTabIdx[i] [ui] = 0;
    830830      }
    831 #if !SEC_DMM2_E0146
     831#if !SEC_DMM2_E0146_HHIFIX
    832832      m_dmm2DeltaEnd    [ui] = 0;
    833833#endif
     
    946946    memset( m_dmmWedgeTabIdx[i], 0, sizeof(UInt) * m_uiNumPartition );
    947947  }
    948 #if !SEC_DMM2_E0146
     948#if !SEC_DMM2_E0146_HHIFIX
    949949  memset( m_dmm2DeltaEnd   , 0, sizeof(Int ) * m_uiNumPartition );
    950950#endif
     
    10361036        m_dmmWedgeTabIdx[i] [ui] = pcCU->m_dmmWedgeTabIdx[i] [uiPartOffset+ui];
    10371037      }
    1038 #if !SEC_DMM2_E0146
     1038#if !SEC_DMM2_E0146_HHIFIX
    10391039      m_dmm2DeltaEnd    [ui] = pcCU->m_dmm2DeltaEnd   [uiPartOffset+ui];
    10401040#endif
     
    11961196    m_dmmWedgeTabIdx[i] = pcCU->getDmmWedgeTabIdx( i ) + uiPart;
    11971197  }
    1198 #if !SEC_DMM2_E0146
     1198#if !SEC_DMM2_E0146_HHIFIX
    11991199  m_dmm2DeltaEnd    = pcCU->getDmm2DeltaEnd()    + uiPart;
    12001200#endif
     
    14041404    memcpy( m_dmmWedgeTabIdx[i] + uiOffset, pcCU->getDmmWedgeTabIdx( i ), sizeof(UInt) * uiNumPartition );
    14051405  }
    1406 #if !SEC_DMM2_E0146
     1406#if !SEC_DMM2_E0146_HHIFIX
    14071407  memcpy( m_dmm2DeltaEnd    + uiOffset, pcCU->getDmm2DeltaEnd()   , sizeof(Int ) * uiNumPartition );
    14081408#endif
     
    15391539    memcpy( rpcCU->getDmmWedgeTabIdx( i ) + m_uiAbsIdxInLCU, m_dmmWedgeTabIdx[i], sizeof(UInt) * m_uiNumPartition );
    15401540  }
    1541 #if !SEC_DMM2_E0146
     1541#if !SEC_DMM2_E0146_HHIFIX
    15421542  memcpy( rpcCU->getDmm2DeltaEnd()    + m_uiAbsIdxInLCU, m_dmm2DeltaEnd   , sizeof(Int ) * m_uiNumPartition );
    15431543#endif
     
    16581658    memcpy( rpcCU->getDmmWedgeTabIdx( i ) + uiPartOffset, m_dmmWedgeTabIdx[i], sizeof(UInt) * uiQNumPart );
    16591659  }
    1660 #if !SEC_DMM2_E0146
     1660#if !SEC_DMM2_E0146_HHIFIX
    16611661  memcpy( rpcCU->getDmm2DeltaEnd()    + uiPartOffset, m_dmm2DeltaEnd   , sizeof(Int ) * uiQNumPart );
    16621662#endif
     
    64066406  for( UInt ui = 0; ui < uiCurrPartNumb; ui++ ) { m_dmmWedgeTabIdx[dmmType][uiAbsPartIdx+ui] = tabIdx; }
    64076407}
    6408 #if !SEC_DMM2_E0146
     6408#if !SEC_DMM2_E0146_HHIFIX
    64096409Void  TComDataCU::setDmm2DeltaEndSubParts( Int iDelta, UInt uiAbsPartIdx, UInt uiDepth )
    64106410{
Note: See TracChangeset for help on using the changeset viewer.