Changeset 554 in 3DVCSoftware for branches/HTM-DEV-2.0-dev3-Samsung/source/Lib/TLibDecoder
- Timestamp:
- 6 Aug 2013, 02:51:16 (11 years ago)
- Location:
- branches/HTM-DEV-2.0-dev3-Samsung/source/Lib/TLibDecoder
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-DEV-2.0-dev3-Samsung/source/Lib/TLibDecoder/TDecSbac.cpp
r541 r554 89 89 #if H_3D_DIM_DMM 90 90 , m_cDmm1DataSCModel ( 1, 1, NUM_DMM1_DATA_CTX , m_contextModels + m_numContextModels, m_numContextModels) 91 #if !SEC_DMM2_E0146 91 92 , m_cDmm2DataSCModel ( 1, 1, NUM_DMM2_DATA_CTX , m_contextModels + m_numContextModels, m_numContextModels) 93 #endif 92 94 , m_cDmm3DataSCModel ( 1, 1, NUM_DMM3_DATA_CTX , m_contextModels + m_numContextModels, m_numContextModels) 93 95 #endif … … 172 174 #if H_3D_DIM_DMM 173 175 m_cDmm1DataSCModel.initBuffer ( sliceType, qp, (UChar*)INIT_DMM1_DATA ); 176 #if !SEC_DMM2_E0146 174 177 m_cDmm2DataSCModel.initBuffer ( sliceType, qp, (UChar*)INIT_DMM2_DATA ); 178 #endif 175 179 m_cDmm3DataSCModel.initBuffer ( sliceType, qp, (UChar*)INIT_DMM3_DATA ); 176 180 #endif … … 241 245 #if H_3D_DIM_DMM 242 246 m_cDmm1DataSCModel.initBuffer ( eSliceType, iQp, (UChar*)INIT_DMM1_DATA ); 247 #if !SEC_DMM2_E0146 243 248 m_cDmm2DataSCModel.initBuffer ( eSliceType, iQp, (UChar*)INIT_DMM2_DATA ); 249 #endif 244 250 m_cDmm3DataSCModel.initBuffer ( eSliceType, iQp, (UChar*)INIT_DMM3_DATA ); 245 251 #endif … … 423 429 ruiTabIdx = uiIdx; 424 430 } 431 #if !SEC_DMM2_E0146 425 432 Void TDecSbac::xParseDmm2Offset( Int& riOffset ) 426 433 { … … 448 455 riOffset = iDeltaEnd; 449 456 } 457 #endif 450 458 Void TDecSbac::xParseDmm3WedgeIdx( UInt& ruiIntraIdx, Int iNumBit ) 451 459 { … … 1139 1147 pcCU->setDmmWedgeTabIdxSubParts( uiTabIdx, dimType, absPartIdx, depth ); 1140 1148 } break; 1149 #if !SEC_DMM2_E0146 1141 1150 case( DMM2_IDX ): 1142 1151 { … … 1145 1154 pcCU->setDmm2DeltaEndSubParts( iOffset, absPartIdx, depth ); 1146 1155 } break; 1156 #endif 1147 1157 case( DMM3_IDX ): 1148 1158 { … … 1268 1278 { 1269 1279 binNum = 0; 1280 #if SEC_DMM2_E0146 1281 while( symbol && binNum < 2 ) 1282 #else 1270 1283 while( symbol && binNum < 3 ) 1284 #endif 1271 1285 { 1272 1286 ctxDepthMode = puIdx*3 + 2; … … 1284 1298 else if( modeCode == 6 ) { dir = (2*DMM3_IDX+DIM_OFFSET); sdcFlag = 0;} 1285 1299 else if( modeCode == 14 ) { dir = DC_IDX; sdcFlag = 1;} 1300 #if SEC_DMM2_E0146 1301 else if( modeCode == 15 ) { dir = (2* RBC_IDX+DIM_OFFSET); sdcFlag = 0;} 1302 #else 1286 1303 else if( modeCode == 30 ) { dir = (2* RBC_IDX+DIM_OFFSET); sdcFlag = 0;} 1287 1304 else if( modeCode == 31 ) { dir = (2*DMM2_IDX+DIM_OFFSET); sdcFlag = 0;} 1305 #endif 1288 1306 } 1289 1307 pcCU->setLumaIntraDirSubParts( (UChar)dir, absPartIdx, depth ); -
branches/HTM-DEV-2.0-dev3-Samsung/source/Lib/TLibDecoder/TDecSbac.h
r531 r554 102 102 #if H_3D_DIM_DMM 103 103 Void xParseDmm1WedgeIdx ( UInt& ruiTabIdx, Int iNumBit ); 104 #if !SEC_DMM2_E0146 104 105 Void xParseDmm2Offset ( Int& riOffset ); 106 #endif 105 107 Void xParseDmm3WedgeIdx ( UInt& ruiIntraIdx, Int iNumBit ); 106 108 #endif … … 210 212 #if H_3D_DIM_DMM 211 213 ContextModel3DBuffer m_cDmm1DataSCModel; 214 #if !SEC_DMM2_E0146 212 215 ContextModel3DBuffer m_cDmm2DataSCModel; 216 #endif 213 217 ContextModel3DBuffer m_cDmm3DataSCModel; 214 218 #endif
Note: See TracChangeset for help on using the changeset viewer.