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


Ignore:
Timestamp:
20 Feb 2013, 22:07:43 (11 years ago)
Author:
tech
Message:

Reintegrated branch 5.1-dev0 rev. 295.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibCommon/TComPattern.cpp

    r189 r296  
    4747// ====================================================================================================================
    4848
    49 #if LOGI_INTRA_NAME_3MPM
    5049const UChar TComPattern::m_aucIntraFilter[5] =
    5150{
     
    5655  10, //64x64
    5756};
    58 #else
    59 const UChar TComPattern::m_aucIntraFilter[5][NUM_INTRA_MODE] =
    60 {
    61   {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
    62   }, //4x4
    63   {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
    64   }, //8x8
    65   {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
    66   }, //16x16
    67   {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
    68   }, //32x32
    69   {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
    70   }, //64x64
    71 };
    72 #endif
    7357
    7458// ====================================================================================================================
     
    682666  mapDMMtoIntraMode( uiDirMode );
    683667#endif
    684 #if LOGI_INTRA_NAME_3MPM
    685668  Int diff = min<Int>(abs((Int) uiDirMode - HOR_IDX), abs((Int)uiDirMode - VER_IDX));
    686669  UChar ucFiltIdx = diff > m_aucIntraFilter[log2BlkSize - 2] ? 1 : 0;
     
    689672    ucFiltIdx = 0; //no smoothing for DC or LM chroma
    690673  }
    691 #else
    692   UChar ucFiltIdx = m_aucIntraFilter[log2BlkSize - 2][uiDirMode];
    693 #endif
    694674
    695675  assert( ucFiltIdx <= 1 );
Note: See TracChangeset for help on using the changeset viewer.