Changeset 1123 in 3DVCSoftware for branches/HTM-12.2-dev0/source/Lib/TLibDecoder/TDecCAVLC.cpp

Timestamp:

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

Author:

tech

Message:

Alignment of J0059 and J0107 (ALIGN_J0107_J0059).

File:

• branches/HTM-12.2-dev0/source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)

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