Changeset 1223 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibEncoder

Timestamp:

9 Jul 2015, 00:08:52 (10 years ago)

Author:

seregin

Message:

macro cleanup: SCALINGLIST_INFERRING

Location:

branches/SHM-dev/source/Lib/TLibEncoder

Files:

• TEncCavlc.cpp (modified) (4 diffs)
• TEncGOP.cpp (modified) (4 diffs)
• TEncTop.cpp (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -306 +306 @@
           case PPS_EXT__MLAYER:
             WRITE_FLAG( pcPPS->getPocResetInfoPresentFlag() ? 1 : 0, "poc_reset_info_present_flag" );
-#if SCALINGLIST_INFERRING
+
             WRITE_FLAG( pcPPS->getInferScalingListFlag() ? 1 : 0, "pps_infer_scaling_list_flag" );
             if( pcPPS->getInferScalingListFlag() )
@@ -314 +314 @@
               WRITE_CODE( pcPPS->getScalingListRefLayerId(), 6, "pps_scaling_list_ref_layer_id" );
             }
-#endif
 
             WRITE_UVLC( pcPPS->getNumRefLayerLocationOffsets(),      "num_ref_loc_offsets" );
@@ -644 +643 @@
   if(pcSPS->getScalingListFlag())
   {
-#if SCALINGLIST_INFERRING
+#if SVC_EXTENSION
     if( !V1CompatibleSPSFlag )
     {
@@ -665 +664 @@
       codeScalingList( m_pcSlice->getScalingList() );
     }
-#if SCALINGLIST_INFERRING
+#if SVC_EXTENSION
     }
 #endif

branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -1262 +1262 @@
     else if(m_pcEncTop->getUseScalingListId() == SCALING_LIST_DEFAULT)
     {
-#if SCALINGLIST_INFERRING
+#if SVC_EXTENSION
       // inferring of the scaling list can be moved to the config file
       UInt refLayerId = 0;
@@ -1283 +1283 @@
       m_pcEncTop->getPPS()->setScalingListPresentFlag(false);
 
-#if SCALINGLIST_INFERRING
+#if SVC_EXTENSION
       }
 #endif
@@ -1292 +1292 @@
     else if(m_pcEncTop->getUseScalingListId() == SCALING_LIST_FILE_READ)
     {
-#if SCALINGLIST_INFERRING
+#if SVC_EXTENSION
       // inferring of the scaling list can be moved to the config file
       UInt refLayerId = 0;
@@ -1320 +1320 @@
       m_pcEncTop->getPPS()->setScalingListPresentFlag(false);
 
-#if SCALINGLIST_INFERRING
+#if SVC_EXTENSION
     }
 #endif

branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.cpp

@@ -999 +999 @@
   
 #if SVC_EXTENSION
-#if SCALINGLIST_INFERRING
   m_cPPS.setLayerId( m_layerId );
-#endif
 
   if( !m_numDirectRefLayers && m_numAddLayerSets )