Changeset 1074 in 3DVCSoftware for branches/HTM-12.1-dev0/source/Lib/TLibCommon/TComRom.cpp

Timestamp:

21 Oct 2014, 20:39:50 (10 years ago)

Author:

tech

Message:

Removed 3D-HEVC related macros.

File:

• branches/HTM-12.1-dev0/source/Lib/TLibCommon/TComRom.cpp (modified) (5 diffs)

branches/HTM-12.1-dev0/source/Lib/TLibCommon/TComRom.cpp

@@ -355 +355 @@
   HALF_PEL,    //   8x8
   FULL_PEL,    //  16x16
-#if SHARP_DMM1_I0110
   FULL_PEL,    //  32x32
   FULL_PEL,    //  64x64
   FULL_PEL     // 128x128
-#else
-  DOUBLE_PEL,  //  32x32
-  DOUBLE_PEL,  //  64x64
-  DOUBLE_PEL   // 128x128
-#endif
 };
 
@@ -374 +368 @@
      0,    4,    7,    8,    8,    0 };
 
-#if SHARP_DMM1_I0110
 Bool g_wedgePattern[32*32];
-#endif
 
 extern std::vector< std::vector<TComWedgelet> >   g_dmmWedgeLists;
@@ -388 +380 @@
 
 Char  g_aucConvertToBit  [ MAX_CU_SIZE+1 ];
-#if !MTK_LOW_LATENCY_IC_ENCODING_H0086_FIX
-#if H_3D_IC
-UInt g_aICEnableCANDIDATE[10] = { 0, };
-UInt g_aICEnableNUM[ 10 ] = { 0, };
-Int g_lastlayer=0;
-#endif
-#endif
 #if ENC_DEC_TRACE
 FILE*  g_hTrace = NULL;
@@ -676 +661 @@
   if( !g_dmmWedgeLists.empty() ) return;
 
-#if SHARP_DMM1_I0110
   for( UInt ui = g_aucConvertToBit[DIM_MIN_SIZE]; ui < (g_aucConvertToBit[DIM_MAX_SIZE]); ui++ )
-#else
-  for( UInt ui = g_aucConvertToBit[DIM_MIN_SIZE]; ui < (g_aucConvertToBit[DIM_MAX_SIZE]+1); ui++ )
-#endif
   {
     UInt uiWedgeBlockSize = ((UInt)DIM_MIN_SIZE)<<ui;
@@ -764 +745 @@
   switch( eWedgeRes )
   {
-#if !SHARP_DMM1_I0110
-  case( DOUBLE_PEL ): { uiBlockSize = (uiWidth>>1); break; }
-#endif
   case(   FULL_PEL ): { uiBlockSize =  uiWidth;     break; }
   case(   HALF_PEL ): { uiBlockSize = (uiWidth<<1); break; }