Changeset 81 in 3DVCSoftware for trunk/source/Lib/TLibCommon

Timestamp:

21 Jun 2012, 21:01:20 (12 years ago)

Author:

tech

Message:

Bug fixes:

• Residual Prediction
• VPS
• VSO
• Renderer

Location:

trunk/source/Lib/TLibCommon

Files:

• TComDataCU.cpp (modified) (1 diff)
• TComRdCost.cpp (modified) (2 diffs)
• TComRdCost.h (modified) (2 diffs)

trunk/source/Lib/TLibCommon/TComDataCU.cpp

@@ -2921 +2921 @@
                 break;
         default:
+#if HHI_FIX
+    assert ( m_pePartSize[uiTmpAbsPartIdx ] == SIZE_2Nx2N ); 
+#else
                 assert ( m_pePartSize[0] == SIZE_2Nx2N );
+#endif
                 riWidth = getWidth(uiTmpAbsPartIdx);      riHeight = getHeight(uiTmpAbsPartIdx);      ruiPartAddr = 0;
                 break;

trunk/source/Lib/TLibCommon/TComRdCost.cpp

@@ -273 +273 @@
     
     m_puiComponentCostOriginP = new UInt[ 4 * iSubPelSearchLimit ];
+#if HHI_FIX
+    m_puiMultiviewRegCostHorOrgP  = new UInt[ 4 * iSubPelSearchLimit ];
+    m_puiMultiviewRegCostVerOrgP  = new UInt[ 4 * iSubPelSearchLimit ];
+#endif
     iSubPelSearchLimit *= 2;
     
     m_puiComponentCost = m_puiComponentCostOriginP + iSubPelSearchLimit;
+#if HHI_FIX
+    m_puiMultiviewRegCostHor = m_puiMultiviewRegCostHorOrgP + iSubPelSearchLimit;
+    m_puiMultiviewRegCostVer = m_puiMultiviewRegCostVerOrgP + iSubPelSearchLimit;
+#endif
     
     for( Int n = -iSubPelSearchLimit; n < iSubPelSearchLimit; n++)
     {
       m_puiComponentCost[n] = xGetComponentBits( n );
+#if HHI_FIX
+      m_puiMultiviewRegCostHor[n] = xGetComponentBits( n );  // first version
+      m_puiMultiviewRegCostVer[n] = xGetComponentBits( n );  // first version
+#endif
     }
   }
@@ -291 +303 @@
     m_puiComponentCostOriginP = NULL;
   }
+#if HHI_FIX
+  if( m_puiMultiviewRegCostHorOrgP )
+    {
+      delete [] m_puiMultiviewRegCostHorOrgP;
+      m_puiMultiviewRegCostHorOrgP = NULL;
+    }
+  if( m_puiMultiviewRegCostVerOrgP )
+  {
+    delete [] m_puiMultiviewRegCostVerOrgP;
+    m_puiMultiviewRegCostVerOrgP = NULL;
+  }
+#endif
 }
 #endif

trunk/source/Lib/TLibCommon/TComRdCost.h

@@ -219 +219 @@
 #endif
   UInt    xGetComponentBits( Int iVal );
-  Void    getMotionCost( Bool bSad, Int iAdd ) { m_uiCost = (bSad ? m_uiLambdaMotionSAD + iAdd : m_uiLambdaMotionSSE + iAdd); }
+  Void    getMotionCost( Bool bSad, Int iAdd ) 
+{ 
+     m_uiCost = (bSad ? m_uiLambdaMotionSAD + iAdd : m_uiLambdaMotionSSE + iAdd); 
+#if HHI_FIX
+    m_uiLambdaMVReg = ( bSad ? m_uiLambdaMVRegSAD         : m_uiLambdaMVRegSSE         );
+#endif
+   }
   Void    setPredictor( TComMv& rcMv )
   {
@@ -270 +276 @@
   __inline UInt     getMultiviewRegCost  ( Int x, Int y )
   {
+#if FIX203
+    return m_uiLambdaMVReg * getBits(x, y) >> 16;
+#else
     return ( ( m_uiLambdaMVReg * ( m_puiHorRegCost[ x * ( 1 << m_iCostScale ) ] + m_puiVerRegCost[ y * ( 1 << m_iCostScale ) ] ) ) >> 16 );
+#endif
   }