Changeset 950 in 3DVCSoftware for trunk/source/Lib/TLibEncoder/TEncSbac.cpp
- Timestamp:
- 25 Apr 2014, 12:38:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/Lib/TLibEncoder/TEncSbac.cpp
r884 r950 93 93 , m_cDdcDataSCModel ( 1, 1, NUM_DDC_DATA_CTX , m_contextModels + m_numContextModels, m_numContextModels) 94 94 , m_cAngleFlagSCModel ( 1, 1, NUM_ANGLE_FLAG_CTX , m_contextModels + m_numContextModels, m_numContextModels) 95 #if H_3D_DIM_DMM 95 #if H_3D_DIM_DMM && !MTK_DMM_SIMP_CODE_H0092 96 96 , m_cDmm1DataSCModel ( 1, 1, NUM_DMM1_DATA_CTX , m_contextModels + m_numContextModels, m_numContextModels) 97 97 #endif … … 169 169 m_cDdcDataSCModel.initBuffer ( eSliceType, iQp, (UChar*)INIT_DDC_DATA ); 170 170 m_cAngleFlagSCModel.initBuffer ( eSliceType, iQp, (UChar*)INIT_ANGLE_FLAG ); 171 #if H_3D_DIM_DMM 171 #if H_3D_DIM_DMM && !MTK_DMM_SIMP_CODE_H0092 172 172 m_cDmm1DataSCModel.initBuffer ( eSliceType, iQp, (UChar*)INIT_DMM1_DATA ); 173 173 #endif … … 255 255 curCost += m_cDdcDataSCModel.calcCost ( curSliceType, qp, (UChar*)INIT_DDC_DATA ); 256 256 curCost += m_cAngleFlagSCModel.calcCost ( curSliceType, qp, (UChar*)INIT_ANGLE_FLAG ); 257 #if H_3D_DIM_DMM 257 #if H_3D_DIM_DMM && !MTK_DMM_SIMP_CODE_H0092 258 258 curCost += m_cDmm1DataSCModel.calcCost ( curSliceType, qp, (UChar*)INIT_DMM1_DATA ); 259 259 #endif … … 319 319 m_cDdcDataSCModel.initBuffer ( eSliceType, iQp, (UChar*)INIT_DDC_DATA ); 320 320 m_cAngleFlagSCModel.initBuffer ( eSliceType, iQp, (UChar*)INIT_ANGLE_FLAG ); 321 #if H_3D_DIM_DMM 321 #if H_3D_DIM_DMM && !MTK_DMM_SIMP_CODE_H0092 322 322 m_cDmm1DataSCModel.initBuffer ( eSliceType, iQp, (UChar*)INIT_DMM1_DATA ); 323 323 #endif … … 482 482 m_pcBinIf->encodeBin( 1, rcSCModel ); 483 483 UInt uiCount = 0; 484 #if QC_SIMP_DELTADC_CODING_H0131 485 Bool bNoExGo = ( uiSymbol < 3 ); 486 487 while( --uiSymbol && ++uiCount < 3 ) 488 #else 484 489 Bool bNoExGo = (uiSymbol < 13); 485 490 486 491 while( --uiSymbol && ++uiCount < 13 ) 492 #endif 487 493 { 488 494 m_pcBinIf->encodeBin( 1, rcSCModel ); … … 520 526 for ( Int i = 0; i < iNumBit; i++ ) 521 527 { 528 #if MTK_DMM_SIMP_CODE_H0092 529 m_pcBinIf->encodeBinEP( ( uiTabIdx >> i ) & 1 ); 530 #else 522 531 m_pcBinIf->encodeBin( ( uiTabIdx >> i ) & 1, m_cDmm1DataSCModel.get(0, 0, 0) ); 532 #endif 523 533 } 524 534 } … … 1233 1243 if( ( pcCU->getSlice()->getSPS()->getMaxCUWidth() >> pcCU->getDepth( absPartIdx ) ) < 64 ) //DMM and HEVC intra modes are both allowed 1234 1244 { 1245 #if LGE_SIMP_DIM_NOT_PRESENT_FLAG_CODING_H0119_H0135 1246 m_pcBinIf->encodeBin( isDimMode( dir ) ? 0 : 1, m_cAngleFlagSCModel.get( 0, 0, 0 ) ); 1247 #else 1235 1248 m_pcBinIf->encodeBin( isDimMode( dir ) ? 0 : 1, m_cAngleFlagSCModel.get( 0, 0, pcCU->getCtxAngleFlag( absPartIdx ) ) ); 1249 #endif 1236 1250 } 1237 1251 if( isDimMode( dir ) ) … … 2313 2327 dimDeltaDC = isDimDeltaDC( dir ); 2314 2328 } 2315 2329 #if MTK_DELTA_DC_FLAG_ONE_CONTEXT_H0084_H0100_H0113 2330 m_pcBinIf->encodeBin( dimDeltaDC, m_cDdcFlagSCModel.get( 0, 0, 0 ) ); 2331 #else 2316 2332 m_pcBinIf->encodeBin( dimDeltaDC, m_cDdcFlagSCModel.get( 0, 0, uiNumSegments-1 ) ); 2333 #endif 2317 2334 } 2318 2335 else //all-zero inter SDC is not allowed … … 2356 2373 Void TEncSbac::codeDBBPFlag( TComDataCU* pcCU, UInt uiAbsPartIdx ) 2357 2374 { 2375 #if !MTK_DBBP_SIGNALING_H0094 2358 2376 PartSize ePartSize = pcCU->getPartitionSize( uiAbsPartIdx ); 2359 2377 AOF( ePartSize == RWTH_DBBP_PACK_MODE ); 2378 #endif 2360 2379 AOF( pcCU->getSlice()->getVPS()->getUseDBBP(pcCU->getSlice()->getLayerIdInVps()) ); 2361 2380 AOF( !pcCU->getSlice()->getIsDepth() );
Note: See TracChangeset for help on using the changeset viewer.