Ticket #53: MULTIVALUE_FIX_r1.diff

App/TAppEncoder/TAppEncCfg.cpp

@@ -725 +725 @@
   const Int defaultLumaLevelTodQp_LumaChangePointsSDR[] = { 0, 117, 150, 184, 217, 250, 284, 317, 350, 384, 417, 450, 484 };
 
   // Multi-value input fields:                      // minval, maxval (incl), min_entries, max_entries (incl) [, default values, number of default values]
+#if KDDI_MULTIVALUE_FIX
+  SMultiValueInput<Int>  cfg_lumaLeveltoDQPMappingQP         (-MAX_QP, MAX_QP,                    0, LUMA_LEVEL_TO_DQP_LUT_MAXSIZE, defaultLumaLevelTodQp_QpChangePointsHDR,   sizeof(defaultLumaLevelTodQp_QpChangePointsHDR  )/sizeof(Int));
+  SMultiValueInput<Int>  cfg_lumaLeveltoDQPMappingLuma       (0, std::numeric_limits<Int>::max(), 0, LUMA_LEVEL_TO_DQP_LUT_MAXSIZE, defaultLumaLevelTodQp_LumaChangePointsHDR, sizeof(defaultLumaLevelTodQp_LumaChangePointsHDR)/sizeof(Int));
+#else
   SMultiValueInput<Int>  cfg_lumaLeveltoDQPMappingLuma(0, 0, 0, 0);
   SMultiValueInput<Int>  cfg_lumaLeveltoDQPMappingQP(0, 0, 0, 0);
+#endif
   
   UInt lumaLevelToDeltaQPMode;
 #endif

Lib/TLibCommon/TypeDef.h

@@ -46 +46 @@
 
 //! \ingroup TLibCommon
 //! \{
+
+#define KDDI_MULTIVALUE_FIX 1
+
 ///////////////////////////////////////////////////////////
 // KTA tools section start
 ///////////////////////////////////////////////////////////