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

Timestamp:

12 Jan 2014, 02:46:46 (10 years ago)

Author:

tech

Message:

Cleanup part 2

File:

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

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

@@ -1859 +1859 @@
     pcVPS->setARPStepNum( i, 1 );
 #endif  
-#if MTK_SPIVMP_F0110
+#if H_3D_SPIVMP
     pcVPS->setSubPULog2Size(i, 0);
 #endif
@@ -1868 +1868 @@
 #if H_3D_IV_MERGE
         READ_FLAG( uiCode, "iv_mv_pred_flag[i]");          pcVPS->setIvMvPredFlag         ( i, uiCode == 1 ? true : false );
-#if MTK_SPIVMP_F0110
+#if H_3D_SPIVMP
         READ_UVLC (uiCode, "log2_sub_PU_size_minus2");     pcVPS->setSubPULog2Size(i, uiCode+2); 
 #endif
@@ -1885 +1885 @@
       else
       {
-#if QC_DEPTH_IV_MRG_F0125 && H_3D_IV_MERGE
+#if H_3D_IV_MERGE
         if(i!=1)
         {
@@ -1891 +1891 @@
         }
 #endif
-#if MTK_SPIVMP_F0110
+#if H_3D_SPIVMP
         if (i!=1)
         {
@@ -1897 +1897 @@
         }
 #endif
-#if SEC_MPI_ENABLING_MERGE_F0150
+#if H_3D_IV_MERGE
         READ_FLAG( uiCode, "mpi_flag[i]" );             pcVPS->setMPIFlag( i, uiCode == 1 ? true : false );
 #endif
@@ -2568 +2568 @@
       READ_UVLC( uiCode, "five_minus_max_num_merge_cand");
 #if H_3D_IV_MERGE
-#if SEC_MPI_ENABLING_MERGE_F0150
       if(rpcSlice->getIsDepth())
       {
@@ -2580 +2579 @@
         rpcSlice->setMaxNumMergeCand(( ivMvPredFlag ? MRG_MAX_NUM_CANDS_MEM : MRG_MAX_NUM_CANDS) - uiCode);
       }
-#else
-      Bool ivMvPredFlag = rpcSlice->getVPS()->getIvMvPredFlag( rpcSlice->getLayerIdInVps() ) ;
-      rpcSlice->setMaxNumMergeCand(( ivMvPredFlag ? MRG_MAX_NUM_CANDS_MEM : MRG_MAX_NUM_CANDS) - uiCode);
-#endif
+
 #else
       rpcSlice->setMaxNumMergeCand(MRG_MAX_NUM_CANDS - uiCode);