Changeset 477 in SHVCSoftware for branches/SHM-4.0-dev/source/Lib/TLibDecoder

Timestamp:

15 Nov 2013, 20:48:18 (11 years ago)

Author:

seregin

Message:

fix for SHVC WD ticket #7, patch was provided by Takeshi Tsukuba <tsukuba.takeshi@…>

File:

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

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

@@ -1585 +1585 @@
 
 #if N0065_LAYER_POC_ALIGNMENT
+#if SHM_FIX7
+      }
+#endif
       if( !rpcSlice->getIdrPicFlag() )
       {
@@ -1675 +1678 @@
             }
 
+#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);
@@ -1719 +1726 @@
         rpcSlice->setEnableTMVPFlag(false);
       }
-#if N0065_LAYER_POC_ALIGNMENT
+#if N0065_LAYER_POC_ALIGNMENT && !SHM_FIX7
     }
 #endif