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

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/TLibCommon

Files:

• TCom3DAsymLUT.cpp (modified) (1 diff)
• TCom3DAsymLUT.h (modified) (1 diff)
• TComPic.h (modified) (2 diffs)
• TComSlice.cpp (modified) (2 diffs)
• TComSlice.h (modified) (4 diffs)
• TComUpsampleFilter.cpp (modified) (4 diffs)
• TypeDef.h (modified) (2 diffs)

branches/SHM-dev/source/Lib/TLibCommon/TCom3DAsymLUT.cpp

@@ -9 +9 @@
 #include "TComPicYuv.h"
 
-#if Q0048_CGS_3D_ASYMLUT
+#if CGS_3D_ASYMLUT
 
 const Int TCom3DAsymLUT::m_nVertexIdxOffset[4][3] = { { 0 , 0 , 0 } , { 0 , 1 , 0 } , { 0 , 1 , 1 } , { 1 , 1 , 1 } };

branches/SHM-dev/source/Lib/TLibCommon/TCom3DAsymLUT.h

@@ -9 +9 @@
 #endif
 
-#if Q0048_CGS_3D_ASYMLUT
+#if CGS_3D_ASYMLUT
 
 typedef struct _SYUVP

branches/SHM-dev/source/Lib/TLibCommon/TComPic.h

@@ -95 +95 @@
   Bool                  m_equalPictureSizeAndOffsetFlag[MAX_LAYERS]; 
 #endif
-#if Q0048_CGS_3D_ASYMLUT
+#if CGS_3D_ASYMLUT
   Int                   m_nFrameBit;
 #endif
@@ -214 +214 @@
   Bool          checkSameRefInfo();
   Void          copyUpsampledPictureYuv(TComPicYuv*   pcPicYuvIn, TComPicYuv*   pcPicYuvOut); 
-#if Q0048_CGS_3D_ASYMLUT
+#if CGS_3D_ASYMLUT
   Void          setFrameBit( Int n )  { m_nFrameBit = n;    }
   Int           getFrameBit()         { return m_nFrameBit; }

branches/SHM-dev/source/Lib/TLibCommon/TComSlice.cpp

@@ -512 +512 @@
         // Allow maximum of one motion resampling process for direct reference layers, and use motion inter-layer prediction from the same layer as texture inter-layer prediction
         if( !( g_posScalingFactor[refLayerIdc][0] == 65536 && g_posScalingFactor[refLayerIdc][1] == 65536 ) || !scalingOffset || !sameBitDepths 
-#if Q0048_CGS_3D_ASYMLUT
+#if CGS_3D_ASYMLUT
           || getPPS()->getCGSFlag()
 #endif
@@ -2305 +2305 @@
 , m_pocResetInfoPresentFlag   (false)
 , m_numRefLayerLocationOffsets  ( 0 )
-#if Q0048_CGS_3D_ASYMLUT
+#if CGS_3D_ASYMLUT
 , m_nCGSFlag(0)
 , m_nCGSOutputBitDepthY(0)

branches/SHM-dev/source/Lib/TLibCommon/TComSlice.h

@@ -1669 +1669 @@
   Int      m_phaseVerChroma[MAX_LAYERS];
   Bool     m_resamplePhaseSetPresentFlag[MAX_LAYERS];
-#if Q0048_CGS_3D_ASYMLUT
+#if CGS_3D_ASYMLUT
   Int      m_nCGSFlag;
   Int      m_nCGSOutputBitDepthY; // not for syntax
@@ -1842 +1842 @@
   Bool hasZeroResamplingPhase(Int refLayerId);
   Void getResamplingPhase(Int refLayerId, Bool& phaseSetPresentFlag, Int& phaseHorLuma, Int& phaseVerLuma, Int& phaseHorChroma, Int& phaseVerChroma);
-#if Q0048_CGS_3D_ASYMLUT
+#if CGS_3D_ASYMLUT
   Int     getCGSFlag()                { return m_nCGSFlag;  }
   Void    setCGSFlag(Int n)           { m_nCGSFlag = n;     }
@@ -2008 +2008 @@
   Int         m_pocValueBeforeReset;
   Int         m_picOrderCntLsb;
-#if Q0048_CGS_3D_ASYMLUT
+#if CGS_3D_ASYMLUT
   Int        m_nCGSOverWritePPS;  // for optimization, not output to bitstream
 #endif
@@ -2129 +2129 @@
 
   Void      setRefPicList       ( TComList<TComPic*>& rcListPic, Bool checkNumPocTotalCurr = false, TComPic** ilpPic = NULL );
-#if Q0048_CGS_3D_ASYMLUT
+#if CGS_3D_ASYMLUT
   Int       getCGSOverWritePPS()              { return m_nCGSOverWritePPS;    }
   Void      setCGSOverWritePPS(Int n)         { m_nCGSOverWritePPS = n;       }

branches/SHM-dev/source/Lib/TLibCommon/TComUpsampleFilter.cpp

@@ -117 +117 @@
     Int shift = g_bitDepthLayer[CHANNEL_TYPE_LUMA][currLayerId] - g_bitDepthLayer[CHANNEL_TYPE_LUMA][refLayerId];
 
-#if Q0048_CGS_3D_ASYMLUT
+#if CGS_3D_ASYMLUT
     if( currSlice->getPPS()->getCGSFlag() )
     {
@@ -153 +153 @@
     shift = g_bitDepthLayer[CHANNEL_TYPE_CHROMA][currLayerId] - g_bitDepthLayer[CHANNEL_TYPE_CHROMA][refLayerId];
 
-#if Q0048_CGS_3D_ASYMLUT
+#if CGS_3D_ASYMLUT
     if( currSlice->getPPS()->getCGSFlag() )
     {
@@ -221 +221 @@
     Int shift1 = g_bitDepthLayer[CHANNEL_TYPE_LUMA][refLayerId] - 8;
 
-#if Q0048_CGS_3D_ASYMLUT
+#if CGS_3D_ASYMLUT
     if( currSlice->getPPS()->getCGSFlag() )
     {
@@ -323 +323 @@
     shift1 = g_bitDepthLayer[CHANNEL_TYPE_CHROMA][refLayerId] - 8;
 
-#if Q0048_CGS_3D_ASYMLUT
+#if CGS_3D_ASYMLUT
     if( currSlice->getPPS()->getCGSFlag() )
     {

branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h

@@ -55 +55 @@
 #define O0164_MULTI_LAYER_HRD            1      ///< JCTVC-O0164: Multi-layer HRD operation
 
-#define Q0048_CGS_3D_ASYMLUT             1      ///< JCTVC-Q0048: Colour gamut scalability with look-up table
-#if Q0048_CGS_3D_ASYMLUT
+#define CGS_3D_ASYMLUT                   1      ///< Colour gamut scalability with look-up table
+#if CGS_3D_ASYMLUT
 #define CGS_GCC_NO_VECTORIZATION         1
 #define R0150_CGS_SIGNAL_CONSTRAINTS     1      ///< JCTVC-R0150: CGS signaling improvement and constraints
@@ -72 +72 @@
 #define SVC_POC                          1      ///< POC signalling and reset
 #define UNAVAILABLE_PIC_BUGFIX           1
+
 
 #define REF_IDX_MFM                      1      ///< JCTVC-L0336: motion vector mapping of inter-layer reference picture