Changeset 1429 in SHVCSoftware for branches/SHM-dev

Timestamp:

10 Aug 2015, 19:04:08 (9 years ago)

Author:

seregin

Message:

change determin to determine

Location:

branches/SHM-dev/source/Lib/TLibEncoder

Files:

• TEncGOP.cpp (modified) (3 diffs)
• TEncGOP.h (modified) (1 diff)

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

@@ -1815 +1815 @@
           Bool bSignalPPS = m_bSeqFirst;
           bSignalPPS |= m_pcCfg->getGOPSize() > 1 ? pocCurr % m_pcCfg->getIntraPeriod() == 0 : pocCurr % m_pcCfg->getFrameRate() == 0;
-          xDetermin3DAsymLUT( pcSlice, pcPic, refLayerIdc, m_pcCfg, bSignalPPS );
+          xDetermine3DAsymLUT( pcSlice, pcPic, refLayerIdc, m_pcCfg, bSignalPPS );
 
           // update PPS in TEncTop and TComPicSym classes
@@ -4123 +4123 @@
 
 #if CGS_3D_ASYMLUT
-Void TEncGOP::xDetermin3DAsymLUT( TComSlice * pSlice, TComPic * pCurPic, UInt refLayerIdc, TEncCfg * pCfg, Bool bSignalPPS )
+Void TEncGOP::xDetermine3DAsymLUT( TComSlice * pSlice, TComPic * pCurPic, UInt refLayerIdc, TEncCfg * pCfg, Bool bSignalPPS )
 {
   Int nCGSFlag = pSlice->getPPS()->getCGSFlag();
@@ -4142 +4142 @@
   dFrameLambda = 0.68 * pow (2, (QP  - SHIFT_QP) / 3.0) * (m_pcCfg->getGOPSize() > 1 && pSlice->isInterB()? 2 : 1);
 
-  if(m_pcCfg->getCGSLutSizeRDO() == 1 && (!bSignalPPS && (pSlice->getDepth() < nTLthres))) 
+  if(m_pcCfg->getCGSLutSizeRDO() == 1 && (!bSignalPPS && (pSlice->getDepth() < nTLthres)))
+  {
     dErrorUpdatedPPS = m_Enc3DAsymLUTPicUpdate.derive3DAsymLUT( pSlice , pCurPic , refLayerIdc , pCfg , bSignalPPS , m_pcEncTop->getElRapSliceTypeB(), dFrameLambda );
+  }
   else if (pSlice->getDepth() >= nTLthres)
+  {
     dErrorUpdatedPPS = MAX_DOUBLE;
+  }
   else // if (m_pcCfg->getCGSLutSizeRDO() = 0 || bSignalPPS)
 #endif   

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

@@ -286 +286 @@
 #endif
 #if CGS_3D_ASYMLUT
-  Void xDetermin3DAsymLUT( TComSlice * pSlice , TComPic * pCurPic , UInt refLayerIdc , TEncCfg * pCfg , Bool bSignalPPS );
+  Void xDetermine3DAsymLUT( TComSlice * pSlice , TComPic * pCurPic , UInt refLayerIdc , TEncCfg * pCfg , Bool bSignalPPS );
   Void downScalePic( TComPicYuv* pcYuvSrc, TComPicYuv* pcYuvDest, BitDepths& bitDepth, Int** posScalingFactor);
   Void downScaleComponent2x2( const Pel* pSrc, Pel* pDest, const Int iSrcStride, const Int iDestStride, const Int iSrcWidth, const Int iSrcHeight, const Int inputBitDepth, const Int outputBitDepth );