Changeset 296 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TComSampleAdaptiveOffset.h

Timestamp:

20 Feb 2013, 22:07:43 (12 years ago)

Author:

tech

Message:

Reintegrated branch 5.1-dev0 rev. 295.

File:

• trunk/source/Lib/TLibCommon/TComSampleAdaptiveOffset.h (modified) (5 diffs)

trunk/source/Lib/TLibCommon/TComSampleAdaptiveOffset.h

@@ -52 +52 @@
 #define SAO_BO_BITS                   5
 #define LUMA_GROUP_NUM                (1<<SAO_BO_BITS)
-#if SAO_UNIT_INTERLEAVING
 #define MAX_NUM_SAO_OFFSETS           4
 #define MAX_NUM_SAO_CLASS             33
-#else
-#define MAX_NUM_SAO_CLASS             32
-#endif
 // ====================================================================================================================
 // Class definition
@@ -95 +91 @@
   Pel   *m_pClipTable;
   Pel   *m_pClipTableBase;
-#if SAO_UNIT_INTERLEAVING
   Pel   *m_lumaTableBo;
-#else
-  Pel   *m_ppLumaTableBo0;
-  Pel   *m_ppLumaTableBo1;
-#endif
   Int   *m_iUpBuff1;
   Int   *m_iUpBuff2;
@@ -115 +106 @@
   Pel* m_pTmpL2;
   Int* m_iLcuPartIdx;
-#if SAO_UNIT_INTERLEAVING
   Int     m_maxNumOffsetsPerPic;
   Bool    m_saoInterleavingFlag;
-#else
-  Void initTmpSaoQuadTree(SAOQTPart *psQTPart, Int iYCbCr);
-  Void disableSaoOnePart(SAOQTPart *psQTPart, UInt uiPartIdx, Int iYCbCr);
-  Void xSaoQt2Lcu(SAOQTPart *psQTPart,UInt uiPartIdx);
-  Void convertSaoQt2Lcu(SAOQTPart *psQTPart,UInt uiPartIdx);
-  Void xSaoAllPart(SAOQTPart *psQTPart, Int iYCbCr);
-#endif
 public:
   TComSampleAdaptiveOffset         ();
@@ -151 +134 @@
   Void processSaoBlock(Pel* pDec, Pel* pRest, Int stride, Int iSaoType, UInt xPos, UInt yPos, UInt width, UInt height, Bool* pbBorderAvail);
 
-#if SAO_UNIT_INTERLEAVING
   Void resetLcuPart(SaoLcuParam* saoLcuParam);
   Void convertQT2SaoUnit(SAOParam* saoParam, UInt partIdx, Int yCbCr);
@@ -158 +140 @@
   Void setSaoInterleavingFlag (Bool bVal)  {m_saoInterleavingFlag = bVal;}
   Bool getSaoInterleavingFlag ()           {return m_saoInterleavingFlag;}
-#endif
 };