Changeset 201 in 3DVCSoftware for branches/HTM-5.0-Nokia


Ignore:
Timestamp:
4 Dec 2012, 23:29:29 (11 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

Location:
branches/HTM-5.0-Nokia
Files:
18 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-5.0-Nokia/CommonTestConditionsCfgs/baseCfg_2view+depth.cfg

    r197 r201  
    197197DisparitySearchRangeRestriction : 0                                # 0: No disparity restriction 1: Use disparity restriction
    198198VerticalDisparitySearchRange    : 56                               # vertical disparity search range (in luma samples)
     199FCO                        : 0                                     # Flexible coding order flag in 3DV
     200FCOCodingOrder             : T0D0D1T1                              # Coding order for Flexible coding order in 3DV
    199201
    200202
     
    209211#========== view synthesis optimization (VSO) ==========
    210212VSOConfig                 : [cx0 B(cc1) I(s0.25 s0.5 s0.75)][cx1 B(oo0) I(s0.25 s0.5 s0.75)]  # VSO configuration string
     213#VSOConfig                 : [ox0 B(cc1) I(s0.25 s0.5 s0.75)][cx1 B(oo0) I(s0.25 s0.5 s0.75)]  # VSO configuration string
    211214WVSO                      : 1                                    # use of WVSO (Depth distortion metric with a weighted depth fidelity term)
    212215VSOWeight                 : 10                                   # weight of VSO ( in SAD case, cf. squared in SSE case )
  • branches/HTM-5.0-Nokia/CommonTestConditionsCfgs/baseCfg_3view+depth.cfg

    r200 r201  
    201201DisparitySearchRangeRestriction : 0                                # 0: No disparity restriction 1: Use disparity restriction
    202202VerticalDisparitySearchRange    : 56                               # vertical disparity search range (in luma samples)
    203 FCO                       : 0                                      # Flexible coding order flag in 3DV
    204 FCOCodingOrder            : T0D0D1D2T1T2                           # Coding order for Flexible coding order in 3DV
     203FCO                        : 0                                      # Flexible coding order flag in 3DV
     204FCOCodingOrder             : T0D0D1D2T1T2                           # Coding order for Flexible coding order in 3DV
    205205
    206206
  • branches/HTM-5.0-Nokia/cfg/encoder_mvd.cfg

    r198 r201  
    200200DisparitySearchRangeRestriction : 0                                # 0: No disparity restriction 1: Use disparity restriction
    201201VerticalDisparitySearchRange    : 56                               # vertical disparity search range (in luma samples)
     202FCO                        : 0                                     # Flexible coding order flag in 3DV
     203FCOCodingOrder             : T0D0D1T1D2T2                              # Coding order for Flexible coding order in 3DV
    202204
    203205
     
    213215VSOConfig                 : [cx0 B(cc1) I(s0.25 s0.5 s0.75)][cx1 B(oo0) B(oo2) I(s0.25 s0.5 s0.75 s1.25 s1.5 s1.75)][cx2 B(cc1) I(s1.25 s1.5 s1.75)] # VSO configuration string (3 view)
    214216VSOConfig                 : [cx0 B(cc1) I(s0.25 s0.5 s0.75)][cx1 B(oo0)        I(s0.25 s0.5 s0.75)]                                                   # VSO configuration string (2 view)
     217#VSOConfig                 : [ox0 B(cc1) I(s0.25 s0.5 s0.75)][cx1 B(oo0) B(oo2) I(s0.25 s0.5 s0.75 s1.25 s1.5 s1.75)][ox2 B(cc1) I(s1.25 s1.5 s1.75)] # VSO configuration string
     218#VSOConfig                 : [ox0 B(cc1) I(s0.25 s0.5 s0.75)][cx1 B(oo0) I(s0.25 s0.5 s0.75)]  # VSO configuration string
    215219WVSO                      : 1                                    # use of WVSO (Depth distortion metric with a weighted depth fidelity term)
    216220VSOWeight                 : 10                                   # weight of VSO ( in SAD case, cf. squared in SSE case )
  • branches/HTM-5.0-Nokia/source/App/TAppDecoder/TAppDecTop.cpp

    r200 r201  
    8888#endif
    8989 
    90 #if FLEX_CODING_ORDER
     90#if FLEX_CODING_ORDER_M23723
    9191  Int iDepthViewIdx = 0;
    9292  Int iTextureViewIdx=0;
    93   Bool first_frame=1;
    94   Bool viewid_zero=true;
    95   Int FCO_index=0;  //when the current frame is not first frame,use FCO_index stand for viewDepth.
     93  Bool firstFrame=1;
     94  Bool viewIdZero=true;
     95  Int fcoIndex=0;  //when the current frame is not first frame,use FCO_index stand for viewDepth.
    9696#endif
    9797
     
    110110    pcListPic[i] = NULL;
    111111    newPicture[i] = false;
    112 #if FLEX_CODING_ORDER
    113     FCO_Order[i]=NULL;
     112#if FLEX_CODING_ORDER_M23723
     113    m_fcoOrder[i]=NULL;
    114114#endif
    115115
     
    173173        depth = getVPSAccess()->getActiveVPS()->getDepthFlag(nalu.m_layerId);
    174174      }
    175 #if FLEX_CODING_ORDER
     175#if FLEX_CODING_ORDER_M23723
    176176      if (viewId>0)
    177177      {
    178         viewid_zero=false;
    179       }
    180       if (viewid_zero==false&&viewId==0)
    181       {
    182         first_frame=0; //if viewId has been more than zero and now it set to zero again, we can see that it is not the first view
    183       }
    184       if (first_frame)
     178        viewIdZero=false;
     179      }
     180      if (viewIdZero==false&&viewId==0)
     181      {
     182        firstFrame=0; //if viewId has been more than zero and now it set to zero again, we can see that it is not the first view
     183      }
     184      if (firstFrame)
    185185      { // if the current view is first frame, we set the viewDepthId as texture plus depth and get the FCO order
    186186        viewDepthId = iDepthViewIdx+iTextureViewIdx;
    187         FCO_viewDepthId=viewDepthId;
     187        m_fcoViewDepthId=viewDepthId;
    188188      }
    189189      else
     
    192192        if (depth)
    193193        {
    194           for (FCO_index=0;FCO_index<2*MAX_VIEW_NUM;FCO_index++ )
     194          for (fcoIndex=0;fcoIndex<2*MAX_VIEW_NUM;fcoIndex++ )
    195195          {
    196             if (FCO_Order[FCO_index]=='D')
     196            if (m_fcoOrder[fcoIndex]=='D')
    197197            {
    198198              if (viewId==viewDepthId)
     
    205205        else
    206206        {
    207           for (FCO_index=0;FCO_index<2*MAX_VIEW_NUM;FCO_index++ )
     207          for (fcoIndex=0;fcoIndex<2*MAX_VIEW_NUM;fcoIndex++ )
    208208          {
    209             if (FCO_Order[FCO_index]=='T')
     209            if (m_fcoOrder[fcoIndex]=='T')
    210210            {
    211211              if (viewId==viewDepthId)
     
    217217        }
    218218
    219         viewDepthId=FCO_index;
     219        viewDepthId=fcoIndex;
    220220
    221221      }
     
    229229      Int viewId = nalu.m_viewId;
    230230      Int depth = nalu.m_isDepth ? 1 : 0;
    231 #if FLEX_CODING_ORDER
     231#if FLEX_CODING_ORDER_M23723
    232232      if (viewId>0)
    233233      {
    234         viewid_zero=false;
    235       }
    236       if (viewid_zero==false&&viewId==0)
    237       {
    238         first_frame=0;
    239       }
    240       if (first_frame)
     234        viewIdZero=false;
     235      }
     236      if (viewIdZero==false&&viewId==0)
     237      {
     238        firstFrame=0;
     239      }
     240      if (firstFrame)
    241241      {
    242242        viewDepthId = iDepthViewIdx+iTextureViewIdx;
    243         FCO_viewDepthId=viewDepthId;
     243        m_fcoViewDepthId=viewDepthId;
    244244      }
    245245      else
     
    248248        if (depth)
    249249        {
    250           for (FCO_index=0;FCO_index<2*MAX_VIEW_NUM;FCO_index++ )
     250          for (fcoIndex=0;fcoIndex<2*MAX_VIEW_NUM;fcoIndex++ )
    251251          {
    252             if (FCO_Order[FCO_index]=='D')
     252            if (m_fcoOrder[fcoIndex]=='D')
    253253            {
    254254              if (viewId==viewDepthId)
     
    261261        else
    262262        {
    263           for (FCO_index=0;FCO_index<2*MAX_VIEW_NUM;FCO_index++ )
     263          for (fcoIndex=0;fcoIndex<2*MAX_VIEW_NUM;fcoIndex++ )
    264264          {
    265             if (FCO_Order[FCO_index]=='T')
     265            if (m_fcoOrder[fcoIndex]=='T')
    266266            {
    267267              if (viewId==viewDepthId)
     
    273273        }
    274274
    275         viewDepthId=FCO_index;
     275        viewDepthId=fcoIndex;
    276276
    277277      }
     
    338338        {
    339339          previousPictureDecoded = true;
    340 #if FLEX_CODING_ORDER
    341           if (first_frame)
    342           {
     340#if FLEX_CODING_ORDER_M23723
     341        if (firstFrame)
     342        {
    343343            if (depth)
    344344            {
    345345                iDepthViewIdx++;
    346                 FCO_Order[viewDepthId]='D';
     346                m_fcoOrder[viewDepthId]='D';
    347347            }
    348348            else
    349349           {
    350350                iTextureViewIdx++;
    351                 FCO_Order[viewDepthId]='T';
     351                m_fcoOrder[viewDepthId]='T';
    352352           }
    353353          }
     
    657657TDecTop* TAppDecTop::getTDecTop( Int viewId, Bool isDepth )
    658658{
    659 #if FLEX_CODING_ORDER
     659#if FLEX_CODING_ORDER_M23723
    660660  Int viewnumber=0;
    661661  Int i=0;
    662   Bool FCO_flag=0;
    663   if (viewId>FCO_viewDepthId)
     662  Bool fcoFlag=0;
     663  if (viewId>m_fcoViewDepthId)
    664664  {
    665665    return NULL;
     
    669669    if (isDepth)
    670670   {
    671       for ( i=0; i<=FCO_viewDepthId;i++)
    672       {
    673          if (FCO_Order[i]=='D')
     671      for ( i=0; i<=m_fcoViewDepthId;i++)
     672      {
     673         if (m_fcoOrder[i]=='D')
    674674         {
    675675           if (viewnumber==viewId)
    676676           {
    677              FCO_flag=1;
     677             fcoFlag=1;
    678678             break;
    679679           }
     
    685685    else
    686686    {
    687       for ( i=0; i<=FCO_viewDepthId;i++)
    688       {
    689         if (FCO_Order[i]=='T')
     687      for ( i=0; i<=m_fcoViewDepthId;i++)
     688      {
     689        if (m_fcoOrder[i]=='T')
    690690        {
    691691          if (viewnumber==viewId)
    692692          {
    693             FCO_flag=1;
     693            fcoFlag=1;
    694694            break;
    695695          }
     
    699699      }
    700700    }
    701     if (FCO_flag)
     701    if (fcoFlag)
    702702    {
    703703      return m_tDecTop[i];
     
    731731  assert( ( viewId >= 0 ) );
    732732
    733 #if FLEX_CODING_ORDER
     733#if FLEX_CODING_ORDER_M23723
    734734if (getTDecTop(viewId,isDepth))
    735735{
  • branches/HTM-5.0-Nokia/source/App/TAppDecoder/TAppDecTop.h

    r200 r201  
    7171  Bool                            m_useDepth;
    7272
    73 #if FLEX_CODING_ORDER
    74   Int  FCO_viewDepthId;
    75   Char FCO_Order[MAX_VIEW_NUM*2];
     73#if FLEX_CODING_ORDER_M23723
     74  Int  m_fcoViewDepthId;
     75  Char m_fcoOrder[MAX_VIEW_NUM*2];
    7676#endif
    7777
  • branches/HTM-5.0-Nokia/source/App/TAppEncoder/TAppEncCfg.cpp

    r200 r201  
    112112    free (m_pchBitstreamFile) ;
    113113
    114 #if FLEX_CODING_ORDER
     114#if FLEX_CODING_ORDER_M23723
    115115  if (m_pchMVCJointCodingOrder != NULL)
    116116  {
     
    212212  string cfg_ScalingListFile;
    213213
    214  #if FLEX_CODING_ORDER
     214 #if FLEX_CODING_ORDER_M23723
    215215  string cfg_JointCodingOrdering;
    216216#endif
     
    260260  ("NumberOfViews",         m_iNumberOfViews,    0, "Number of views")
    261261
    262 #if FLEX_CODING_ORDER
     262#if FLEX_CODING_ORDER_M23723
    263263  ("FCO",               m_b3DVFlexOrder,   false, "flexible coding order flag" )
    264264  ("FCOCodingOrder",   cfg_JointCodingOrdering,  string(""), "The coding order for joint texture-depth coding")
     
    553553  m_pchdQPFile = cfg_dQPFile.empty() ? NULL : strdup(cfg_dQPFile.c_str());
    554554 
    555 #if FLEX_CODING_ORDER
     555#if FLEX_CODING_ORDER_M23723
    556556  m_pchMVCJointCodingOrder= cfg_JointCodingOrdering.empty()?NULL:strdup(cfg_JointCodingOrdering.c_str());
    557557  // If flexible order is enabled and if depth comes before the texture for a view, disable VSO
     
    18261826  printf("TMVP:%d ", (m_enableTMVP[1] ? 1 : 0) );
    18271827#endif
     1828
     1829#if FLEX_CODING_ORDER_M23723
     1830  printf("FCO:%d ",   (m_b3DVFlexOrder ? 1: 0));
     1831
     1832  if(m_b3DVFlexOrder)
     1833  {
     1834    printf("CodingOrder: %s ", m_pchMVCJointCodingOrder);
     1835  }
     1836#endif
     1837
    18281838#if HHI_VSO
    18291839  printf("VSO:%d ", m_bUseVSO             );
  • branches/HTM-5.0-Nokia/source/App/TAppEncoder/TAppEncCfg.h

    r200 r201  
    8989  Bool      m_bUsingDepthMaps;
    9090 
    91 #if FLEX_CODING_ORDER
     91#if FLEX_CODING_ORDER_M23723
    9292  char*  m_pchMVCJointCodingOrder;      ///<  texture-depth coding order
    9393  Bool    m_b3DVFlexOrder;    ///<  flexible coding order flag
  • branches/HTM-5.0-Nokia/source/App/TAppEncoder/TAppEncTop.cpp

    r200 r201  
    401401    {
    402402
    403 #if FLEX_CODING_ORDER
     403#if FLEX_CODING_ORDER_M23723
    404404      // Detect whether depth comes before than texture for this view
    405405      Bool isDepthFirst = false;
     
    708708#endif
    709709
    710 #if FLEX_CODING_ORDER && HHI_DMM_PRED_TEX
     710#if FLEX_CODING_ORDER_M23723 && HHI_DMM_PRED_TEX
    711711    m_acTEncDepthTopList[iViewIdx]->setUseDMM34( (m_b3DVFlexOrder && isDepthFirst) ? false : m_bUseDMM );
    712712#endif
     
    717717
    718718#if HHI_MPI
    719 #if FLEX_CODING_ORDER
     719#if FLEX_CODING_ORDER_M23723
    720720    m_acTEncDepthTopList[iViewIdx]->setUseMVI( (m_b3DVFlexOrder && isDepthFirst) ? false : m_bUseMVI );
    721721#else
     
    10411041#endif
    10421042
    1043 #if FLEX_CODING_ORDER
     1043#if FLEX_CODING_ORDER_M23723
    10441044      if (m_b3DVFlexOrder)
    10451045      {
     
    11221122      }
    11231123 
    1124 #if FLEX_CODING_ORDER
     1124#if FLEX_CODING_ORDER_M23723
    11251125      }
    11261126#endif
  • branches/HTM-5.0-Nokia/source/Lib/TLibCommon/TComSlice.cpp

    r200 r201  
    15951595#endif
    15961596
    1597 #if FLEX_CODING_ORDER && HHI_DMM_PRED_TEX
     1597#if FLEX_CODING_ORDER_M23723 && HHI_DMM_PRED_TEX
    15981598, m_bUseDMM34                   (false)
    15991599#endif
  • branches/HTM-5.0-Nokia/source/Lib/TLibCommon/TComSlice.h

    r200 r201  
    394394#endif
    395395
    396 #if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER
     396#if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER_M23723
    397397  Bool  m_bUseDMM34;
    398398#endif
     
    678678#endif
    679679
    680 #if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER
     680#if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER_M23723
    681681  Bool getUseDMM34()         { return m_bUseDMM34; }
    682682  Void setUseDMM34( Bool b ) { m_bUseDMM34 = b;    }
  • branches/HTM-5.0-Nokia/source/Lib/TLibCommon/TypeDef.h

    r200 r201  
    4242//! \{
    4343#define QC_MVHEVC_B0046                   0   //JCT3V-B0046: disable 3DHEVC tools
    44 #define QC_IV_AS_LT_B0046                 1   //JCT3V-B0046: inter-view reference pictures are treated as long-term pictures, scaling of motion vectors for DCP based on ViewId/ViewOrderIdx is disabled 
    45 #define QC_TMVP_IDX_MOD_B0046             1   //JCT3V-B0046: the reference index for temporal merging candidate is set to 0, as defined in HEVC
    46 #define QC_REM_IDV_B0046                  1   //JCT3V-B0046: removal of IDV NAL unit type
    47 #define FIX_DEL_NULLPTR                   1
     44#define QC_IV_AS_LT_B0046                 0   //JCT3V-B0046: inter-view reference pictures are treated as long-term pictures, scaling of motion vectors for DCP based on ViewId/ViewOrderIdx is disabled 
     45#define QC_TMVP_IDX_MOD_B0046             0   //JCT3V-B0046: the reference index for temporal merging candidate is set to 0, as defined in HEVC
     46#define QC_REM_IDV_B0046                  0   //JCT3V-B0046: removal of IDV NAL unit type
     47#define FIX_DEL_NULLPTR                   0
    4848
    4949#define DV_V_RESTRICTION_B0037            1   // JCT3V-B0037 disparity vector vertical range restriction
     
    6363
    6464// FCO
    65 #define FLEX_CODING_ORDER               1
    66 #if FLEX_CODING_ORDER
     65#define FLEX_CODING_ORDER_M23723          1
     66#if FLEX_CODING_ORDER_M23723
    6767  #define DISABLE_FCO_FOR_VSO             0 // Optional compile settings to disable VSO with FCO.
    6868#endif
  • branches/HTM-5.0-Nokia/source/Lib/TLibDecoder/TDecTop.cpp

    r200 r201  
    10031003    TComPic * const pcTexturePic = m_isDepth ? m_tAppDecTop->getPicFromView(  m_viewId, pcSlice->getPOC(), false ) : NULL;
    10041004
    1005 #if FLEX_CODING_ORDER
     1005#if FLEX_CODING_ORDER_M23723
    10061006    if (pcTexturePic != NULL)
    10071007    {
  • branches/HTM-5.0-Nokia/source/Lib/TLibEncoder/TEncCfg.h

    r200 r201  
    327327#endif
    328328
    329 #if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER
     329#if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER_M23723
    330330  Bool m_bUseDMM34;
    331331#endif
     
    848848#endif
    849849
    850 #if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER
     850#if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER_M23723
    851851  Void setUseDMM34( Bool b) { m_bUseDMM34 = b;    }
    852852  Bool getUseDMM34()        { return m_bUseDMM34; }
  • branches/HTM-5.0-Nokia/source/Lib/TLibEncoder/TEncGOP.cpp

    r200 r201  
    364364
    365365
    366 #if FLEX_CODING_ORDER
     366#if FLEX_CODING_ORDER_M23723
    367367      TComPic * pcTexturePic;
    368368      if(m_pcEncTop->getIsDepth() == 1)
     
    492492
    493493#if SAIT_VSO_EST_A0033
     494#ifdef FLEX_CODING_ORDER_M23723   
    494495{
    495    Bool flag_rec;
    496    flag_rec =  ((m_pcEncTop->getEncTop()->getPicYuvFromView( pcSlice->getViewId(), pcSlice->getPOC(), false, true) == NULL) ? false: true);
    497     m_pcRdCost->setVideoRecPicYuv( m_pcEncTop->getEncTop()->getPicYuvFromView( pcSlice->getViewId(), pcSlice->getPOC(), false, flag_rec ) );
    498     m_pcRdCost->setDepthPicYuv   ( m_pcEncTop->getEncTop()->getPicYuvFromView( pcSlice->getViewId(), pcSlice->getPOC(), true, false ) );
     496  Bool flagRec;
     497  flagRec =  ((m_pcEncTop->getEncTop()->getPicYuvFromView( pcSlice->getViewId(), pcSlice->getPOC(), false, true) == NULL) ? false: true);
     498  m_pcRdCost->setVideoRecPicYuv( m_pcEncTop->getEncTop()->getPicYuvFromView( pcSlice->getViewId(), pcSlice->getPOC(), false, flagRec ) );
     499  m_pcRdCost->setDepthPicYuv   ( m_pcEncTop->getEncTop()->getPicYuvFromView( pcSlice->getViewId(), pcSlice->getPOC(), true, false ) );
    499500}
     501#else
     502  m_pcRdCost->setVideoRecPicYuv( m_pcEncTop->getEncTop()->getPicYuvFromView( pcSlice->getViewId(), pcSlice->getPOC(), false, true ) );
     503  m_pcRdCost->setDepthPicYuv   ( m_pcEncTop->getEncTop()->getPicYuvFromView( pcSlice->getViewId(), pcSlice->getPOC(), true, false ) );
     504#endif
    500505#endif
    501506#if LGE_WVSO_A0119
  • branches/HTM-5.0-Nokia/source/Lib/TLibEncoder/TEncSbac.cpp

    r200 r201  
    10771077#if HHI_DMM_PRED_TEX
    10781078
    1079 #if FLEX_CODING_ORDER
     1079#if FLEX_CODING_ORDER_M23723
    10801080    if ( !pcCU->getSlice()->getSPS()->getUseDMM34() )
    10811081    {
  • 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    {
  • branches/HTM-5.0-Nokia/source/Lib/TLibEncoder/TEncSearch.h

    r200 r201  
    336336  Bool predIntraLumaDMMAvailable  ( UInt           uiMode,
    337337                                    UInt           uiWidth,
    338 #if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER
     338#if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER_M23723
    339339                                    UInt         uiHeight,
    340340                                    Bool         bDMMAvailable34 );
  • branches/HTM-5.0-Nokia/source/Lib/TLibEncoder/TEncTop.cpp

    r200 r201  
    770770#endif
    771771
    772 #if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER
     772#if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER_M23723
    773773  m_cSPS.setUseDMM34( m_bUseDMM34 );
    774774#endif
Note: See TracChangeset for help on using the changeset viewer.