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

Timestamp:

8 Jul 2015, 20:22:40 (10 years ago)

Author:

seregin

Message:

macro cleanup: O0194_DIFFERENT_BITDEPTH_EL_BL

Location:

branches/SHM-dev/source/Lib/TLibDecoder

Files:

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

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

@@ -1790 +1790 @@
 
 #if REPN_FORMAT_IN_VPS
-#if O0194_DIFFERENT_BITDEPTH_EL_BL
     g_bitDepthLayer[CHANNEL_TYPE_LUMA][pcSlice->getLayerId()] = pcSlice->getBitDepthY();
     g_bitDepthLayer[CHANNEL_TYPE_CHROMA][pcSlice->getLayerId()] = pcSlice->getBitDepthC();
-#endif
+
     assert( pcSlice->getSliceQp() >= -pcSlice->getQpBDOffsetY() );
 #else    

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

@@ -567 +567 @@
       pBLPic->getSlice(0)->setVPS( activeVPS );
 
-#if O0194_DIFFERENT_BITDEPTH_EL_BL
       g_bitDepthLayer[CHANNEL_TYPE_LUMA][0] = repFormat->getBitDepthVpsLuma();
       g_bitDepthLayer[CHANNEL_TYPE_CHROMA][0] = repFormat->getBitDepthVpsChroma();
-#endif
     }
   }