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

Timestamp:

16 Apr 2014, 01:40:04 (11 years ago)

Author:

qualcomm

Message:

minor cleaning

Location:

branches/SHM-6-dev/source/Lib/TLibEncoder

Files:

• TEnc3DAsymLUT.cpp (modified) (1 diff)
• TEncCavlc.cpp (modified) (1 diff)
• TEncGOP.cpp (modified) (3 diffs)

branches/SHM-6-dev/source/Lib/TLibEncoder/TEnc3DAsymLUT.cpp

@@ -390 +390 @@
   if( pSlice->getBaseColPic( pSlice->getInterLayerPredLayerIdc( 0 ) )->getSlice( 0 )->isIntra() )
     nPartNumLog2 = xGetMaxPartNumLog2();
-  if( m_nPrevFrameBit[nSliceType][nSliceTempLevel] && pSlice->getPPS()->getCGSFlag() == Q0048_CGS_3D_ASYMLUT_PPSUPDATE  ) 
+  if( m_nPrevFrameBit[nSliceType][nSliceTempLevel] && pSlice->getPPS()->getCGSFlag() ) 
   {
     Double dBitCost = 1.0 * m_nPrevFrameCGSBit[nSliceType][nSliceTempLevel] / m_nPrevFrameBit[nSliceType][nSliceTempLevel];

branches/SHM-6-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -275 +275 @@
       UInt uiPos = getNumberOfWrittenBits();
       WRITE_FLAG( pcPPS->getCGSFlag() , "colour_mapping_enabled_flag" );
-      if( pcPPS->getCGSFlag() == Q0048_CGS_3D_ASYMLUT_PPSUPDATE )
+      if( pcPPS->getCGSFlag() )
       {
         assert( pc3DAsymLUT != NULL );

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

@@ -955 +955 @@
 #if Q0048_CGS_3D_ASYMLUT 
         TComPicYuv* pBaseColRec = pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec();
-        if( pcSlice->getPPS()->getCGSFlag() != Q0048_CGS_3D_ASYMLUT_OFF)
+        if( pcSlice->getPPS()->getCGSFlag() )
         {
           if(g_posScalingFactor[refLayerIdc][0] < (1<<16) || g_posScalingFactor[refLayerIdc][1] < (1<<16)) //if(pcPic->isSpatialEnhLayer(refLayerIdc))
@@ -1996 +1996 @@
     }
 #if Q0048_CGS_3D_ASYMLUT
-    else if( m_pcCfg->getCGSFlag() == Q0048_CGS_3D_ASYMLUT_PPSUPDATE && pcSlice->getLayerId() && pcSlice->getCGSOverWritePPS() )
+    else if( m_pcCfg->getCGSFlag() && pcSlice->getLayerId() && pcSlice->getCGSOverWritePPS() )
     {
 #if SVC_EXTENSION
@@ -4153 +4153 @@
     pSlice->setCGSOverWritePPS( 1 ); // regular PPS update
   }
-  else if( nCGSFlag == Q0048_CGS_3D_ASYMLUT_PPSUPDATE )
+  else if( nCGSFlag )
   {
     dErrorPPS = m_Enc3DAsymLUTPPS.estimateDistWithCur3DAsymLUT( pCurPic , refLayerIdc );