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

Timestamp:

8 Nov 2014, 21:07:36 (9 years ago)

Author:

tech

Message:

Merged 12.2-dev1-Hisilicon@1116.

File:

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

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

@@ -2016 +2016 @@
             READ_FLAG( uiCode, "depth_inter_SDC_flag" );              pcVPS->setInterSDCFlag( i, uiCode ? true : false );
 #endif
+#if MTK_SINGLE_DEPTH_VPS_FLAG_J0060
+        READ_FLAG( uiCode, "single_depth_mode_flag[i]"); pcVPS->setSingleDepthModeFlag( i, uiCode == 1 ? true : false );        
+#endif
       }
     }
@@ -2726 +2729 @@
     }
 #endif
+#if !MTK_SINGLE_DEPTH_VPS_FLAG_J0060
 #if H_3D_SINGLE_DEPTH
     if(rpcSlice->getIsDepth())
@@ -2733 +2737 @@
       rpcSlice->setApplySingleDepthMode(uiCodeTmp);
     }
+#endif
 #endif
     if (!rpcSlice->isIntra())
@@ -2750 +2755 @@
       {
         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
+#endif
+      }
 
 #else