Changeset 1389 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibEncoder

Timestamp:

4 Aug 2015, 03:02:06 (9 years ago)

Author:

seregin

Message:

port rev 4525

Location:

branches/SHM-dev/source/Lib/TLibEncoder

Files:

• TEncSearch.cpp (modified) (2 diffs)
• TEncSlice.cpp (modified) (2 diffs)
• TEncSlice.h (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -2824 +2824 @@
 Void TEncSearch::IPCMSearch( TComDataCU* pcCU, TComYuv* pcOrgYuv, TComYuv* pcPredYuv, TComYuv* pcResiYuv, TComYuv* pcRecoYuv )
 {
-  UInt        uiDepth      = pcCU->getDepth(0);
-  const UInt  uiDistortion = 0;
-  UInt        uiBits;
+  UInt              uiDepth      = pcCU->getDepth(0);
+  const Distortion  uiDistortion = 0;
+  UInt              uiBits;
 
   Double dCost;
@@ -3857 +3857 @@
   uiCost = m_pcRdCost->getDistPart( pcCU->getSlice()->getSPS()->getBitDepth(CHANNEL_TYPE_LUMA), pcTemplateCand->getAddr(COMPONENT_Y, uiPartAddr), pcTemplateCand->getStride(COMPONENT_Y), pcOrgYuv->getAddr(COMPONENT_Y, uiPartAddr), pcOrgYuv->getStride(COMPONENT_Y), iSizeX, iSizeY, COMPONENT_Y, DF_SAD );
 #endif
-  uiCost = (UInt) m_pcRdCost->calcRdCost( m_auiMVPIdxCost[iMVPIdx][iMVPNum], uiCost, false, DF_SAD );
+  uiCost = (UInt) m_pcRdCost->calcRdCost( m_auiMVPIdxCost[iMVPIdx][iMVPNum], uiCost, DF_SAD );
   return uiCost;
 }

branches/SHM-dev/source/Lib/TLibEncoder/TEncSlice.cpp

@@ -688 +688 @@
 
     // compute RD cost and choose the best
-    Double dPicRdCost = m_pcRdCost->calcRdCost64( m_uiPicTotalBits, uiPicDist, true, DF_SSE_FRAME); // NOTE: Is the 'true' parameter really necessary?
+    Double dPicRdCost = m_pcRdCost->calcRdCost( (Double)m_uiPicTotalBits, (Double)uiPicDist, DF_SSE_FRAME);
 
     if ( dPicRdCost < dPicRdCostBest )
@@ -1376 +1376 @@
 #if SVC_EXTENSION
 #if JCTVC_M0259_LAMBDAREFINEMENT
-Double TEncSlice::xCalEnhLambdaFactor( Double deltaQP , Double beta )
-{
-  double tmp = beta * pow( 2.0 , deltaQP / 6 );
-  double gamma = tmp / ( tmp + 1 );
-  return( gamma );
+Double TEncSlice::xCalEnhLambdaFactor( Double deltaQP, Double beta )
+{
+  Double tmp = beta * pow( 2.0 , deltaQP / 6 );
+  Double gamma = tmp / ( tmp + 1 );
+  return gamma;
 }
 #endif

branches/SHM-dev/source/Lib/TLibEncoder/TEncSlice.h

@@ -147 +147 @@
 
 #if SVC_EXTENSION && JCTVC_M0259_LAMBDAREFINEMENT
-  Double  xCalEnhLambdaFactor( Double deltaQP , Double beta );
+  Double  xCalEnhLambdaFactor( Double deltaQP, Double beta );
 #endif
 };