Changeset 1123 in 3DVCSoftware for branches/HTM-12.2-dev0/source/Lib/TLibEncoder

Timestamp:

8 Nov 2014, 22:14:15 (10 years ago)

Author:

tech

Message:

Alignment of J0059 and J0107 (ALIGN_J0107_J0059).

Location:

branches/HTM-12.2-dev0/source/Lib/TLibEncoder

Files:

• TEncCavlc.cpp (modified) (1 diff)
• TEncSlice.cpp (modified) (1 diff)

branches/HTM-12.2-dev0/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -2154 +2154 @@
     {
 #if H_3D_IV_MERGE
-#if HHI_TOOL_PARAMETERS_I2_J0107
+#if HHI_TOOL_PARAMETERS_I2_J0107      
+#if ALGIN_J0107_J0059
+      WRITE_UVLC( ( ( pcSlice->getMpiFlag( ) || pcSlice->getIvMvPredFlag( ) || pcSlice->getViewSynthesisPredFlag( ) ) ? MRG_MAX_NUM_CANDS_MEM : MRG_MAX_NUM_CANDS ) - pcSlice->getMaxNumMergeCand(), "five_minus_max_num_merge_cand");
+#else
       WRITE_UVLC( ( ( pcSlice->getMpiFlag( ) || pcSlice->getIvMvPredFlag( ) ) ? MRG_MAX_NUM_CANDS_MEM : MRG_MAX_NUM_CANDS ) - pcSlice->getMaxNumMergeCand(), "five_minus_max_num_merge_cand");
+#endif
 #else
       if(pcSlice->getIsDepth())

branches/HTM-12.2-dev0/source/Lib/TLibEncoder/TEncSlice.cpp

@@ -614 +614 @@
 #if H_3D_IV_MERGE
 #if HHI_TOOL_PARAMETERS_I2_J0107
+#if ALGIN_J0107_J0059
+  rpcSlice->setMaxNumMergeCand      ( m_pcCfg->getMaxNumMergeCand()   + ( ( rpcSlice->getMpiFlag( ) || rpcSlice->getIvMvPredFlag( ) || rpcSlice->getViewSynthesisPredFlag( )   ) ? 1 : 0 ));
+#else
   rpcSlice->setMaxNumMergeCand      ( m_pcCfg->getMaxNumMergeCand()   + ( ( rpcSlice->getMpiFlag( ) || rpcSlice->getIvMvPredFlag( ) ) ? 1 : 0 ));
+#endif
 #else
   if(rpcSlice->getIsDepth())