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

Timestamp:

6 Jul 2014, 04:44:14 (10 years ago)

Author:

tech

Message:

Cleanup part 7.

File:

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

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

@@ -1962 +1962 @@
   }
   
-#if H0044_POC_LSB_NOT_PRESENT
+#if H_MV
     UInt slicePicOrderCntLsb = 0;
 #endif
@@ -2016 +2016 @@
 
 #if H_MV
-#if !H0044_POC_LSB_NOT_PRESENT
-    UInt slicePicOrderCntLsb = 0;
-#endif
     Int iPOClsb = slicePicOrderCntLsb;  // Needed later
     if ( (rpcSlice->getLayerId() > 0 && !vps->getPocLsbNotPresentFlag( rpcSlice->getLayerIdInVps())) || !rpcSlice->getIdrPicFlag() )
@@ -2625 +2622 @@
     rpcSlice->checkPocResetIdc(); 
 
-#if H0044_POC_LSB_NOT_PRESENT
     if ( rpcSlice->getVPS()->getPocLsbNotPresentFlag(rpcSlice->getLayerId()) && slicePicOrderCntLsb > 0 )
     {
       assert( rpcSlice->getPocResetIdc() != 2 );
     }
-#endif
+
     if( rpcSlice->getPocResetIdc() !=  0 )
     {