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

Timestamp:

8 Jul 2015, 23:14:20 (10 years ago)

Author:

seregin

Message:

rename Q0048_CGS_3D_ASYMLUT to CGS_3D_ASYMLUT

Location:

branches/SHM-dev/source/Lib/TLibDecoder

Files:

• TDecCAVLC.cpp (modified) (4 diffs)
• TDecCAVLC.h (modified) (3 diffs)
• TDecEntropy.h (modified) (3 diffs)
• TDecSbac.h (modified) (1 diff)
• TDecTop.cpp (modified) (8 diffs)
• TDecTop.h (modified) (4 diffs)

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

@@ -43 +43 @@
 #include "TLibCommon/TComCodingStatistics.h"
 #endif
-#if Q0048_CGS_3D_ASYMLUT
+#if CGS_3D_ASYMLUT
 #include "../TLibCommon/TCom3DAsymLUT.h"
 #endif
@@ -182 +182 @@
 }
 
-#if Q0048_CGS_3D_ASYMLUT
+#if CGS_3D_ASYMLUT
 Void TDecCavlc::parsePPS(TComPPS* pcPPS, TCom3DAsymLUT * pc3DAsymLUT, Int nLayerID)
 #else
@@ -442 +442 @@
               }
             }
-#if Q0048_CGS_3D_ASYMLUT
+#if CGS_3D_ASYMLUT
             READ_FLAG( uiCode , "colour_mapping_enabled_flag" ); 
             pcPPS->setCGSFlag( uiCode );
@@ -3503 +3503 @@
 }
 
-#if Q0048_CGS_3D_ASYMLUT
+#if CGS_3D_ASYMLUT
 Void TDecCavlc::xParse3DAsymLUT( TCom3DAsymLUT * pc3DAsymLUT )
 {

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

@@ -46 +46 @@
 #include "SyntaxElementParser.h"
 
-#if Q0048_CGS_3D_ASYMLUT
+#if CGS_3D_ASYMLUT
 class TCom3DAsymLUT;
 #endif
@@ -138 +138 @@
   Void  parseVpsVuiBspHrdParams( TComVPS *vps );
   Void  parseSPSExtension    ( TComSPS* pcSPS );
-#if Q0048_CGS_3D_ASYMLUT
+#if CGS_3D_ASYMLUT
   Void  parsePPS            ( TComPPS* pcPPS, TCom3DAsymLUT * pc3DAsymLUT , Int nLayerID );
 #else
@@ -145 +145 @@
 
 protected:
-#if Q0048_CGS_3D_ASYMLUT
+#if CGS_3D_ASYMLUT
   Void xParse3DAsymLUT( TCom3DAsymLUT * pc3DAsymLUT );
   Void xParse3DAsymLUTOctant( TCom3DAsymLUT * pc3DAsymLUT , Int nDepth , Int yIdx , Int uIdx , Int vIdx , Int nLength );

branches/SHM-dev/source/Lib/TLibDecoder/TDecEntropy.h

@@ -50 +50 @@
 class TDecCavlc;
 class ParameterSetManagerDecoder;
-#if Q0048_CGS_3D_ASYMLUT
+#if CGS_3D_ASYMLUT
 class TCom3DAsymLUT;
 #endif
@@ -71 +71 @@
   virtual Void  parseVPS                  ( TComVPS* pcVPS )     = 0;
   virtual Void  parseSPS                  ( TComSPS* pcSPS )     = 0;
-#if Q0048_CGS_3D_ASYMLUT
+#if CGS_3D_ASYMLUT
   virtual Void  parsePPS                  ( TComPPS* pcPPS, TCom3DAsymLUT * pc3DAsymLUT , Int nLayerID )     = 0;
 #else
@@ -145 +145 @@
   Void    decodeSPS                   ( TComSPS* pcSPS ) { m_pcEntropyDecoderIf->parseSPS(pcSPS); }
 
-#if Q0048_CGS_3D_ASYMLUT
+#if CGS_3D_ASYMLUT
   Void    decodePPS                   ( TComPPS* pcPPS, TCom3DAsymLUT * pc3DAsymLUT, Int nLayerID )    { m_pcEntropyDecoderIf->parsePPS(pcPPS, pc3DAsymLUT , nLayerID );                     }
 #else

branches/SHM-dev/source/Lib/TLibDecoder/TDecSbac.h

@@ -80 +80 @@
   Void  parseSPS                  ( TComSPS* /*pcSPS*/ ) {}
   Void  parsePPS                  ( TComPPS* /*pcPPS*/ 
-#if Q0048_CGS_3D_ASYMLUT
+#if CGS_3D_ASYMLUT
     , TCom3DAsymLUT * /*pc3DAsymLUT*/ , Int /*nLayerID*/
 #endif

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

@@ -111 +111 @@
   m_lastPocPeriodId = -1;
   m_prevPicOrderCnt = 0;
-#if Q0048_CGS_3D_ASYMLUT
+#if CGS_3D_ASYMLUT
   m_pColorMappedPic = NULL;
 #endif
@@ -133 +133 @@
   }
 #endif
-#if Q0048_CGS_3D_ASYMLUT
+#if CGS_3D_ASYMLUT
   if(m_pColorMappedPic)
   {
@@ -1634 +1634 @@
         g_posScalingFactor[refLayerIdc][1] = ((heightBL << 16) + (heightEL >> 1)) / heightEL;
 
-#if Q0048_CGS_3D_ASYMLUT 
+#if CGS_3D_ASYMLUT 
         TComPicYuv* pBaseColRec = pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec();
         if( pcSlice->getPPS()->getCGSFlag() 
@@ -1863 +1863 @@
 }
 
-#if Q0048_CGS_3D_ASYMLUT
+#if CGS_3D_ASYMLUT
 Void TDecTop::xDecodePPS( TCom3DAsymLUT * pc3DAsymLUT )
 #else
@@ -1874 +1874 @@
   pps->setLayerId( m_layerId );
 #endif
-#if Q0048_CGS_3D_ASYMLUT
+#if CGS_3D_ASYMLUT
   m_cEntropyDecoder.decodePPS( pps, pc3DAsymLUT, m_layerId );
 #else
@@ -1996 +1996 @@
     case NAL_UNIT_PPS:
       xDecodePPS(
-#if Q0048_CGS_3D_ASYMLUT
+#if CGS_3D_ASYMLUT
         &m_c3DAsymLUTPPS
 #endif
@@ -2428 +2428 @@
 }
 
-#if Q0048_CGS_3D_ASYMLUT
+#if CGS_3D_ASYMLUT
 Void TDecTop::initAsymLut(TComSlice *pcSlice)
 {
@@ -2601 +2601 @@
 
     if( !pic->equalPictureSizeAndOffsetFlag(i) || !sameBitDepths 
-#if Q0048_CGS_3D_ASYMLUT
+#if CGS_3D_ASYMLUT
       || slice->getPPS()->getCGSFlag() > 0
 #endif

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

@@ -45 +45 @@
 #include "TLibCommon/TComTrQuant.h"
 #include "TLibCommon/SEI.h"
-#if Q0048_CGS_3D_ASYMLUT
+#if CGS_3D_ASYMLUT
 #include "TLibCommon/TCom3DAsymLUT.h"
 #endif
@@ -82 +82 @@
   // functional classes
   TComPrediction          m_cPrediction;
-#if Q0048_CGS_3D_ASYMLUT
+#if CGS_3D_ASYMLUT
   TCom3DAsymLUT           m_c3DAsymLUTPPS;
   TComPicYuv*             m_pColorMappedPic;
@@ -275 +275 @@
   Void      xDecodeVPS();
   Void      xDecodeSPS();
-#if Q0048_CGS_3D_ASYMLUT
+#if CGS_3D_ASYMLUT
   Void      xDecodePPS( TCom3DAsymLUT * pc3DAsymLUT );
 #else
@@ -291 +291 @@
   Void setFirstPicInLayerDecodedFlag(Bool x) { m_firstPicInLayerDecodedFlag = x;   }
 #endif
-#if Q0048_CGS_3D_ASYMLUT
+#if CGS_3D_ASYMLUT
   Void initAsymLut(TComSlice *pcSlice);
 #endif