Changeset 187 in 3DVCSoftware for branches/HTM-4.1-dev0/source/Lib/TLibEncoder/TEncSbac.cpp

Timestamp:

15 Nov 2012, 17:09:52 (12 years ago)

Author:

tech

Message:

Added document numbers to macro switches.

File:

• branches/HTM-4.1-dev0/source/Lib/TLibEncoder/TEncSbac.cpp (modified) (9 diffs)

branches/HTM-4.1-dev0/source/Lib/TLibEncoder/TEncSbac.cpp

@@ -114 +114 @@
 , m_cDmmDataSCModel           ( 1,             1,               NUM_DMM_DATA_CTX              , m_contextModels + m_numContextModels, m_numContextModels)
 #endif
-#if LGE_EDGE_INTRA
+#if LGE_EDGE_INTRA_A0070
 , m_cEdgeIntraSCModel         ( 1,             1,               NUM_EDGE_INTRA_CTX            , m_contextModels + m_numContextModels, m_numContextModels)
 #if LGE_EDGE_INTRA_DELTA_DC
@@ -205 +205 @@
   m_cDmmDataSCModel.initBuffer           ( eSliceType, iQp, (UChar*)INIT_DMM_DATA );
 #endif
-#if LGE_EDGE_INTRA
+#if LGE_EDGE_INTRA_A0070
   m_cEdgeIntraSCModel.initBuffer         ( eSliceType, iQp, (UChar*)INIT_EDGE_INTRA );
 #if LGE_EDGE_INTRA_DELTA_DC
@@ -957 +957 @@
 }
 
-#if LGE_EDGE_INTRA
+#if LGE_EDGE_INTRA_A0070
 Void TEncSbac::xCodeEdgeIntraInfo( TComDataCU* pcCU, UInt uiPartIdx )
 {
@@ -1038 +1038 @@
   if( pcCU->getSlice()->getSPS()->getUseDMM() && pcCU->getWidth( uiAbsPartIdx ) <= DMM_WEDGEMODEL_MAX_SIZE )
   {
-#if LGE_EDGE_INTRA
+#if LGE_EDGE_INTRA_A0070
     m_pcBinIf->encodeBin( uiDir >= NUM_INTRA_MODE && uiDir < EDGE_INTRA_IDX, m_cDmmFlagSCModel.get(0, 0, 0) );
 #else
@@ -1044 +1044 @@
 #endif
   }
-#if LGE_EDGE_INTRA
+#if LGE_EDGE_INTRA_A0070
   if( uiDir >= NUM_INTRA_MODE && uiDir < EDGE_INTRA_IDX )
 #else
@@ -1081 +1081 @@
   }
   else
-#if LGE_EDGE_INTRA
+#if LGE_EDGE_INTRA_A0070
     if ( uiDir >= EDGE_INTRA_IDX)
     {
@@ -1116 +1116 @@
   Int iIntraIdx = pcCU->getIntraSizeIdx(uiAbsPartIdx);
 #endif
-#if LGE_EDGE_INTRA
+#if LGE_EDGE_INTRA_A0070
   Bool bCodeEdgeIntra = false;
   if( pcCU->getSlice()->getSPS()->isDepth() )
@@ -1182 +1182 @@
 #if LOGI_INTRA_NAME_3MPM
     m_pcBinIf->encodeBinsEP( uiDir, 5 );
-#if LGE_EDGE_INTRA
+#if LGE_EDGE_INTRA_A0070
   if (bCodeEdgeIntra)
     if (uiDir == 31) m_pcBinIf->encodeBinsEP(0,1);
@@ -2524 +2524 @@
 }
 
-#if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX || (LGE_EDGE_INTRA && LGE_EDGE_INTRA_DELTA_DC)
+#if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX || (LGE_EDGE_INTRA_A0070 && LGE_EDGE_INTRA_DELTA_DC)
 Void TEncSbac::xWriteExGolombLevel( UInt uiSymbol, ContextModel& rcSCModel  )
 {