Changeset 612 in 3DVCSoftware for branches/HTM-8.0-dev0/source/Lib/TLibCommon/TComPrediction.cpp
- Timestamp:
- 3 Sep 2013, 17:46:48 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-8.0-dev0/source/Lib/TLibCommon/TComPrediction.cpp
r608 r612 456 456 dmmSegmentation = &(g_dmmWedgeLists[ g_aucConvertToBit[iWidth] ][ pcCU->getDmmWedgeTabIdx( dimType, uiAbsPartIdx ) ]); 457 457 } break; 458 #if !SEC_DMM2_E0146 458 #if !SEC_DMM2_E0146_HHIFIX 459 459 case( DMM2_IDX ): 460 460 { … … 2773 2773 2774 2774 #if H_3D_DIM_DMM 2775 #if !SEC_DMM2_E0146_HHIFIX 2775 2776 UInt TComPrediction::xPredWedgeFromIntra( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiWidth, UInt uiHeight, Int iDeltaEnd ) 2776 2777 { … … 2784 2785 { 2785 2786 UInt dimType = getDimType( pcTempCU->getLumaIntraDir( uiTempPartIdx ) ); 2786 #if SEC_DMM2_E01462787 if( DMM1_IDX == dimType || DMM3_IDX == dimType )2788 #else2789 2787 if( DMM1_IDX == dimType || DMM2_IDX == dimType || DMM3_IDX == dimType ) 2790 #endif2791 2788 { 2792 2789 // get offset between current and reference block … … 2813 2810 { 2814 2811 UInt dimType = getDimType( pcTempCU->getLumaIntraDir( uiTempPartIdx ) ); 2815 #if SEC_DMM2_E01462816 if( DMM1_IDX == dimType || DMM3_IDX == dimType )2817 #else2818 2812 if( DMM1_IDX == dimType || DMM2_IDX == dimType || DMM3_IDX == dimType ) 2819 #endif2820 2813 { 2821 2814 // get offset between current and reference block … … 2849 2842 return 0; 2850 2843 } 2844 #endif 2851 2845 2852 2846 UInt TComPrediction::xPredWedgeFromTex( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiWidth, UInt uiHeight, UInt intraTabIdx ) … … 2914 2908 } 2915 2909 2910 #if !SEC_DMM2_E0146_HHIFIX 2916 2911 Void TComPrediction::xGetBlockOffset( TComDataCU* pcCU, UInt uiAbsPartIdx, TComDataCU* pcRefCU, UInt uiRefAbsPartIdx, UInt& ruiOffsetX, UInt& ruiOffsetY ) 2917 2912 { … … 3302 3297 } 3303 3298 #endif 3299 #endif 3304 3300 #if H_3D_DIM_RBC 3305 3301 Void TComPrediction::xDeltaDCQuantScaleUp( TComDataCU* pcCU, Pel& rDeltaDC )
Note: See TracChangeset for help on using the changeset viewer.