Changeset 1124 in SHVCSoftware for branches/SHM-dev/source/Lib

Timestamp:

7 Jul 2015, 02:24:58 (10 years ago)

Author:

seregin

Message:

macro cleanup: P0300_ALT_OUTPUT_LAYER_FLAG, O0153_ALT_OUTPUT_LAYER_FLAG

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TComSlice.h (modified) (3 diffs)
• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecCAVLC.cpp (modified) (4 diffs)
• TLibEncoder/TEncCavlc.cpp (modified) (3 diffs)
• TLibEncoder/TEncCfg.h (modified) (3 diffs)

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

@@ -752 +752 @@
   Int        m_avgPicRate          [MAX_VPS_LAYER_SETS_PLUS1][MAX_TLAYER];
 
-#if P0300_ALT_OUTPUT_LAYER_FLAG
 #if Q0078_ADD_LAYER_SETS
   Bool       m_altOutputLayerFlag[MAX_VPS_LAYER_SETS_PLUS1 + 2*MAX_NUM_ADD_LAYER_SETS];
@@ -758 +757 @@
   Bool       m_altOutputLayerFlag[MAX_VPS_LAYER_SETS_PLUS1];
 #endif
-#else
-#if O0153_ALT_OUTPUT_LAYER_FLAG
-  Bool       m_altOutputLayerFlag;
-#endif
-#endif
+
 #if REPN_FORMAT_IN_VPS
   Bool       m_repFormatIdxPresentFlag;
@@ -1271 +1266 @@
 #endif
 
-#if P0300_ALT_OUTPUT_LAYER_FLAG
   Bool   getAltOuputLayerFlag(Int idx)         { return m_altOutputLayerFlag[idx]; }
   Void   setAltOuputLayerFlag(Int idx, Bool x) { m_altOutputLayerFlag[idx] = x;    }
-#else
-#if O0153_ALT_OUTPUT_LAYER_FLAG
-  Bool   getAltOuputLayerFlag()             { return m_altOutputLayerFlag; }
-  Void   setAltOuputLayerFlag(Bool x)       { m_altOutputLayerFlag = x;    }
-#endif
-#endif
+
 #if REPN_FORMAT_IN_VPS
   Bool   getRepFormatIdxPresentFlag()       { return m_repFormatIdxPresentFlag; }

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

@@ -190 +190 @@
 #define O0098_SCALED_REF_LAYER_ID        1      ///< JCTVC-O0098: signal scaled reference id
 
-#define O0153_ALT_OUTPUT_LAYER_FLAG      1      ///< JCTVC-O0153: alt output layer flag
-#define P0300_ALT_OUTPUT_LAYER_FLAG      1      ///< JCTVC-P0300: alt output layer flag
-
 #define Q0165_OUTPUT_LAYER_SET           1      ///< JCTVC-Q0165: add a constraint to disallow an empty output layer set
 #define Q0165_NUM_ADD_OUTPUT_LAYER_SETS  1      ///< JCTVC-Q0165: signal num_add_olss and default_target_output_layer_idc when vps_num_layer_sets_minus1 is greater than 0

branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -2698 +2698 @@
 {
   UInt uiCode;
-  // ... More syntax elements to be parsed here
-#if P0300_ALT_OUTPUT_LAYER_FLAG
   Int NumOutputLayersInOutputLayerSet[MAX_VPS_LAYER_SETS_PLUS1];
   Int OlsHighestOutputLayerId[MAX_VPS_LAYER_SETS_PLUS1];
-#endif
 #if LIST_OF_PTL
   if( vps->getMaxLayers() > 1 && vps->getBaseLayerInternalFlag() )
@@ -3089 +3086 @@
     READ_CODE( numBits, uiCode, "profile_tier_level_idx[i]" );     vps->setProfileLevelTierIdx(i, uiCode);
 #endif
-#if P0300_ALT_OUTPUT_LAYER_FLAG
+
     NumOutputLayersInOutputLayerSet[i] = 0;
     for (j = 0; j < vps->getNumLayersInIdList(layerSetIdxForOutputLayerSet); j++)
@@ -3113 +3110 @@
 #if Q0165_OUTPUT_LAYER_SET
     assert( NumOutputLayersInOutputLayerSet[i]>0 );
-#endif
-
 #endif
   }
@@ -3210 +3205 @@
     READ_CODE( numBits, uiCode, "profile_level_tier_idx[i]" );     vps->setProfileLevelTierIdx(i, uiCode);
   }
-#endif
-
-#if !P0300_ALT_OUTPUT_LAYER_FLAG
-#if O0153_ALT_OUTPUT_LAYER_FLAG
-  if( vps->getMaxLayers() > 1 )
-  {
-    READ_FLAG( uiCode, "alt_output_layer_flag");
-    vps->setAltOuputLayerFlag( uiCode ? true : false );
-  }
-#endif
 #endif
 

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

@@ -1988 +1988 @@
 Void TEncCavlc::codeVPSExtension (TComVPS *vps)
 {
-  // ... More syntax elements to be written here
-#if P0300_ALT_OUTPUT_LAYER_FLAG
   Int NumOutputLayersInOutputLayerSet[MAX_VPS_LAYER_SETS_PLUS1];
   Int OlsHighestOutputLayerId[MAX_VPS_LAYER_SETS_PLUS1];
-#endif
 #if LIST_OF_PTL
   if( vps->getMaxLayers() > 1 && vps->getBaseLayerInternalFlag() )
@@ -2247 +2244 @@
     WRITE_CODE( vps->getProfileLevelTierIdx(i), numBits, "profile_level_tier_idx[i]" );     
 #endif
-#if P0300_ALT_OUTPUT_LAYER_FLAG
+
     NumOutputLayersInOutputLayerSet[i] = 0;
     for (j = 0; j < vps->getNumLayersInIdList(layerSetIdxForOutputLayerSet); j++)
@@ -2265 +2262 @@
     assert( NumOutputLayersInOutputLayerSet[i]>0 );
 #endif
-
-#endif
-  }
-
-#if !P0300_ALT_OUTPUT_LAYER_FLAG
-#if O0153_ALT_OUTPUT_LAYER_FLAG
-  if( vps->getMaxLayers() > 1 )
-  {
-    WRITE_FLAG( vps->getAltOuputLayerFlag(), "alt_output_layer_flag" );   
-  }
-#endif
-#endif
+  }
 
 #if REPN_FORMAT_IN_VPS

branches/SHM-dev/source/Lib/TLibEncoder/TEncCfg.h

@@ -377 +377 @@
   int       m_layerSwitchOffEnd;
 #endif
-#if O0153_ALT_OUTPUT_LAYER_FLAG
   Bool      m_altOutputLayerFlag;
-#endif
 #if HIGHER_LAYER_IRAP_SKIP_FLAG
   Int       m_skipPictureAtArcSwitch;
@@ -1036 +1034 @@
   ChromaFormat getChromaFormatIDC()               { return m_chromaFormatIDC; }
 #endif
-#if O0153_ALT_OUTPUT_LAYER_FLAG
   Bool      getAltOuputLayerFlag() const { return m_altOutputLayerFlag; }
   Void      setAltOuputLayerFlag(Bool b) { m_altOutputLayerFlag = b;    }
-#endif
 #if O0149_CROSS_LAYER_BLA_FLAG
   Bool      getCrossLayerBLAFlag() const { return m_crossLayerBLAFlag; }
@@ -1179 +1175 @@
 #endif
 #endif
-#endif
+#endif //SVC_EXTENSION
 };