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

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/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)
• TLibEncoder/TEncCavlc.cpp (modified) (1 diff)
• TLibEncoder/TEncSlice.cpp (modified) (1 diff)

branches/HTM-12.2-dev1-Mediatek/source/Lib/TLibCommon/TypeDef.h

@@ -177 +177 @@
                                               // SEC_ADAPT_DISABLE_IVMP        Disabling IVMP merge candidates when IC is enabled, JCT3V-H0070
                                               // SEC_SIMP_SHIFTED_DV_I0086     Simplification of Shifted DV candidate, JCT3V-I0086
-
+#define MTK_MRG_LIST_SIZE_CLEANUP_J0059   1   // Include VSP for deriving merge candidate list size, JCT3V-J0059
 
 

branches/HTM-12.2-dev1-Mediatek/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -2580 +2580 @@
       {
         Bool ivMvPredFlag = rpcSlice->getVPS()->getIvMvPredFlag( rpcSlice->getLayerIdInVps() ) ;
+#if MTK_MRG_LIST_SIZE_CLEANUP_J0059
+        Bool vspFlag = rpcSlice->getVPS()->getViewSynthesisPredFlag( rpcSlice->getLayerIdInVps() ) ;
+        rpcSlice->setMaxNumMergeCand(( ivMvPredFlag || vspFlag? MRG_MAX_NUM_CANDS_MEM : MRG_MAX_NUM_CANDS) - uiCode);
+#else
         rpcSlice->setMaxNumMergeCand(( ivMvPredFlag ? MRG_MAX_NUM_CANDS_MEM : MRG_MAX_NUM_CANDS) - uiCode);
+#endif
       }
 

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

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