Changeset 175 in 3DVCSoftware for branches/HTM-4.1-dev1-HHI/source/Lib
- Timestamp:
- 9 Nov 2012, 15:31:44 (12 years ago)
- Location:
- branches/HTM-4.1-dev1-HHI/source/Lib
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-4.1-dev1-HHI/source/Lib/TLibCommon/TComDataCU.h
r169 r175 236 236 Bool m_bDecSubCu; ///< indicates decoder-mode 237 237 Double m_dTotalCost; ///< sum of partition RD costs 238 #if FIX_RDO_NEGDIST 239 Dist m_uiTotalDistortion; ///< sum of partition distortion 240 #else 238 241 UInt m_uiTotalDistortion; ///< sum of partition distortion 242 #endif 239 243 UInt m_uiTotalBits; ///< sum of partition bits 240 244 UInt m_uiTotalBins; ///< sum of partition bins … … 736 740 737 741 Double& getTotalCost() { return m_dTotalCost; } 742 #if FIX_RDO_NEGDIST 743 Dist& getTotalDistortion() { return m_uiTotalDistortion; } 744 #else 738 745 UInt& getTotalDistortion() { return m_uiTotalDistortion; } 746 #endif 739 747 UInt& getTotalBits() { return m_uiTotalBits; } 740 748 UInt& getTotalNumPart() { return m_uiNumPartition; } -
branches/HTM-4.1-dev1-HHI/source/Lib/TLibCommon/TypeDef.h
r174 r175 60 60 #define FIX_LGE_IVMP_PARALLEL_MERGE_B0136 1 61 61 #define TMVP_DEPTH_SWITCH 1 // related to JCT3V-B0092 62 62 #define FIX_RDO_NEGDIST 1 63 63 64 64 #define DV_DERIVATION_PARALLEL_B0096 1 //JCT3V-B0096, enable parallel derivation of disparity vector -
branches/HTM-4.1-dev1-HHI/source/Lib/TLibEncoder/TEncSearch.cpp
r163 r175 1830 1830 UInt uiQNumParts = pcCU->getTotalNumPart() >> 2; 1831 1831 UInt uiWidthBit = pcCU->getIntraSizeIdx(0); 1832 #if FIX_RDO_NEGDIST 1833 Dist uiOverallDistY = 0; 1834 Dist uiOverallDistC = 0; 1835 #else 1832 1836 UInt uiOverallDistY = 0; 1833 1837 UInt uiOverallDistC = 0; 1838 #endif 1834 1839 UInt CandNum; 1835 1840 Double CandCostList[ FAST_UDI_MAX_RDMODE_NUM ]; … … 2098 2103 2099 2104 UInt uiBestPUMode = 0; 2105 #if FIX_RDO_NEGDIST 2106 Dist uiBestPUDistY = 0; 2107 Dist uiBestPUDistC = 0; 2108 #else 2100 2109 UInt uiBestPUDistY = 0; 2101 2110 UInt uiBestPUDistC = 0; 2111 #endif 2102 2112 Double dBestPUCost = MAX_DOUBLE; 2103 2113 for( UInt uiMode = 0; uiMode < numModesForFullRD; uiMode++ ) … … 5215 5225 } 5216 5226 5227 #if FIX_RDO_NEGDIST 5228 Dist uiDistU = 0; 5229 Dist uiDistV = 0; 5230 #else 5217 5231 UInt uiDistU = 0; 5218 5232 UInt uiDistV = 0; 5233 #endif 5219 5234 if( bCodeChroma ) 5220 5235 { … … 5254 5269 #endif 5255 5270 5271 #if FIX_RDO_NEGDIST 5272 const Dist uiNonzeroDistU = m_pcRdCost->getDistPart( m_pcQTTempTComYuv[uiQTTempAccessLayer].getCbAddr( absTUPartIdxC), m_pcQTTempTComYuv[uiQTTempAccessLayer].getCStride(), 5273 pcResi->getCbAddr( absTUPartIdxC), pcResi->getCStride(), trWidthC, trHeightC 5274 5275 #else 5256 5276 const UInt uiNonzeroDistU = m_pcRdCost->getDistPart( m_pcQTTempTComYuv[uiQTTempAccessLayer].getCbAddr( absTUPartIdxC), m_pcQTTempTComYuv[uiQTTempAccessLayer].getCStride(), 5257 5277 pcResi->getCbAddr( absTUPartIdxC), pcResi->getCStride(), trWidthC, trHeightC 5278 #endif 5258 5279 #if WEIGHTED_CHROMA_DISTORTION 5259 5280 , true … … 5340 5361 m_pcTrQuant->invtransformNxN( TEXT_CHROMA,REG_DCT, pcResiCurrV, m_pcQTTempTComYuv[uiQTTempAccessLayer].getCStride(), pcCoeffCurrV, trWidthC, trHeightC, scalingListType ); 5341 5362 #endif 5342 5363 #if FIX_RDO_NEGDIST 5364 const Dist uiNonzeroDistV = m_pcRdCost->getDistPart( m_pcQTTempTComYuv[uiQTTempAccessLayer].getCrAddr( absTUPartIdxC ), m_pcQTTempTComYuv[uiQTTempAccessLayer].getCStride(), 5365 pcResi->getCrAddr( absTUPartIdxC ), pcResi->getCStride(), trWidthC, trHeightC 5366 #else 5343 5367 const UInt uiNonzeroDistV = m_pcRdCost->getDistPart( m_pcQTTempTComYuv[uiQTTempAccessLayer].getCrAddr( absTUPartIdxC ), m_pcQTTempTComYuv[uiQTTempAccessLayer].getCStride(), 5344 5368 pcResi->getCrAddr( absTUPartIdxC ), pcResi->getCStride(), trWidthC, trHeightC 5369 #endif 5345 5370 #if WEIGHTED_CHROMA_DISTORTION 5346 5371 , true
Note: See TracChangeset for help on using the changeset viewer.