Ignore:
Timestamp:
4 Dec 2012, 23:29:29 (12 years ago)
Author:
nokia
Message:
  1. Recommended coding style changes
  2. Disabling Compile flags:

#define QC_IV_AS_LT_B0046 0
#define QC_TMVP_IDX_MOD_B0046 0
#define QC_REM_IDV_B0046 0
#define FIX_DEL_NULLPTR 0

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-5.0-Nokia/source/Lib/TLibEncoder/TEncSearch.cpp

    r200 r201  
    22452245#if HHI_DMM_PRED_TEX
    22462246     
    2247 #if FLEX_CODING_ORDER
     2247#if FLEX_CODING_ORDER_M23723
    22482248      if ( pcCU->getSlice()->getSPS()->getUseDMM34() )
    22492249      {
     
    22722272        uiRdModeList[ numModesForFullRD++ ] = DMM_CONTOUR_PREDTEX_D_IDX;
    22732273      }
    2274 #if FLEX_CODING_ORDER
     2274#if FLEX_CODING_ORDER_M23723
    22752275      }
    22762276#endif
     
    23192319
    23202320#if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
    2321 #if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER
     2321#if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER_M23723
    23222322      if( m_pcEncCfg->getIsDepth() && !predIntraLumaDMMAvailable( uiOrgMode, uiWidth, uiHeight, pcCU->getSlice()->getSPS()->getUseDMM34() )
    2323 #if LGE_EDGE_INTRA
     2323#if LGE_EDGE_INTRA_A0070
    23242324        && uiOrgMode < EDGE_INTRA_IDX
    23252325#endif
     
    23292329
    23302330      if( m_pcEncCfg->getIsDepth() && !predIntraLumaDMMAvailable( uiOrgMode, uiWidth, uiHeight )
    2331 #if LGE_EDGE_INTRA
     2331#if LGE_EDGE_INTRA_A0070
    23322332        && uiOrgMode < EDGE_INTRA_IDX
    23332333#endif
     
    64846484
    64856485#if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
    6486 #if ((HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX)&&FLEX_CODING_ORDER)
     6486#if ((HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX)&&FLEX_CODING_ORDER_M23723)
    64876487Bool TEncSearch::predIntraLumaDMMAvailable( UInt uiMode, UInt uiWidth, UInt uiHeight, Bool bDMMAvailable34 )
    64886488#else
     
    65176517    }
    65186518
    6519 #if FLEX_CODING_ORDER
     6519#if FLEX_CODING_ORDER_M23723
    65206520    if ( !bDMMAvailable34 )
    65216521    {
Note: See TracChangeset for help on using the changeset viewer.