Ticket #1421: ticket_1421.patch

Lib/TLibCommon/TypeDef.h

@@ -45 +45 @@
 #include <vector>
 #include <cstdlib>
 
+#define FIX_DELTA_QP_SIGN       1
+
 //! \ingroup TLibCommon
 //! \{
 
@@ -176 +178 @@
 #define SCM_T0056_IBC_VALIDATE_TILES                     1 ///< Print at decoder when IBC reaches outside of current tile
 #define SCM_GET_DERIVED_BV_BUGFIX                        1 ///< Bug fix in related to block vector derivation
 #define SCM_IBC_MVP_ENC_ONLY_BUGFIX                      1 ///< Encoder only bug fix for IBC block vector predictor derivation
-#define SCM_S0043_PLT_DELTA_QP                           0 ///< JCTVC-S0043: delta qp signalling for palette mode
+#define SCM_S0043_PLT_DELTA_QP                           1 ///< JCTVC-S0043: delta qp signalling for palette mode
 #define SCM_U0090_REMOVE_LAST_RUN_TYPE_CTX               1 ///< JCTVC-U0090, last_palette_run_type_flag use the same CABAC context that is used for palette_run_type_flag
 #define SCM_U0104_CURR_PIC_IN_LIST1                      1 ///< JCTVC-U0104: put current picture in both L0 and L1 when IBC is enabled
 #define SCM_FIX_TICKET_1401                              1 ///< Fix for Ticket #1401 related to CIP process

Lib/TLibDecoder/TDecEntropy.cpp

@@ -74 +74 @@
 Void TDecEntropy::decodePLTModeInfo( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, Bool& bCodeDQP, Bool& isChromaQpAdjCoded )
 {
   // Note: the condition is log2CbSize < MaxTbLog2SizeY in 7.3.8.5 of JCTVC-T1005-v2
+#if FIX_DELTA_QP_SIGN
+  if( pcCU->getSlice()->getSPS()->getSpsScreenExtension().getUsePLTMode() && pcCU->isIntra( uiAbsPartIdx ) && (pcCU->getSlice()->getSPS()->getMaxCUWidth() >> uiDepth) < 64 )
+#else
   if( pcCU->isIntra( uiAbsPartIdx ) && pcCU->getSlice()->getSPS()->getMaxCUWidth()>>uiDepth < 64 && !pcCU->isIntraBC( uiAbsPartIdx ) )
+#endif
   {
     m_pcEntropyDecoderIf->parsePLTModeFlag( pcCU, uiAbsPartIdx, uiDepth );
     if ( pcCU->getPLTModeFlag( uiAbsPartIdx ) )

Lib/TLibDecoder/TDecSbac.cpp

@@ -892 +892 @@
       codeChromaQpAdj = false;
     }
 
+#if !FIX_DELTA_QP_SIGN
     for (Int comp = compBegin; comp < compBegin + uiNumComp; comp++)
     {
       uiMaxVal[comp] = pcCU->xCalcMaxVals(pcCU, ComponentID(comp));
     }
+#endif
   }
 #endif
 

Lib/TLibEncoder/TEncEntropy.cpp

@@ -99 +99 @@
     }
 
     // Note: the condition is log2CbSize < MaxTbLog2SizeY in 7.3.8.5 of JCTVC-T1005-v2
+#if FIX_DELTA_QP_SIGN
+    if( !pcCU->isIntra( uiAbsPartIdx ) || pcCU->getWidth(uiAbsPartIdx) == 64 )
+#else
     if( !pcCU->isIntra( uiAbsPartIdx ) || pcCU->getWidth(uiAbsPartIdx) == 64 || pcCU->isIntraBC( uiAbsPartIdx ) )
+#endif
     {
       return;
     }
@@ -199 +203 @@
 
   if ( pcCU->getSlice()->isIntra() )
   {
+#if !FIX_DELTA_QP_SIGN
     if ( pcCU->isIntra( uiAbsPartIdx ) )
     {
       encodePLTModeInfo( pcCU, uiAbsPartIdx );
@@ -210 +215 @@
         }
       }
     }
+#endif
 
     return;
   }

Lib/TLibEncoder/TEncSbac.cpp

@@ -825 +825 @@
       *codeChromaQpAdj = false;
     }
 
+#if !FIX_DELTA_QP_SIGN
     for (Int comp = compBegin; comp < compBegin + uiNumComp; comp++)
     {
       uiMaxVal[comp] = pcCU->xCalcMaxVals(pcCU, ComponentID(comp));
     }
+#endif
   }
 #endif