Changeset 296 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TComPattern.cpp

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/TComPattern.cpp (modified) (4 diffs)

trunk/source/Lib/TLibCommon/TComPattern.cpp

@@ -47 +47 @@
 // ====================================================================================================================
 
-#if LOGI_INTRA_NAME_3MPM
 const UChar TComPattern::m_aucIntraFilter[5] =
 {
@@ -56 +55 @@
   10, //64x64
 };
-#else
-const UChar TComPattern::m_aucIntraFilter[5][NUM_INTRA_MODE] =
-{
-  {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-  }, //4x4
-  {1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-  }, //8x8
-  {1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0
-  }, //16x16
-  {1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0
-  }, //32x32
-  {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-  }, //64x64
-};
-#endif
 
 // ====================================================================================================================
@@ -682 +666 @@
   mapDMMtoIntraMode( uiDirMode );
 #endif
-#if LOGI_INTRA_NAME_3MPM
   Int diff = min<Int>(abs((Int) uiDirMode - HOR_IDX), abs((Int)uiDirMode - VER_IDX));
   UChar ucFiltIdx = diff > m_aucIntraFilter[log2BlkSize - 2] ? 1 : 0;
@@ -689 +672 @@
     ucFiltIdx = 0; //no smoothing for DC or LM chroma
   }
-#else
-  UChar ucFiltIdx = m_aucIntraFilter[log2BlkSize - 2][uiDirMode];
-#endif
 
   assert( ucFiltIdx <= 1 );