Ticket #1420: ticket_1420.patch

Lib/TLibCommon/TypeDef.h

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

Lib/TLibEncoder/TEncCu.cpp

@@ -1331 +1331 @@
 
   if( !terminateAllFurtherRDO && bSubBranch && uiDepth < sps.getLog2DiffMaxMinCodingBlockSize() && (!getFastDeltaQp() || uiWidth > fastDeltaQPCuMaxSize || bBoundary))
   {
+#if FIX_PLT_PRED
+    PaletteInfoBuffer tempPalettePredictor;
+
+    if( iMinQP != iMaxQP )
+    {
+      memcpy( tempPalettePredictor.lastPLTSize, lastPLTSize, sizeof( lastPLTSize ) );
+      memcpy( tempPalettePredictor.lastPLT[0],  lastPLT[0], sizeof( tempPalettePredictor.lastPLT[0] ) );
+      memcpy( tempPalettePredictor.lastPLT[1],  lastPLT[1], sizeof( tempPalettePredictor.lastPLT[1] ) );
+      memcpy( tempPalettePredictor.lastPLT[2],  lastPLT[2], sizeof( tempPalettePredictor.lastPLT[2] ) );
+    }
+#endif
+
     // further split
     for (Int iQP=iMinQP; iQP<=iMaxQP; iQP++)
     {
@@ -1343 +1355 @@
       TComDataCU* pcSubTempPartCU     = m_ppcTempCU[uhNextDepth];
       DEBUG_STRING_NEW(sTempDebug)
 
+#if FIX_PLT_PRED
+      if( iMinQP != iMaxQP && iQP != iMinQP )
+      {
+        memcpy( lastPLTSize, tempPalettePredictor.lastPLTSize, sizeof( lastPLTSize ) );
+        memcpy( lastPLT[0],  tempPalettePredictor.lastPLT[0],  sizeof( tempPalettePredictor.lastPLT[0] ) );
+        memcpy( lastPLT[1],  tempPalettePredictor.lastPLT[1],  sizeof( tempPalettePredictor.lastPLT[1] ) );
+        memcpy( lastPLT[2],  tempPalettePredictor.lastPLT[2],  sizeof( tempPalettePredictor.lastPLT[2] ) );
+      }
+#endif
+
       for ( UInt uiPartUnitIdx = 0; uiPartUnitIdx < 4; uiPartUnitIdx++ )
       {
         pcSubBestPartCU->initSubCU( rpcTempCU, uiPartUnitIdx, uhNextDepth, iQP );           // clear sub partition datas or init.