Changeset 1213 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibDecoder

Timestamp:

8 Jul 2015, 23:18:57 (10 years ago)

Author:

seregin

Message:

macro cleanup: R0150_CGS_SIGNAL_CONSTRAINTS

Location:

branches/SHM-dev/source/Lib/TLibDecoder

Files:

• TDecCAVLC.cpp (modified) (5 diffs)
• TDecTop.cpp (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -3506 +3506 @@
 Void TDecCavlc::xParse3DAsymLUT( TCom3DAsymLUT * pc3DAsymLUT )
 {
-#if R0150_CGS_SIGNAL_CONSTRAINTS
   UInt uiNumRefLayersM1;
   READ_UVLC( uiNumRefLayersM1 , "num_cm_ref_layers_minus1" );
@@ -3516 +3515 @@
     pc3DAsymLUT->addRefLayerId( uiRefLayerId );
   }
-#endif
+
   UInt uiCurOctantDepth , uiCurPartNumLog2 , uiInputBitDepthM8 , uiOutputBitDepthM8 , uiResQaunBit;
 #if R0300_CGS_RES_COEFF_CODING
@@ -3523 +3522 @@
   READ_CODE( 2 , uiCurOctantDepth , "cm_octant_depth" ); 
   READ_CODE( 2 , uiCurPartNumLog2 , "cm_y_part_num_log2" );     
-#if R0150_CGS_SIGNAL_CONSTRAINTS
+
   UInt uiChromaInputBitDepthM8 , uiChromaOutputBitDepthM8;
+
   READ_UVLC( uiInputBitDepthM8 , "cm_input_luma_bit_depth_minus8" );
   READ_UVLC( uiChromaInputBitDepthM8 , "cm_input_chroma_bit_depth_minus8" );
   READ_UVLC( uiOutputBitDepthM8 , "cm_output_luma_bit_depth_minus8" );
   READ_UVLC( uiChromaOutputBitDepthM8 , "cm_output_chroma_bit_depth_minus8" );
-#else
-  READ_CODE( 3 , uiInputBitDepthM8 , "cm_input_bit_depth_minus8" );
-  Int iInputBitDepthCDelta;
-  READ_SVLC(iInputBitDepthCDelta, "cm_input_bit_depth_chroma delta");
-  READ_CODE( 3 , uiOutputBitDepthM8 , "cm_output_bit_depth_minus8" ); 
-  Int iOutputBitDepthCDelta;
-  READ_SVLC(iOutputBitDepthCDelta, "cm_output_bit_depth_chroma_delta");
-#endif
   READ_CODE( 2 , uiResQaunBit , "cm_res_quant_bit" );
 #if R0300_CGS_RES_COEFF_CODING
@@ -3544 +3536 @@
 
 #if R0151_CGS_3D_ASYMLUT_IMPROVE
-#if R0150_CGS_SIGNAL_CONSTRAINTS
   Int nAdaptCThresholdU = 1 << ( uiChromaInputBitDepthM8 + 8 - 1 );
   Int nAdaptCThresholdV = 1 << ( uiChromaInputBitDepthM8 + 8 - 1 );
-#else
-  Int nAdaptCThresholdU = 1 << ( uiInputBitDepthM8 + 8 + iInputBitDepthCDelta - 1 );
-  Int nAdaptCThresholdV = 1 << ( uiInputBitDepthM8 + 8 + iInputBitDepthCDelta - 1 );
-#endif
+
   if( uiCurOctantDepth == 1 )
   {
@@ -3562 +3550 @@
   pc3DAsymLUT->destroy();
   pc3DAsymLUT->create( uiCurOctantDepth , uiInputBitDepthM8 + 8 ,  
-#if R0150_CGS_SIGNAL_CONSTRAINTS
     uiChromaInputBitDepthM8 + 8 ,
-#else
-    uiInputBitDepthM8 + 8 + iInputBitDepthCDelta, 
-#endif
     uiOutputBitDepthM8 + 8 , 
-#if R0150_CGS_SIGNAL_CONSTRAINTS
     uiChromaOutputBitDepthM8 + 8 ,
-#else
-    uiOutputBitDepthM8 + 8 + iOutputBitDepthCDelta ,
-#endif
     uiCurPartNumLog2 
 #if R0151_CGS_3D_ASYMLUT_IMPROVE

branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp

@@ -1636 +1636 @@
 #if CGS_3D_ASYMLUT 
         TComPicYuv* pBaseColRec = pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec();
-        if( pcSlice->getPPS()->getCGSFlag() 
-#if R0150_CGS_SIGNAL_CONSTRAINTS
-          && m_c3DAsymLUTPPS.isRefLayer( pcSlice->getVPS()->getRefLayerId(m_layerId, refLayerIdc) )
-#endif
-          )
-        {
-#if R0150_CGS_SIGNAL_CONSTRAINTS
+        if( pcSlice->getPPS()->getCGSFlag() && m_c3DAsymLUTPPS.isRefLayer( pcSlice->getVPS()->getRefLayerId(m_layerId, refLayerIdc) ) )
+        {
           assert( pcSlice->getBaseColPic( refLayerIdc )->getSlice( 0 )->getBitDepthY() == m_c3DAsymLUTPPS.getInputBitDepthY() );
           assert( pcSlice->getBaseColPic( refLayerIdc )->getSlice( 0 )->getBitDepthC() == m_c3DAsymLUTPPS.getInputBitDepthC() );
           assert( pcSlice->getBitDepthY() >= m_c3DAsymLUTPPS.getOutputBitDepthY() );
           assert( pcSlice->getBitDepthY() >= m_c3DAsymLUTPPS.getOutputBitDepthC() );
-#endif
-          if(!m_pColorMappedPic)
+
+          if( !m_pColorMappedPic )
           {
             initAsymLut(pcSlice->getBaseColPic(refLayerIdc)->getSlice(0));
           }
+
           m_c3DAsymLUTPPS.colorMapping( pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(),  m_pColorMappedPic );
           pBaseColRec = m_pColorMappedPic;
         }
 #endif
+
         if( m_pcPic->isSpatialEnhLayer(refLayerIdc) )
         {