Ticket #191: JVET_M0427_INIT_FIX.patch

source/Lib/CommonLib/RdCost.cpp

@@ -177 +177 @@
   m_motionLambda               = 0;
   m_iCostScale                 = 0;
 #if JVET_M0427_INLOOP_RESHAPER
+#if ! JVET_M0427_INIT_FIX
   m_signalType                 = RESHAPE_SIGNAL_NULL;
   m_chromaWeight               = 1.0;
   m_lumaBD                     = 10;
 #endif
+#endif
 }
 
 
@@ -2868 +2870 @@
 
 #if WCG_EXT
 #if JVET_M0427_INLOOP_RESHAPER
+#if JVET_M0427_INIT_FIX
+  uint32_t   RdCost::m_signalType                 = RESHAPE_SIGNAL_NULL;
+  double     RdCost::m_chromaWeight               = 1.0;
+  int        RdCost::m_lumaBD                     = 10;
+#else
 uint32_t   RdCost::m_signalType;
 double     RdCost::m_chromaWeight;
 int        RdCost::m_lumaBD;
+#endif
 std::vector<double> RdCost::m_reshapeLumaLevelToWeightPLUT;
 std::vector<double> RdCost::m_lumaLevelToWeightPLUT;
 #else
@@ -2928 +2936 @@
       m_lumaLevelToWeightPLUT[i] = m_reshapeLumaLevelToWeightPLUT[i];
     }
   }
+  m_chromaWeight = 1.0;
 }
 
 void RdCost::updateReshapeLumaLevelToWeightTableChromaMD(std::vector<Pel>& ILUT)

source/Lib/CommonLib/TypeDef.h

@@ -50 +50 @@
 #include <assert.h>
 #include <cassert>
 
+#define JVET_M0427_INIT_FIX                               1
+
 #define JVET_M0055_DEBUG_CTU                              1 // DebugCTU encoder debug option
 
 #define JVET_M0297_32PT_MTS_ZERO_OUT                      1 // 32 point MTS based on skipping high frequency coefficients