Changeset 1526 in SHVCSoftware for branches

Timestamp:

17 Feb 2016, 23:26:22 (9 years ago)

Author:

seregin

Message:

enable layer-wise lossless setting, patched-by Guillaume Barroux <guillaume.b@…>

Location:

branches/SHM-dev/source

Files:

• App/TAppEncoder/TAppEncCfg.cpp (modified) (8 diffs)
• App/TAppEncoder/TAppEncCfg.h (modified) (1 diff)
• App/TAppEncoder/TAppEncLayerCfg.h (modified) (1 diff)
• App/TAppEncoder/TAppEncTop.cpp (modified) (1 diff)
• Lib/TLibCommon/TypeDef.h (modified) (1 diff)

branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -790 +790 @@
   Bool*   cfg_bUseSAO[MAX_LAYERS];
 
+#if PER_LAYER_LOSSLESS
+  Bool*     cfg_TransquantBypassEnableFlag[MAX_LAYERS];
+  Bool*     cfg_CUTransquantBypassFlagForce[MAX_LAYERS];
+  CostMode* cfg_costMode[MAX_LAYERS];  
+#endif
+
   for( UInt layer = 0; layer < m_numLayers; layer++ )
   {
@@ -890 +896 @@
 
     cfg_bUseSAO[layer]              = &m_apcLayerCfg[layer]->m_bUseSAO;
+
+#if PER_LAYER_LOSSLESS
+    cfg_TransquantBypassEnableFlag[layer]   = &m_apcLayerCfg[layer]->m_TransquantBypassEnableFlag;
+    cfg_CUTransquantBypassFlagForce[layer]  = &m_apcLayerCfg[layer]->m_CUTransquantBypassFlagForce;
+    cfg_costMode[layer]                     = &m_apcLayerCfg[layer]->m_costMode;  
+#endif
   }
 
@@ -1420 +1432 @@
 #endif
 
+#if PER_LAYER_LOSSLESS
+  ("TransquantBypassEnableFlag%d",                    cfg_TransquantBypassEnableFlag,        false, m_numLayers, "transquant_bypass_enable_flag indicator in PPS")
+  ("CUTransquantBypassFlagForce%d",                   cfg_CUTransquantBypassFlagForce,       false, m_numLayers, "Force transquant bypass mode, when transquant_bypass_enable_flag is enabled")
+  ("CostMode%d",                                      cfg_costMode,            COST_STANDARD_LOSSY, m_numLayers, "Use alternative cost functions: choose between 'lossy', 'sequence_level_lossless', 'lossless' (which forces QP to " MACRO_TO_STRING(LOSSLESS_AND_MIXED_LOSSLESS_RD_COST_TEST_QP) ") and 'mixed_lossless_lossy' (which used QP'=" MACRO_TO_STRING(LOSSLESS_AND_MIXED_LOSSLESS_RD_COST_TEST_QP_PRIME) " for pre-estimates of transquant-bypass blocks).")
+#else
   ("TransquantBypassEnableFlag",                      m_TransquantBypassEnableFlag,                     false, "transquant_bypass_enable_flag indicator in PPS")
   ("CUTransquantBypassFlagForce",                     m_CUTransquantBypassFlagForce,                    false, "Force transquant bypass mode, when transquant_bypass_enable_flag is enabled")
   ("CostMode",                                        m_costMode,                         COST_STANDARD_LOSSY, "Use alternative cost functions: choose between 'lossy', 'sequence_level_lossless', 'lossless' (which forces QP to " MACRO_TO_STRING(LOSSLESS_AND_MIXED_LOSSLESS_RD_COST_TEST_QP) ") and 'mixed_lossless_lossy' (which used QP'=" MACRO_TO_STRING(LOSSLESS_AND_MIXED_LOSSLESS_RD_COST_TEST_QP_PRIME) " for pre-estimates of transquant-bypass blocks).")
+#endif
   ("RecalculateQPAccordingToLambda",                  m_recalculateQPAccordingToLambda,                 false, "Recalculate QP values according to lambda values. Do not suggest to be enabled in all intra case")
   ("StrongIntraSmoothing,-sis",                       m_useStrongIntraSmoothing,                         true, "Enable strong intra smoothing for 32x32 blocks")
@@ -3099 +3117 @@
   Int& m_extraRPSs                            = m_apcLayerCfg[layerIdx]->m_extraRPSs;
   GOPEntry* m_GOPList                         = m_apcLayerCfg[layerIdx]->m_GOPList;
+
+#if PER_LAYER_LOSSLESS
+  Bool& m_CUTransquantBypassFlagForce         = m_apcLayerCfg[layerIdx]->m_CUTransquantBypassFlagForce;
+#endif
 #else
 Void TAppEncCfg::xCheckParameter()
@@ -3947 +3969 @@
   }
 #endif
-
+  
+#if PER_LAYER_LOSSLESS
+  xConfirmPara(!m_apcLayerCfg[layerIdx]->m_TransquantBypassEnableFlag && m_apcLayerCfg[layerIdx]->m_CUTransquantBypassFlagForce, "CUTransquantBypassFlagForce cannot be 1 when TransquantBypassEnableFlag is 0");
+#else
   xConfirmPara(!m_TransquantBypassEnableFlag && m_CUTransquantBypassFlagForce, "CUTransquantBypassFlagForce cannot be 1 when TransquantBypassEnableFlag is 0");
+#endif
 
   xConfirmPara(m_log2ParallelMergeLevel < 2, "Log2ParallelMergeLevel should be larger than or equal to 2");
@@ -4163 +4189 @@
     UInt& m_RCCpbSize                       = m_apcLayerCfg[layerIdx]->m_RCCpbSize;
     Double& m_RCInitialCpbFullness          = m_apcLayerCfg[layerIdx]->m_RCInitialCpbFullness;
+#endif
+
+#if PER_LAYER_LOSSLESS
+    CostMode& m_costMode                    = m_apcLayerCfg[layerIdx]->m_costMode;
 #endif
 
@@ -4449 +4479 @@
   printf("PCM:%d ", (m_usePCM && (1<<m_uiPCMLog2MinSize) <= m_uiMaxCUWidth)? 1 : 0);
 
+#if PER_LAYER_LOSSLESS
+  if (m_apcLayerCfg[layer]->m_TransquantBypassEnableFlag && m_apcLayerCfg[layer]->m_CUTransquantBypassFlagForce)
+  {
+    printf("TransQuantBypassEnabled: =1");
+  }
+  else
+  {
+    printf("TransQuantBypassEnabled:%d ", (m_apcLayerCfg[layer]->m_TransquantBypassEnableFlag)? 1:0 );
+  }
+#else
   if (m_TransquantBypassEnableFlag && m_CUTransquantBypassFlagForce)
   {
@@ -4457 +4497 @@
     printf("TransQuantBypassEnabled:%d ", (m_TransquantBypassEnableFlag)? 1:0 );
   }
+#endif
 
   printf("WPP:%d ", (Int)m_useWeightedPred);

branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.h

@@ -466 +466 @@
 #endif
 
+#if !PER_LAYER_LOSSLESS
   Bool      m_TransquantBypassEnableFlag;                     ///< transquant_bypass_enable_flag setting in PPS.
   Bool      m_CUTransquantBypassFlagForce;                    ///< if transquant_bypass_enable_flag, then, if true, all CU transquant bypass flags will be set to true.
   CostMode  m_costMode;                                       ///< Cost mode to use
+#endif
 
   Bool      m_recalculateQPAccordingToLambda;                 ///< recalculate QP value according to the lambda value

branches/SHM-dev/source/App/TAppEncoder/TAppEncLayerCfg.h

@@ -100 +100 @@
   Bool      m_bUseSAO;
 
+#if PER_LAYER_LOSSLESS
+  Bool      m_TransquantBypassEnableFlag;
+  Bool      m_CUTransquantBypassFlagForce;
+  CostMode  m_costMode;
+#endif
+
   ScalingListMode m_useScalingListId;                         ///< using quantization matrix
   std::string m_scalingListFileName;                          ///< quantization matrix file name

branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp

@@ -534 +534 @@
 
     string&        m_colourRemapSEIFileRoot                     = m_apcLayerCfg[layer]->m_colourRemapSEIFileRoot;
+#if PER_LAYER_LOSSLESS
+    Bool&          m_TransquantBypassEnableFlag                 = m_apcLayerCfg[layer]->m_TransquantBypassEnableFlag;
+    Bool&          m_CUTransquantBypassFlagForce                = m_apcLayerCfg[layer]->m_CUTransquantBypassFlagForce;
+    CostMode&      m_costMode                                   = m_apcLayerCfg[layer]->m_costMode;
+#endif
 #endif
 

branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h

@@ -48 +48 @@
 
 #if SVC_EXTENSION
+#define PER_LAYER_LOSSLESS               1
 #define SCALABLE_REXT                    1      ///< enabling scalable RExt profiles, for bit-depth greater than 10 consider to enable RExt__HIGH_BIT_DEPTH_SUPPORT