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


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

Location:
branches/HTM-5.0-Nokia/source/Lib
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • 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.