Changeset 554 in 3DVCSoftware for branches/HTM-DEV-2.0-dev3-Samsung/source/Lib/TLibCommon/TComDataCU.cpp
- Timestamp:
- 6 Aug 2013, 02:51:16 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-DEV-2.0-dev3-Samsung/source/Lib/TLibCommon/TComDataCU.cpp
r542 r554 120 120 m_dmmWedgeTabIdx[i] = NULL; 121 121 } 122 #if !SEC_DMM2_E0146 122 123 m_dmm2DeltaEnd = NULL; 124 #endif 123 125 m_dmm3IntraTabIdx = NULL; 124 126 #endif … … 264 266 m_dmmWedgeTabIdx[i] = (UInt*)xMalloc(UInt, uiNumPartition); 265 267 } 268 #if !SEC_DMM2_E0146 266 269 m_dmm2DeltaEnd = (Int* )xMalloc(Int, uiNumPartition); 270 #endif 267 271 m_dmm3IntraTabIdx = (UInt*)xMalloc(UInt, uiNumPartition); 268 272 #endif … … 389 393 if ( m_dmmWedgeTabIdx[i] ) { xFree( m_dmmWedgeTabIdx[i] ); m_dmmWedgeTabIdx[i] = NULL; } 390 394 } 395 #if !SEC_DMM2_E0146 391 396 if ( m_dmm2DeltaEnd ) { xFree( m_dmm2DeltaEnd ); m_dmm2DeltaEnd = NULL; } 397 #endif 392 398 if ( m_dmm3IntraTabIdx ) { xFree( m_dmm3IntraTabIdx ); m_dmm3IntraTabIdx = NULL; } 393 399 #endif … … 596 602 memset( m_dmmWedgeTabIdx[i] + firstElement, 0, numElements * sizeof( *m_dmmWedgeTabIdx[i] ) ); 597 603 } 604 #if !SEC_DMM2_E0146 598 605 memset( m_dmm2DeltaEnd + firstElement, 0, numElements * sizeof( *m_dmm2DeltaEnd ) ); 606 #endif 599 607 memset( m_dmm3IntraTabIdx + firstElement, 0, numElements * sizeof( *m_dmm3IntraTabIdx ) ); 600 608 #endif … … 767 775 m_dmmWedgeTabIdx[i] [ui] = 0; 768 776 } 777 #if !SEC_DMM2_E0146 769 778 m_dmm2DeltaEnd [ui] = 0; 779 #endif 770 780 m_dmm3IntraTabIdx [ui] = 0; 771 781 #endif … … 872 882 memset( m_dmmWedgeTabIdx[i], 0, sizeof(UInt) * m_uiNumPartition ); 873 883 } 884 #if !SEC_DMM2_E0146 874 885 memset( m_dmm2DeltaEnd , 0, sizeof(Int ) * m_uiNumPartition ); 886 #endif 875 887 memset( m_dmm3IntraTabIdx, 0, sizeof(UInt) * m_uiNumPartition ); 876 888 #endif … … 947 959 m_dmmWedgeTabIdx[i] [ui] = pcCU->m_dmmWedgeTabIdx[i] [uiPartOffset+ui]; 948 960 } 961 #if !SEC_DMM2_E0146 949 962 m_dmm2DeltaEnd [ui] = pcCU->m_dmm2DeltaEnd [uiPartOffset+ui]; 963 #endif 950 964 m_dmm3IntraTabIdx [ui] = pcCU->m_dmm3IntraTabIdx[uiPartOffset+ui]; 951 965 #endif … … 1095 1109 m_dmmWedgeTabIdx[i] = pcCU->getDmmWedgeTabIdx( i ) + uiPart; 1096 1110 } 1111 #if !SEC_DMM2_E0146 1097 1112 m_dmm2DeltaEnd = pcCU->getDmm2DeltaEnd() + uiPart; 1113 #endif 1098 1114 m_dmm3IntraTabIdx = pcCU->getDmm3IntraTabIdx() + uiPart; 1099 1115 #endif … … 1282 1298 memcpy( m_dmmWedgeTabIdx[i] + uiOffset, pcCU->getDmmWedgeTabIdx( i ), sizeof(UInt) * uiNumPartition ); 1283 1299 } 1300 #if !SEC_DMM2_E0146 1284 1301 memcpy( m_dmm2DeltaEnd + uiOffset, pcCU->getDmm2DeltaEnd() , sizeof(Int ) * uiNumPartition ); 1302 #endif 1285 1303 memcpy( m_dmm3IntraTabIdx + uiOffset, pcCU->getDmm3IntraTabIdx(), sizeof(UInt) * uiNumPartition ); 1286 1304 #endif … … 1402 1420 memcpy( rpcCU->getDmmWedgeTabIdx( i ) + m_uiAbsIdxInLCU, m_dmmWedgeTabIdx[i], sizeof(UInt) * m_uiNumPartition ); 1403 1421 } 1422 #if !SEC_DMM2_E0146 1404 1423 memcpy( rpcCU->getDmm2DeltaEnd() + m_uiAbsIdxInLCU, m_dmm2DeltaEnd , sizeof(Int ) * m_uiNumPartition ); 1424 #endif 1405 1425 memcpy( rpcCU->getDmm3IntraTabIdx() + m_uiAbsIdxInLCU, m_dmm3IntraTabIdx, sizeof(UInt) * m_uiNumPartition ); 1406 1426 #endif … … 1509 1529 memcpy( rpcCU->getDmmWedgeTabIdx( i ) + uiPartOffset, m_dmmWedgeTabIdx[i], sizeof(UInt) * uiQNumPart ); 1510 1530 } 1531 #if !SEC_DMM2_E0146 1511 1532 memcpy( rpcCU->getDmm2DeltaEnd() + uiPartOffset, m_dmm2DeltaEnd , sizeof(Int ) * uiQNumPart ); 1533 #endif 1512 1534 memcpy( rpcCU->getDmm3IntraTabIdx() + uiPartOffset, m_dmm3IntraTabIdx, sizeof(UInt) * uiQNumPart ); 1513 1535 #endif … … 5434 5456 for( UInt ui = 0; ui < uiCurrPartNumb; ui++ ) { m_dmmWedgeTabIdx[dmmType][uiAbsPartIdx+ui] = tabIdx; } 5435 5457 } 5458 #if !SEC_DMM2_E0146 5436 5459 Void TComDataCU::setDmm2DeltaEndSubParts( Int iDelta, UInt uiAbsPartIdx, UInt uiDepth ) 5437 5460 { … … 5439 5462 for( UInt ui = 0; ui < uiCurrPartNumb; ui++ ) { m_dmm2DeltaEnd[uiAbsPartIdx+ui] = iDelta; } 5440 5463 } 5464 #endif 5441 5465 Void TComDataCU::setDmm3IntraTabIdxSubParts( UInt uiTIdx, UInt uiAbsPartIdx, UInt uiDepth ) 5442 5466 {
Note: See TracChangeset for help on using the changeset viewer.