Changeset 296 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TComRom.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/TComRom.h (modified) (8 diffs)

trunk/source/Lib/TLibCommon/TComRom.h

@@ -135 +135 @@
 extern const UInt   g_uiLastCtx[ 28 ];
 
-#if EIGHT_BITS_RICE_CODE
 extern const UInt   g_auiGoRiceRange[5];                  //!< maximum value coded with Rice codes
 extern const UInt   g_auiGoRicePrefixLen[5];              //!< prefix length for each maximum value
 extern const UInt   g_aauiGoRiceUpdate[5][24];            //!< parameter update rules for Rice codes
-#else
-extern const UInt   g_auiGoRiceRange[4];                  //!< maximum value coded with Rice codes
-extern const UInt   g_auiGoRicePrefixLen[4];              //!< prefix length for each maximum value
-extern const UInt   g_aauiGoRiceUpdate[4][16];            //!< parameter update rules for Rice codes
-#endif
   
-#if MULTILEVEL_SIGMAP_EXT
 extern const UInt   g_sigLastScan8x8[ 4 ][ 4 ];           //!< coefficient group scan order for 8x8 TUs
 extern       UInt   g_sigLastScanCG32x32[ 64 ];
-#endif
 
 // ====================================================================================================================
@@ -188 +180 @@
 extern const WedgeResolution g_aeWedgeResolutionList[5];
 extern const UChar           g_aucWedgeFullBitsListIdx[7];
+#if LGE_DMM3_SIMP_C0044
+extern const UChar           g_aucWedgeTexPredBitsListIdx[7];
+#endif
 extern const UChar           g_aucIntraSizeIdxToWedgeSize[7];
 
@@ -193 +188 @@
 extern       std::vector< std::vector<TComWedgeRef> >  g_aacWedgeRefLists;
 
-#if HHIQC_DMMFASTSEARCH_B0039
+#if HHI_DMM_PRED_TEX || HHI_DMM_WEDGE_INTRA
 extern       std::vector< std::vector< std::vector<UInt> > > g_aauiWdgLstM3;
 extern       std::vector< std::vector<TComWedgeNode> >       g_aacWedgeNodeLists;
@@ -199 +194 @@
 
 #if RWTH_SDC_DLT_B0036
+#if SAIT_SDC_C0096
+#define RWTH_SDC_NUM_PRED_MODES 3
+#else
 #define RWTH_SDC_NUM_PRED_MODES 4
+#endif
 extern      UInt g_auiSDCPredModes[RWTH_SDC_NUM_PRED_MODES];
 #endif
@@ -207 +206 @@
 Void addWedgeletToList( TComWedgelet cWedgelet, std::vector<TComWedgelet> &racWedgeList, std::vector<TComWedgeRef> &racWedgeRefList );
 
-#if DEFAULT_DC
 __inline Void mapDMMtoIntraMode(  UInt& dirMode ) { dirMode = (dirMode >= NUM_INTRA_MODE) ? DC_IDX : dirMode; }
 __inline Void mapDMMtoIntraMode(   Int& dirMode ) { dirMode = (dirMode >= NUM_INTRA_MODE) ? DC_IDX : dirMode; }
-#else
-__inline Void mapDMMtoIntraMode(  UInt& dirMode ) { dirMode = (dirMode >= NUM_INTRA_MODE) ? PLANAR_IDX : dirMode; }
-__inline Void mapDMMtoIntraMode(   Int& dirMode ) { dirMode = (dirMode >= NUM_INTRA_MODE) ? PLANAR_IDX : dirMode; }
-#endif
 #endif
 
@@ -280 +274 @@
 #define MAX_MATRIX_COEF_NUM 64     ///< max coefficient number for quantization matrix
 #define MAX_MATRIX_SIZE_NUM 8      ///< max size number for quantization matrix
-#if SCALING_LIST
 #define SCALING_LIST_DC 16         ///< default DC value
-#endif
 enum ScalingListDIR
 {
@@ -329 +321 @@
   },
 };
-#if SCALING_LIST
 static const char MatrixType_DC[4][12][22] =
 {
@@ -349 +340 @@
   },
 };
-#endif
 extern Int g_quantIntraDefault4x4[16];
 extern Int g_quantIntraDefault8x8[64];