Changeset 1089 in 3DVCSoftware for branches/HTM-12.2-dev1-Mediatek


Ignore:
Timestamp:
28 Oct 2014, 03:12:43 (10 years ago)
Author:
mediatek-htm
Message:

Integration of JCT3V-J0059. The MACRO is "MTK_MRG_LIST_SIZE_CLEANUP_J0059".

By YiWen Chen (yiwen.chen@…)

Location:
branches/HTM-12.2-dev1-Mediatek
Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-12.2-dev1-Mediatek/source/Lib/TLibCommon/TypeDef.h

    r1084 r1089  
    177177                                              // SEC_ADAPT_DISABLE_IVMP        Disabling IVMP merge candidates when IC is enabled, JCT3V-H0070
    178178                                              // SEC_SIMP_SHIFTED_DV_I0086     Simplification of Shifted DV candidate, JCT3V-I0086
    179 
     179#define MTK_MRG_LIST_SIZE_CLEANUP_J0059   1   // Include VSP for deriving merge candidate list size, JCT3V-J0059
    180180
    181181
  • branches/HTM-12.2-dev1-Mediatek/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r1084 r1089  
    25802580      {
    25812581        Bool ivMvPredFlag = rpcSlice->getVPS()->getIvMvPredFlag( rpcSlice->getLayerIdInVps() ) ;
     2582#if MTK_MRG_LIST_SIZE_CLEANUP_J0059
     2583        Bool vspFlag = rpcSlice->getVPS()->getViewSynthesisPredFlag( rpcSlice->getLayerIdInVps() ) ;
     2584        rpcSlice->setMaxNumMergeCand(( ivMvPredFlag || vspFlag? MRG_MAX_NUM_CANDS_MEM : MRG_MAX_NUM_CANDS) - uiCode);
     2585#else
    25822586        rpcSlice->setMaxNumMergeCand(( ivMvPredFlag ? MRG_MAX_NUM_CANDS_MEM : MRG_MAX_NUM_CANDS) - uiCode);
     2587#endif
    25832588      }
    25842589
  • branches/HTM-12.2-dev1-Mediatek/source/Lib/TLibEncoder/TEncCavlc.cpp

    r1084 r1089  
    20692069      {
    20702070        Bool ivMvPredFlag = pcSlice->getVPS()->getIvMvPredFlag( pcSlice->getLayerIdInVps() ) ;
     2071#if MTK_MRG_LIST_SIZE_CLEANUP_J0059
     2072        Bool vspFlag = pcSlice->getVPS()->getViewSynthesisPredFlag( pcSlice->getLayerIdInVps() ) ;
     2073        WRITE_UVLC( ( ivMvPredFlag || vspFlag ? MRG_MAX_NUM_CANDS_MEM : MRG_MAX_NUM_CANDS ) - pcSlice->getMaxNumMergeCand(), "five_minus_max_num_merge_cand");
     2074#else
    20712075        WRITE_UVLC( ( ivMvPredFlag ? MRG_MAX_NUM_CANDS_MEM : MRG_MAX_NUM_CANDS ) - pcSlice->getMaxNumMergeCand(), "five_minus_max_num_merge_cand");
     2076#endif
    20722077      }
    20732078#else
  • branches/HTM-12.2-dev1-Mediatek/source/Lib/TLibEncoder/TEncSlice.cpp

    r976 r1089  
    614614  else
    615615  {
     616#if MTK_MRG_LIST_SIZE_CLEANUP_J0059
     617    rpcSlice->setMaxNumMergeCand      ( m_pcCfg->getMaxNumMergeCand()   + ( rpcSlice->getVPS()->getIvMvPredFlag( rpcSlice->getLayerIdInVps() )  || rpcSlice->getVPS()->getViewSynthesisPredFlag( rpcSlice->getLayerIdInVps() ) ? 1 : 0 ) );
     618#else
    616619    rpcSlice->setMaxNumMergeCand      ( m_pcCfg->getMaxNumMergeCand()   + ( rpcSlice->getVPS()->getIvMvPredFlag( rpcSlice->getLayerIdInVps() ) ? 1 : 0 ) );
     620#endif
    617621  }
    618622#else
Note: See TracChangeset for help on using the changeset viewer.