Changeset 1567 in SHVCSoftware for branches/SHM-dev/source/App

Timestamp:

20 Jun 2016, 18:05:58 (9 years ago)

Author:

seregin

Message:

port rev 4744

Location:

branches/SHM-dev/source/App/TAppEncoder

Files:

• TAppEncCfg.cpp (modified) (7 diffs)
• TAppEncCfg.h (modified) (1 diff)
• TAppEncLayerCfg.h (modified) (1 diff)
• TAppEncTop.cpp (modified) (2 diffs)

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

@@ -799 +799 @@
 
 #if PER_LAYER_LOSSLESS
-  Bool*     cfg_TransquantBypassEnableFlag[MAX_LAYERS];
+  Bool*     cfg_TransquantBypassEnabledFlag[MAX_LAYERS];
   Bool*     cfg_CUTransquantBypassFlagForce[MAX_LAYERS];
   CostMode* cfg_costMode[MAX_LAYERS];  
@@ -910 +910 @@
 
 #if PER_LAYER_LOSSLESS
-    cfg_TransquantBypassEnableFlag[layer]   = &m_apcLayerCfg[layer]->m_TransquantBypassEnableFlag;
+    cfg_TransquantBypassEnabledFlag[layer]  = &m_apcLayerCfg[layer]->m_TransquantBypassEnabledFlag;
     cfg_CUTransquantBypassFlagForce[layer]  = &m_apcLayerCfg[layer]->m_CUTransquantBypassFlagForce;
     cfg_costMode[layer]                     = &m_apcLayerCfg[layer]->m_costMode;  
@@ -1461 +1461 @@
 
 #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).")
+  ("TransquantBypassEnable%d",                        cfg_TransquantBypassEnabledFlag,     false, m_numLayers, "transquant_bypass_enabled_flag indicator in PPS")
+  ("TransquantBypassEnableFlag%d",                    cfg_TransquantBypassEnabledFlag,     false, m_numLayers, "deprecated alias for TransquantBypassEnable")
+  ("CUTransquantBypassFlagForce%d",                   cfg_CUTransquantBypassFlagForce,     false, m_numLayers, "Force transquant bypass mode, when transquant_bypass_enabled_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")
+  ("TransquantBypassEnable",                          m_TransquantBypassEnabledFlag,                    false, "transquant_bypass_enabled_flag indicator in PPS")
+  ("TransquantBypassEnableFlag",                      m_TransquantBypassEnabledFlag,                    false, "deprecated alias for TransquantBypassEnable")
+  ("CUTransquantBypassFlagForce",                     m_CUTransquantBypassFlagForce,                    false, "Force transquant bypass mode, when transquant_bypass_enabled_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
@@ -4076 +4078 @@
   
 #if PER_LAYER_LOSSLESS
-  xConfirmPara(!m_apcLayerCfg[layerIdx]->m_TransquantBypassEnableFlag && m_apcLayerCfg[layerIdx]->m_CUTransquantBypassFlagForce, "CUTransquantBypassFlagForce cannot be 1 when TransquantBypassEnableFlag is 0");
+  xConfirmPara(!m_apcLayerCfg[layerIdx]->m_TransquantBypassEnabledFlag && 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");
+  xConfirmPara(!m_TransquantBypassEnabledFlag && m_CUTransquantBypassFlagForce, "CUTransquantBypassFlagForce cannot be 1 when TransquantBypassEnableFlag is 0");
 #endif
 
@@ -4606 +4608 @@
 
 #if PER_LAYER_LOSSLESS
-  if (m_apcLayerCfg[layer]->m_TransquantBypassEnableFlag && m_apcLayerCfg[layer]->m_CUTransquantBypassFlagForce)
+  if (m_apcLayerCfg[layer]->m_TransquantBypassEnabledFlag && m_apcLayerCfg[layer]->m_CUTransquantBypassFlagForce)
   {
     printf("TransQuantBypassEnabled: =1");
@@ -4612 +4614 @@
   else
   {
-    printf("TransQuantBypassEnabled:%d ", (m_apcLayerCfg[layer]->m_TransquantBypassEnableFlag)? 1:0 );
+    printf("TransQuantBypassEnabled:%d ", (m_apcLayerCfg[layer]->m_TransquantBypassEnabledFlag)? 1:0 );
   }
 #else
-  if (m_TransquantBypassEnableFlag && m_CUTransquantBypassFlagForce)
+  if (m_TransquantBypassEnabledFlag && m_CUTransquantBypassFlagForce)
   {
     printf("TransQuantBypassEnabled: =1");
@@ -4621 +4623 @@
   else
   {
-    printf("TransQuantBypassEnabled:%d ", (m_TransquantBypassEnableFlag)? 1:0 );
+    printf("TransQuantBypassEnabled:%d ", (m_TransquantBypassEnabledFlag)? 1:0 );
   }
 #endif

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

@@ -485 +485 @@
 
 #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.
+  Bool      m_TransquantBypassEnabledFlag;                    ///< transquant_bypass_enabled_flag setting in PPS.
+  Bool      m_CUTransquantBypassFlagForce;                    ///< if transquant_bypass_enabled_flag, then, if true, all CU transquant bypass flags will be set to true.
   CostMode  m_costMode;                                       ///< Cost mode to use
 #endif

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

@@ -105 +105 @@
 
 #if PER_LAYER_LOSSLESS
-  Bool      m_TransquantBypassEnableFlag;
-  Bool      m_CUTransquantBypassFlagForce;
+  Bool      m_TransquantBypassEnabledFlag;                    ///< 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;
 #endif

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

@@ -538 +538 @@
     string&        m_colourRemapSEIFileRoot                     = m_apcLayerCfg[layer]->m_colourRemapSEIFileRoot;
 #if PER_LAYER_LOSSLESS
-    Bool&          m_TransquantBypassEnableFlag                 = m_apcLayerCfg[layer]->m_TransquantBypassEnableFlag;
+    Bool&          m_TransquantBypassEnabledFlag                = m_apcLayerCfg[layer]->m_TransquantBypassEnabledFlag;
     Bool&          m_CUTransquantBypassFlagForce                = m_apcLayerCfg[layer]->m_CUTransquantBypassFlagForce;
     CostMode&      m_costMode                                   = m_apcLayerCfg[layer]->m_costMode;
@@ -845 +845 @@
   m_cTEncTop.setInitialCpbFullness                                ( m_RCInitialCpbFullness );
 #endif
-  m_cTEncTop.setTransquantBypassEnableFlag                        ( m_TransquantBypassEnableFlag );
+  m_cTEncTop.setTransquantBypassEnabledFlag                       ( m_TransquantBypassEnabledFlag );
   m_cTEncTop.setCUTransquantBypassFlagForceValue                  ( m_CUTransquantBypassFlagForce );
   m_cTEncTop.setCostMode                                          ( m_costMode );