Changeset 554 in 3DVCSoftware for branches/HTM-DEV-2.0-dev3-Samsung/source/Lib/TLibEncoder
- Timestamp:
- 6 Aug 2013, 02:51:16 (12 years ago)
- Location:
- branches/HTM-DEV-2.0-dev3-Samsung/source/Lib/TLibEncoder
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-DEV-2.0-dev3-Samsung/source/Lib/TLibEncoder/TEncSbac.cpp
r541 r554 95 95 #if H_3D_DIM_DMM 96 96 , m_cDmm1DataSCModel ( 1, 1, NUM_DMM1_DATA_CTX , m_contextModels + m_numContextModels, m_numContextModels) 97 #if !SEC_DMM2_E0146 97 98 , m_cDmm2DataSCModel ( 1, 1, NUM_DMM2_DATA_CTX , m_contextModels + m_numContextModels, m_numContextModels) 99 #endif 98 100 , m_cDmm3DataSCModel ( 1, 1, NUM_DMM3_DATA_CTX , m_contextModels + m_numContextModels, m_numContextModels) 99 101 #endif … … 170 172 #if H_3D_DIM_DMM 171 173 m_cDmm1DataSCModel.initBuffer ( eSliceType, iQp, (UChar*)INIT_DMM1_DATA ); 174 #if !SEC_DMM2_E0146 172 175 m_cDmm2DataSCModel.initBuffer ( eSliceType, iQp, (UChar*)INIT_DMM2_DATA ); 176 #endif 173 177 m_cDmm3DataSCModel.initBuffer ( eSliceType, iQp, (UChar*)INIT_DMM3_DATA ); 174 178 #endif … … 249 253 #if H_3D_DIM_DMM 250 254 curCost += m_cDmm1DataSCModel.calcCost ( curSliceType, qp, (UChar*)INIT_DMM1_DATA ); 255 #if !SEC_DMM2_E0146 251 256 curCost += m_cDmm2DataSCModel.calcCost ( curSliceType, qp, (UChar*)INIT_DMM2_DATA ); 257 #endif 252 258 curCost += m_cDmm3DataSCModel.calcCost ( curSliceType, qp, (UChar*)INIT_DMM3_DATA ); 253 259 #endif … … 319 325 #if H_3D_DIM_DMM 320 326 m_cDmm1DataSCModel.initBuffer ( eSliceType, iQp, (UChar*)INIT_DMM1_DATA ); 327 #if !SEC_DMM2_E0146 321 328 m_cDmm2DataSCModel.initBuffer ( eSliceType, iQp, (UChar*)INIT_DMM2_DATA ); 329 #endif 322 330 m_cDmm3DataSCModel.initBuffer ( eSliceType, iQp, (UChar*)INIT_DMM3_DATA ); 323 331 #endif … … 521 529 } 522 530 531 #if !SEC_DMM2_E0146 523 532 Void TEncSbac::xCodeDmm2Offset( Int iOffset ) 524 533 { … … 537 546 } 538 547 } 548 #endif 539 549 540 550 Void TEncSbac::xCodeDmm3WedgeIdx( UInt uiIntraIdx, Int iNumBit ) … … 615 625 UInt uiMaxResidualBits = g_bitDepthY; 616 626 #endif 627 617 628 assert( uiMaxResidualBits <= g_bitDepthY ); 618 629 … … 1196 1207 xCodeDmm1WedgeIdx( pcCU->getDmmWedgeTabIdx( dimType, absPartIdx ), g_dmm1TabIdxBits[pcCU->getIntraSizeIdx(absPartIdx)] ); 1197 1208 } break; 1209 #if !SEC_DMM2_E0146 1198 1210 case( DMM2_IDX ): 1199 1211 { 1200 1212 xCodeDmm2Offset( pcCU->getDmm2DeltaEnd( absPartIdx ) ); 1201 1213 } break; 1214 #endif 1202 1215 case( DMM3_IDX ): 1203 1216 { … … 1248 1261 Void TEncSbac::codeIntraDepthMode( TComDataCU* pcCU, UInt absPartIdx ) 1249 1262 { 1263 #if SEC_DMM2_E0146 1264 UInt codeWordTable[3][8] = {{0, 0, 0, 2, 0,6, 0, 7},{0, 2, 3, 4, 5, 6, 14, 15},{0, 2, 0, 0, 0, 0, 3, 0}}; 1265 UInt codeWordLenTable[3][8] = {{0, 1, 0, 2, 0,3, 0, 3},{2, 3, 3, 3, 3, 3, 4, 4},{1, 2, 0, 0, 0, 0, 2, 0}}; 1266 #else 1250 1267 UInt codeWordTable[3][9] = {{0, 0, 0, 2, 0,6, 0, 0, 7},{0, 2, 3, 4, 5, 6, 14, 31, 30},{0, 2, 0, 0, 0, 0, 3, 0, 0}}; 1251 1268 UInt codeWordLenTable[3][9] = {{0, 1, 0, 2, 0,3, 0, 0, 3},{2, 3, 3, 3, 3, 3, 4, 5, 5},{1, 2, 0, 0, 0, 0, 2, 0, 0}}; 1269 #endif 1252 1270 UInt dir = pcCU->getLumaIntraDir( absPartIdx ); 1253 1271 UInt puIdx = (pcCU->getWidth(absPartIdx) == 64) ? 2 : ( (pcCU->getPartitionSize(absPartIdx) == SIZE_NxN && pcCU->getWidth(absPartIdx) == 8) ? 0 : 1 ); … … 1265 1283 case DMM4_IDX: codeIdx = 4; break; 1266 1284 case DMM3_IDX: codeIdx = 5; break; 1285 #if SEC_DMM2_E0146 1286 case RBC_IDX: codeIdx = 7; break; 1287 #else 1267 1288 case DMM2_IDX: codeIdx = 7; break; 1268 1289 case RBC_IDX: codeIdx = 8; break; 1290 #endif 1269 1291 default: break; 1270 1292 } -
branches/HTM-DEV-2.0-dev3-Samsung/source/Lib/TLibEncoder/TEncSbac.h
r531 r554 121 121 #if H_3D_DIM_DMM 122 122 Void xCodeDmm1WedgeIdx ( UInt uiTabIdx, Int iNumBit ); 123 #if !SEC_DMM2_E0146 123 124 Void xCodeDmm2Offset ( Int iOffset ); 125 #endif 124 126 Void xCodeDmm3WedgeIdx ( UInt uiIntraIdx, Int iNumBit ); 125 127 #endif … … 250 252 #if H_3D_DIM_DMM 251 253 ContextModel3DBuffer m_cDmm1DataSCModel; 254 #if !SEC_DMM2_E0146 252 255 ContextModel3DBuffer m_cDmm2DataSCModel; 256 #endif 253 257 ContextModel3DBuffer m_cDmm3DataSCModel; 254 258 #endif -
branches/HTM-DEV-2.0-dev3-Samsung/source/Lib/TLibEncoder/TEncSearch.cpp
r537 r554 2849 2849 biSegmentation = &(g_dmmWedgeLists[(g_aucConvertToBit[uiWidth])][uiTabIdx]); 2850 2850 } break; 2851 #if !SEC_DMM2_E0146 2851 2852 case( DMM2_IDX ): 2852 2853 { … … 2860 2861 } 2861 2862 } break; 2863 #endif 2862 2864 case( DMM3_IDX ): 2863 2865 { … … 7060 7062 } 7061 7063 7064 #if !SEC_DMM2_E0146 7062 7065 Void TEncSearch::xSearchDmm2Wedge( TComDataCU* pcCU, UInt uiAbsPtIdx, Pel* piRef, UInt uiRefStride, UInt uiWidth, UInt uiHeight, UInt& ruiTabIdx, Int& riWedgeDeltaEnd ) 7063 7066 { … … 7125 7128 return; 7126 7129 } 7130 #endif 7127 7131 7128 7132 Void TEncSearch::xSearchDmm3Wedge( TComDataCU* pcCU, UInt uiAbsPtIdx, Pel* piRef, UInt uiRefStride, UInt uiWidth, UInt uiHeight, UInt& ruiTabIdx, UInt& ruiIntraTabIdx ) -
branches/HTM-DEV-2.0-dev3-Samsung/source/Lib/TLibEncoder/TEncSearch.h
r531 r554 342 342 Void xSearchDmmDeltaDCs ( TComDataCU* pcCU, UInt uiAbsPtIdx, Pel* piOrig, Pel* piPredic, UInt uiStride, Bool* biSegPattern, Int patternStride, UInt uiWidth, UInt uiHeight, Pel& rDeltaDC1, Pel& rDeltaDC2 ); 343 343 Void xSearchDmm1Wedge ( TComDataCU* pcCU, UInt uiAbsPtIdx, Pel* piRef, UInt uiRefStride, UInt uiWidth, UInt uiHeight, UInt& ruiTabIdx ); 344 #if !SEC_DMM2_E0146 344 345 Void xSearchDmm2Wedge ( TComDataCU* pcCU, UInt uiAbsPtIdx, Pel* piRef, UInt uiRefStride, UInt uiWidth, UInt uiHeight, UInt& ruiTabIdx, Int& riWedgeDeltaEnd ); 346 #endif 345 347 Void xSearchDmm3Wedge ( TComDataCU* pcCU, UInt uiAbsPtIdx, Pel* piRef, UInt uiRefStride, UInt uiWidth, UInt uiHeight, UInt& ruiTabIdx, UInt& ruiIntraTabIdx ); 346 348 #endif
Note: See TracChangeset for help on using the changeset viewer.