Changeset 1089 in 3DVCSoftware for branches/HTM-12.2-dev1-Mediatek/source/Lib/TLibEncoder/TEncSlice.cpp

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@…)

File:

• branches/HTM-12.2-dev1-Mediatek/source/Lib/TLibEncoder/TEncSlice.cpp (modified) (1 diff)

branches/HTM-12.2-dev1-Mediatek/source/Lib/TLibEncoder/TEncSlice.cpp

@@ -614 +614 @@
   else
   {
+#if MTK_MRG_LIST_SIZE_CLEANUP_J0059
+    rpcSlice->setMaxNumMergeCand      ( m_pcCfg->getMaxNumMergeCand()   + ( rpcSlice->getVPS()->getIvMvPredFlag( rpcSlice->getLayerIdInVps() )  || rpcSlice->getVPS()->getViewSynthesisPredFlag( rpcSlice->getLayerIdInVps() ) ? 1 : 0 ) );
+#else
     rpcSlice->setMaxNumMergeCand      ( m_pcCfg->getMaxNumMergeCand()   + ( rpcSlice->getVPS()->getIvMvPredFlag( rpcSlice->getLayerIdInVps() ) ? 1 : 0 ) );
+#endif
   }
 #else