Ticket #1419: ticket_1419.patch

Lib/TLibCommon/TComPrediction.cpp

@@ -1101 +1101 @@
   bReusedPrev = (Bool*)xMalloc(Bool, uiMaxPLTPredSize + 1);
   memset(bPredicted, 0, sizeof(Bool)*(uiMaxPLTSize + 1));
   memset(bReusedPrev, 0, sizeof(Bool)*(uiMaxPLTPredSize + 1));
+
+#if FIX_PLT_REORDER
+  Int uiNumPLTRceived = uiDictMaxSize;
+  UInt uiNumPLTPredicted = 0;
+
+  for (uiIdxCurr = 0; uiIdxCurr < uiDictMaxSize; uiIdxCurr++)
+#else
   UInt uiNumPLTRceived = uiDictMaxSize, uiNumPLTPredicted = 0;
   for (uiIdxPrev = 0; uiIdxPrev < uiPLTSizePrev; uiIdxPrev++)
+#endif
   {
     bReused = false;
     Int iCounter = 0;
+
+#if FIX_PLT_REORDER
+    for (uiIdxPrev = 0; uiIdxPrev < uiPLTSizePrev; uiIdxPrev++)
+#else
     for (uiIdxCurr = 0; uiIdxCurr < uiDictMaxSize; uiIdxCurr++)
+#endif
     {
       iCounter = 0;
 
@@ -1131 +1144 @@
       uiNumPLTPredicted++;
     }
   }
+
+#if FIX_PLT_REORDER
+  assert( uiNumPLTRceived >= 0 );
+  assert( uiNumPLTPredicted <= uiDictMaxSize );
+#endif
+
   for (uiIdxPrev = 0; uiIdxPrev < uiMaxPLTPredSize; uiIdxPrev++)
   {
     for (UInt comp = compBegin; comp < compBegin + uiNumComp; comp++)

Lib/TLibCommon/TypeDef.h

@@ -45 +45 @@
 #include <vector>
 #include <cstdlib>
 
+#define FIX_PLT_REORDER         1
+
 //! \ingroup TLibCommon
 //! \{