Changeset 1089 in 3DVCSoftware for branches/HTM-12.2-dev1-Mediatek/source/Lib/TLibEncoder/TEncCavlc.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/TEncCavlc.cpp (modified) (1 diff)

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

@@ -2069 +2069 @@
       {
         Bool ivMvPredFlag = pcSlice->getVPS()->getIvMvPredFlag( pcSlice->getLayerIdInVps() ) ;
+#if MTK_MRG_LIST_SIZE_CLEANUP_J0059
+        Bool vspFlag = pcSlice->getVPS()->getViewSynthesisPredFlag( pcSlice->getLayerIdInVps() ) ;
+        WRITE_UVLC( ( ivMvPredFlag || vspFlag ? MRG_MAX_NUM_CANDS_MEM : MRG_MAX_NUM_CANDS ) - pcSlice->getMaxNumMergeCand(), "five_minus_max_num_merge_cand");
+#else
         WRITE_UVLC( ( ivMvPredFlag ? MRG_MAX_NUM_CANDS_MEM : MRG_MAX_NUM_CANDS ) - pcSlice->getMaxNumMergeCand(), "five_minus_max_num_merge_cand");
+#endif
       }
 #else