Changeset 1123 in 3DVCSoftware

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

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-dev0/source/Lib/TLibCommon/TypeDef.h

@@ -237 +237 @@
 #define H_3D_SINGLE_DEPTH                 1   // Single depth mode proposed in JCT3V-I0095
 #define MTK_SINGLE_DEPTH_VPS_FLAG_J0060   1   // Add VPS control flags and remove slice header control flag for single depth, JCT3V-J0060
-#define ALIGN_J0060_J0107                 1   // Aligment of changed tool parameters
+#define ALIGN_J0060_J0107                 1   // Alignment of changed tool parameters
+#define ALGIN_J0107_J0059                 1   // Alignment of changed tool parameters                
 
 #define MTK_J0033                         1

branches/HTM-12.2-dev0/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -2744 +2744 @@
 #if H_3D_IV_MERGE
 #if HHI_TOOL_PARAMETERS_I2_J0107
+#if ALGIN_J0107_J0059
+      rpcSlice->setMaxNumMergeCand(( ( rpcSlice->getMpiFlag() || rpcSlice->getIvMvPredFlag() || rpcSlice->getViewSynthesisPredFlag() ) ? MRG_MAX_NUM_CANDS_MEM : MRG_MAX_NUM_CANDS) - uiCode);
+#else
       rpcSlice->setMaxNumMergeCand(( ( rpcSlice->getMpiFlag() || rpcSlice->getIvMvPredFlag() ) ? MRG_MAX_NUM_CANDS_MEM : MRG_MAX_NUM_CANDS) - uiCode);
+#endif
 #else
       if(rpcSlice->getIsDepth())

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())