Changeset 478 in SHVCSoftware for branches

Timestamp:

15 Nov 2013, 21:00:58 (11 years ago)

Author:

seregin

Message:

fix POClsb

File:

• branches/SHM-4.0-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (3 diffs)

branches/SHM-4.0-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -1551 +1551 @@
     }
 #if N0065_LAYER_POC_ALIGNMENT
+#if SHM_FIX7
+    Int iPOClsb = 0;
+#endif
     if( rpcSlice->getLayerId() > 0 || !rpcSlice->getIdrPicFlag() )
 #else
@@ -1557 +1560 @@
     {
       READ_CODE(sps->getBitsForPOC(), uiCode, "pic_order_cnt_lsb");
+#if SHM_FIX7
+      iPOClsb = uiCode;
+#else
       Int iPOClsb = uiCode;
+#endif
       Int iPrevPOC = rpcSlice->getPrevTid0POC();
       Int iMaxPOClsb = 1<< sps->getBitsForPOC();
@@ -1678 +1685 @@
             }
 
-#if SHM_FIX7
-            Int pocLTCurr = rpcSlice->getPOC() - deltaPocMSBCycleLT * maxPicOrderCntLSB - sps->getBitsForPOC() + pocLsbLt;
-#else
             Int pocLTCurr = rpcSlice->getPOC() - deltaPocMSBCycleLT * maxPicOrderCntLSB
                                         - iPOClsb + pocLsbLt;
-#endif
+
             rps->setPOC     (j, pocLTCurr);
             rps->setDeltaPOC(j, - rpcSlice->getPOC() + pocLTCurr);