Changeset 81 in 3DVCSoftware for trunk/source/Lib/TLibCommon
- Timestamp:
- 21 Jun 2012, 21:01:20 (13 years ago)
- Location:
- trunk/source/Lib/TLibCommon
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/Lib/TLibCommon/TComDataCU.cpp
r77 r81 2921 2921 break; 2922 2922 default: 2923 #if HHI_FIX 2924 assert ( m_pePartSize[uiTmpAbsPartIdx ] == SIZE_2Nx2N ); 2925 #else 2923 2926 assert ( m_pePartSize[0] == SIZE_2Nx2N ); 2927 #endif 2924 2928 riWidth = getWidth(uiTmpAbsPartIdx); riHeight = getHeight(uiTmpAbsPartIdx); ruiPartAddr = 0; 2925 2929 break; -
trunk/source/Lib/TLibCommon/TComRdCost.cpp
r56 r81 273 273 274 274 m_puiComponentCostOriginP = new UInt[ 4 * iSubPelSearchLimit ]; 275 #if HHI_FIX 276 m_puiMultiviewRegCostHorOrgP = new UInt[ 4 * iSubPelSearchLimit ]; 277 m_puiMultiviewRegCostVerOrgP = new UInt[ 4 * iSubPelSearchLimit ]; 278 #endif 275 279 iSubPelSearchLimit *= 2; 276 280 277 281 m_puiComponentCost = m_puiComponentCostOriginP + iSubPelSearchLimit; 282 #if HHI_FIX 283 m_puiMultiviewRegCostHor = m_puiMultiviewRegCostHorOrgP + iSubPelSearchLimit; 284 m_puiMultiviewRegCostVer = m_puiMultiviewRegCostVerOrgP + iSubPelSearchLimit; 285 #endif 278 286 279 287 for( Int n = -iSubPelSearchLimit; n < iSubPelSearchLimit; n++) 280 288 { 281 289 m_puiComponentCost[n] = xGetComponentBits( n ); 290 #if HHI_FIX 291 m_puiMultiviewRegCostHor[n] = xGetComponentBits( n ); // first version 292 m_puiMultiviewRegCostVer[n] = xGetComponentBits( n ); // first version 293 #endif 282 294 } 283 295 } … … 291 303 m_puiComponentCostOriginP = NULL; 292 304 } 305 #if HHI_FIX 306 if( m_puiMultiviewRegCostHorOrgP ) 307 { 308 delete [] m_puiMultiviewRegCostHorOrgP; 309 m_puiMultiviewRegCostHorOrgP = NULL; 310 } 311 if( m_puiMultiviewRegCostVerOrgP ) 312 { 313 delete [] m_puiMultiviewRegCostVerOrgP; 314 m_puiMultiviewRegCostVerOrgP = NULL; 315 } 316 #endif 293 317 } 294 318 #endif -
trunk/source/Lib/TLibCommon/TComRdCost.h
r56 r81 219 219 #endif 220 220 UInt xGetComponentBits( Int iVal ); 221 Void getMotionCost( Bool bSad, Int iAdd ) { m_uiCost = (bSad ? m_uiLambdaMotionSAD + iAdd : m_uiLambdaMotionSSE + iAdd); } 221 Void getMotionCost( Bool bSad, Int iAdd ) 222 { 223 m_uiCost = (bSad ? m_uiLambdaMotionSAD + iAdd : m_uiLambdaMotionSSE + iAdd); 224 #if HHI_FIX 225 m_uiLambdaMVReg = ( bSad ? m_uiLambdaMVRegSAD : m_uiLambdaMVRegSSE ); 226 #endif 227 } 222 228 Void setPredictor( TComMv& rcMv ) 223 229 { … … 270 276 __inline UInt getMultiviewRegCost ( Int x, Int y ) 271 277 { 278 #if FIX203 279 return m_uiLambdaMVReg * getBits(x, y) >> 16; 280 #else 272 281 return ( ( m_uiLambdaMVReg * ( m_puiHorRegCost[ x * ( 1 << m_iCostScale ) ] + m_puiVerRegCost[ y * ( 1 << m_iCostScale ) ] ) ) >> 16 ); 282 #endif 273 283 } 274 284
Note: See TracChangeset for help on using the changeset viewer.