Changeset 1246 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibEncoder/TEncSbac.cpp

Timestamp:

14 Jul 2015, 00:26:07 (9 years ago)

Author:

seregin

Message:

port rev 4240

File:

• branches/SHM-dev/source/Lib/TLibEncoder/TEncSbac.cpp (modified) (6 diffs)

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

@@ -109 +109 @@
   SliceType eSliceType  = m_pcSlice->getSliceType();
 
-  SliceType encCABACTableIdx = m_pcSlice->getEncCABACTableIdx();;
+  SliceType encCABACTableIdx = m_pcSlice->getEncCABACTableIdx();
   if (!m_pcSlice->isIntra() && (encCABACTableIdx==B_SLICE || encCABACTableIdx==P_SLICE) && m_pcSlice->getPPS()->getCabacInitPresentFlag())
   {
@@ -407 +407 @@
   m_pcBinIf->copyState( pSrc->m_pcBinIf );
   if (isLuma(chType))
+  {
     this->m_cCUIntraPredSCModel      .copyFrom( &pSrc->m_cCUIntraPredSCModel       );
+  }
   else
+  {
     this->m_cCUChromaPredSCModel     .copyFrom( &pSrc->m_cCUChromaPredSCModel      );
+  }
 }
 
@@ -613 +617 @@
 {
   if( uiDepth == g_uiMaxCUDepth - g_uiAddCUDepth )
+  {
     return;
+  }
 
   UInt uiCtx           = pcCU->getCtxSplitFlag( uiAbsPartIdx, uiDepth );
@@ -832 +838 @@
   TComDataCU *pcCU = rTu.getCU();
 
-  if( isLuma(compID) || !pcCU->getSlice()->getPPS()->getUseCrossComponentPrediction() ) return;
+  if( isLuma(compID) || !pcCU->getSlice()->getPPS()->getUseCrossComponentPrediction() )
+  {
+    return;
+  }
 
   const UInt uiAbsPartIdx = rTu.GetAbsPartIdxTU();
@@ -1266 +1275 @@
       beValid = false;
       if ( (!pcCU->isIntra(uiAbsPartIdx)) && pcCU->isRDPCMEnabled(uiAbsPartIdx))
+      {
         codeExplicitRdpcmMode( rTu, compID);
+      }
     }
     else
@@ -1326 +1337 @@
       uiNumSig--;
     }
-  }
-  while ( uiNumSig > 0 );
+  } while ( uiNumSig > 0 );
 
   // Code position of last coefficient