Ticket #1464: fix_localRPS.patch

source/Lib/TLibCommon/TypeDef.h

@@ -38 +38 @@
 #ifndef __TYPEDEF__
 #define __TYPEDEF__
 
+#define FIX_LOCAL_RPS                                     2 ///< fix localRPS usage in arrangeLongtermPicturesInRPS
+
 #ifndef __COMMONDEF__
 #error Include CommonDef.h not TypeDef.h
 #endif

source/Lib/TLibEncoder/TEncGOP.cpp

@@ -2511 +2511 @@
   {
     return;
   }
+#if FIX_LOCAL_RPS == 1
+  TComReferencePictureSet *rps = pcSlice->getRPS();
+#elif FIX_LOCAL_RPS == 2
+  TComReferencePictureSet *rps = pcSlice->getLocalRPS();
+  if (pcSlice->getRPSidx() != -1)
+  {
+//  (*rps)=TComReferencePictureSet();
+    memcpy(rps, pcSlice->getRPS(), sizeof(TComReferencePictureSet));
+    pcSlice->setRPS(rps);
+    pcSlice->setRPSidx(-1);
+  }
+#else
   // we can only modify the local RPS!
   assert (pcSlice->getRPSidx()==-1);
   TComReferencePictureSet *rps = pcSlice->getLocalRPS();
+#endif
 
   // Arrange long-term reference pictures in the correct order of LSB and MSB,
   // and assign values for pocLSBLT and MSB present flag