Changeset 294 in 3DVCSoftware for branches/HTM-5.1-dev0/source/Lib/TLibEncoder/TEncEntropy.h

Timestamp:

19 Feb 2013, 20:33:52 (12 years ago)

Author:

tech

Message:

Removed HM-6.1 related guard macros.

File:

• branches/HTM-5.1-dev0/source/Lib/TLibEncoder/TEncEntropy.h (modified) (11 diffs)

branches/HTM-5.1-dev0/source/Lib/TLibEncoder/TEncEntropy.h

@@ -90 +90 @@
   virtual Void codeTileMarkerFlag      ( TComSlice* pcSlice )                                  = 0;
 
-#if TILES_WPP_ENTRY_POINT_SIGNALLING
   virtual Void  codeTilesWPPEntryPoint  ( TComSlice* pSlice )     = 0;
-#else
-  virtual Void  codeSliceHeaderSubstreamTable( TComSlice* pcSlice )                             = 0;
-#endif
   virtual Void  codeTerminatingBit      ( UInt uilsLast )                                       = 0;
   virtual Void  codeSliceFinish         ()                                                      = 0;
-#if OL_FLUSH
   virtual Void  codeFlush               ()                                                      = 0;
   virtual Void  encodeStart             ()                                                      = 0;
-#endif
   
   virtual Void codeAlfCtrlDepth() = 0;
@@ -134 +128 @@
 #endif
   
-#if BURST_IPCM
   virtual Void codeIPCMInfo      ( TComDataCU* pcCU, UInt uiAbsPartIdx, Int numIPCM, Bool firstIPCMFlag) = 0;
-#else
-  virtual Void codeIPCMInfo      ( TComDataCU* pcCU, UInt uiAbsPartIdx ) = 0;
-#endif
 
   virtual Void codeTransformSubdivFlag( UInt uiSymbol, UInt uiCtx ) = 0;
@@ -155 +145 @@
   virtual Void codeAlfUvlc          ( UInt uiCode ) = 0;
   virtual Void codeAlfSvlc          ( Int   iCode ) = 0;
-#if LCU_SYNTAX_ALF
   virtual Void codeAlfFixedLengthIdx( UInt idx, UInt numFilterSetsInBuffer) = 0;
   virtual Void codeAPSAlflag(UInt uiCode) = 0;
-#endif
   /// set slice granularity
   virtual Void setSliceGranularity(Int iSliceGranularity) = 0;
@@ -169 +157 @@
   virtual Void codeSaoUvlc          ( UInt uiCode ) = 0;
   virtual Void codeSaoSvlc          ( Int   iCode ) = 0;
-#if SAO_UNIT_INTERLEAVING
   virtual Void codeSaoRun          ( UInt   uiCode, UInt uiMaxValue  ) = 0;
   virtual Void codeSaoMergeLeft    ( UInt   uiCode, UInt uiCompIdx  ) = 0;
@@ -175 +162 @@
   virtual Void codeSaoTypeIdx      ( UInt   uiCode) = 0;
   virtual Void codeSaoUflc         ( UInt   uiCode) = 0;
-#endif
   virtual Void estBit               (estBitsSbacStruct* pcEstBitsSbac, Int width, Int height, TextType eTType) = 0;
   
@@ -198 +184 @@
   UInt    m_uiBakAbsPartIdx;
   UInt    m_uiBakChromaOffset;
-#if UNIFIED_TRANSFORM_TREE
   UInt    m_bakAbsPartIdxCU;
-#endif
 
 public:
@@ -216 +200 @@
   Void    encodeSliceHeader         ( TComSlice* pcSlice );
   Void    encodeTileMarkerFlag       (TComSlice* pcSlice) {m_pcEntropyCoderIf->codeTileMarkerFlag(pcSlice);}
-#if TILES_WPP_ENTRY_POINT_SIGNALLING
   Void    encodeTilesWPPEntryPoint( TComSlice* pSlice );
-#else
-  Void    encodeSliceHeaderSubstreamTable( TComSlice* pcSlice );
-#endif
   Void    encodeTerminatingBit      ( UInt uiIsLast );
   Void    encodeSliceFinish         ();
-#if OL_FLUSH
   Void    encodeFlush               ();
   Void    encodeStart               ();
-#endif
-#if LCU_SYNTAX_ALF
   Void encodeAlfFlag(UInt code) {m_pcEntropyCoderIf->codeAlfFlag(code);}
   Void encodeAlfStoredFilterSetIdx(UInt idx, UInt numFilterSetsInBuffer);
@@ -236 +213 @@
   Int  getAlfRun(Int compIdx, AlfParamSet* pAlfParamSet, Int lcuIdxInSlice, Int lcuPos, Int startlcuPosX, Int endlcuPosX);
   Void encodeAPSAlfFlag(UInt code) {m_pcEntropyCoderIf->codeAPSAlflag(code);}
-#endif  
   Void encodeAlfParam(ALFParam* pAlfParam);
   
@@ -297 +273 @@
   Void encodeIntraDirModeChroma( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD = false );
   
-#if !UNIFIED_TRANSFORM_TREE
-  Void encodeTransformIdx      ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, Bool bRD = false );
-#endif
   Void encodeTransformSubdivFlag( UInt uiSymbol, UInt uiCtx );
   Void encodeQtCbf             ( TComDataCU* pcCU, UInt uiAbsPartIdx, TextType eType, UInt uiTrDepth );
@@ -320 +293 @@
 
 private:
-#if UNIFIED_TRANSFORM_TREE
   Void xEncodeTransform        ( TComDataCU* pcCU,UInt offsetLumaOffset, UInt offsetChroma, UInt uiAbsPartIdx, UInt absTUPartIdx, UInt uiDepth, UInt width, UInt height, UInt uiTrIdx, UInt uiInnerQuadIdx, UInt& uiYCbfFront3, UInt& uiUCbfFront3, UInt& uiVCbfFront3, Bool& bCodeDQP );
-#else
-  Void xEncodeTransformSubdiv  ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt absTUPartIdx, UInt uiDepth, UInt uiInnerQuadIdx, UInt& uiYCbfFront3, UInt& uiUCbfFront3, UInt& uiVCbfFront3 );
-  Void xEncodeCoeff            ( TComDataCU* pcCU, UInt uiLumaOffset, UInt uiChromaOffset, UInt uiAbsPartIdx, UInt uiDepth, UInt uiWidth, UInt uiHeight, UInt uiTrIdx, UInt uiCurrTrIdx, Bool& bCodeDQP );
-#endif // !UNIFIED_TRANSFORM_TREE
 public:
   Void encodeCoeff             ( TComDataCU* pcCU,                 UInt uiAbsPartIdx, UInt uiDepth, UInt uiWidth, UInt uiHeight, Bool& bCodeDQP );
@@ -345 +313 @@
   Int golombEncode(int coeff, int k);
   Int lengthGolomb(int coeffVal, int k);
-#if SAO_UNIT_INTERLEAVING
   Void    encodeSaoUnit(Int rx, Int ry, Int compIdx, SAOParam* saoParam, Int repeatedRow);
   Void    encodeSaoOffset(SaoLcuParam* saoLcuParam);
   Void    encodeSaoUnitInterleaving(Int rx, Int ry, SAOParam* saoParam, TComDataCU* cu, Int cuAddrInSlice, Int cuAddrUpInSlice, Bool lfCrossSliceBoundaryFlag);
   Void    encodeSaoParam         (TComAPS*  aps);
-#else
-  Void    encodeSaoOnePart       (SAOParam* pSaoParam, Int iPartIdx, Int iYCbCr);
-  Void    encodeQuadTreeSplitFlag(SAOParam* pSaoParam, Int iPartIdx, Int iYCbCr);
-  Void    encodeSaoParam         (SAOParam* pSaoParam);
-#endif
 
   static Int countNonZeroCoeffs( TCoeff* pcCoef, UInt uiSize );