Changeset 1157 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibCommon

Timestamp:

8 Jul 2015, 00:39:40 (9 years ago)

Author:

seregin

Message:

macro cleanup: P0295_DEFAULT_OUT_LAYER_IDC

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

• TComSlice.cpp (modified) (1 diff)
• TComSlice.h (modified) (2 diffs)
• TypeDef.h (modified) (1 diff)

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

@@ -1961 +1961 @@
 , m_numProfileTierLevel       (0)
 , m_numAddOutputLayerSets     (0)
-#if P0295_DEFAULT_OUT_LAYER_IDC
-, m_defaultTargetOutputLayerIdc     (0)
-#else
-#if O0109_DEFAULT_ONE_OUT_LAYER_IDC
-, m_defaultOneTargetOutputLayerIdc     (0)
-#else
-, m_defaultOneTargetOutputLayerFlag    (false)
-#endif
-#endif
+, m_defaultTargetOutputLayerIdc(0)
 , m_bitRatePresentVpsFlag     (false)
 , m_picRatePresentVpsFlag     (false)

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

@@ -666 +666 @@
   UInt       m_numProfileTierLevel;
   Int        m_numAddOutputLayerSets;
-#if P0295_DEFAULT_OUT_LAYER_IDC
   UInt       m_defaultTargetOutputLayerIdc;
-#else
-#if O0109_DEFAULT_ONE_OUT_LAYER_IDC
-  UInt       m_defaultOneTargetOutputLayerIdc;
-#else
-  Bool       m_defaultOneTargetOutputLayerFlag;
-#endif
-#endif
   std::vector< std::vector<Int> >  m_profileLevelTierIdx;
   Bool       m_maxOneActiveRefLayerFlag;
@@ -1028 +1020 @@
   Bool   isMotionPredictionType(Int currLayerIdx, Int refLayerIdx)              { assert(currLayerIdx != refLayerIdx); return ( ( ( m_directDependencyType[currLayerIdx][refLayerIdx] + 1 ) & 2 ) >> 1 ) ? true : false; }
 
-  UInt   getNumProfileTierLevel()                                { return m_numProfileTierLevel; }
-  Void   setNumProfileTierLevel(Int x)                           { m_numProfileTierLevel = x;    }
-  Int    getNumAddOutputLayerSets()                              { return m_numAddOutputLayerSets; }
-  Void   setNumAddOutputLayerSets(Int x)                         { m_numAddOutputLayerSets = x   ; }
-
-#if P0295_DEFAULT_OUT_LAYER_IDC
-  UInt   getDefaultTargetOutputLayerIdc()                 { return m_defaultTargetOutputLayerIdc;}
-  Void   setDefaultTargetOutputLayerIdc(UInt x)           { m_defaultTargetOutputLayerIdc = x    ;}
-#else
-#if O0109_DEFAULT_ONE_OUT_LAYER_IDC
-  UInt   getDefaultOneTargetOutputLayerIdc()                 { return m_defaultOneTargetOutputLayerIdc;}
-  Void   setDefaultOneTargetOutputLayerIdc(UInt x)           { m_defaultOneTargetOutputLayerIdc= x    ;}
-#else
-  Bool   getDefaultOneTargetOutputLayerFlag()                 { return m_defaultOneTargetOutputLayerFlag;}
-  Void   setDefaultOneTargetOutputLayerFlag(Bool x)           { m_defaultOneTargetOutputLayerFlag= x    ;}
-#endif
-#endif
-
-  Bool getNecessaryLayerFlag(Int const i, Int const j) { return m_necessaryLayerFlag[i][j]; }
-  std::vector< std::vector<Int> >* getProfileLevelTierIdx() { return &m_profileLevelTierIdx; }
-  std::vector<Int>* getProfileLevelTierIdx(Int const olsIdx) { return &m_profileLevelTierIdx[olsIdx]; }
-  Int    getProfileLevelTierIdx(Int const olsIdx, Int const layerIdx)     { return m_profileLevelTierIdx[olsIdx][layerIdx]; }
-  Void   setProfileLevelTierIdx(Int const olsIdx, Int const layerIdx, Int const ptlIdx)     { m_profileLevelTierIdx[olsIdx][layerIdx] = ptlIdx; }
+  UInt   getNumProfileTierLevel()                                               { return m_numProfileTierLevel;   }
+  Void   setNumProfileTierLevel(Int x)                                          { m_numProfileTierLevel = x;      }
+  Int    getNumAddOutputLayerSets()                                             { return m_numAddOutputLayerSets; }
+  Void   setNumAddOutputLayerSets(Int x)                                        { m_numAddOutputLayerSets = x   ; }
+
+  UInt   getDefaultTargetOutputLayerIdc()                                       { return m_defaultTargetOutputLayerIdc; }
+  Void   setDefaultTargetOutputLayerIdc(UInt x)                                 { m_defaultTargetOutputLayerIdc = x    ;}
+
+  Bool getNecessaryLayerFlag(Int const i, Int const j)                          { return m_necessaryLayerFlag[i][j];     }
+  std::vector< std::vector<Int> >* getProfileLevelTierIdx()                     { return &m_profileLevelTierIdx;         }
+  std::vector<Int>* getProfileLevelTierIdx(Int const olsIdx)                    { return &m_profileLevelTierIdx[olsIdx]; }
+  Int    getProfileLevelTierIdx(Int const olsIdx, Int const layerIdx)                   { return m_profileLevelTierIdx[olsIdx][layerIdx]; }
+  Void   setProfileLevelTierIdx(Int const olsIdx, Int const layerIdx, Int const ptlIdx) { m_profileLevelTierIdx[olsIdx][layerIdx] = ptlIdx; }
 #if MULTIPLE_PTL_SUPPORT
-  Void   addProfileLevelTierIdx(Int const olsIdx, Int const ptlIdx)     { m_profileLevelTierIdx[olsIdx].push_back(ptlIdx); }
+  Void   addProfileLevelTierIdx(Int const olsIdx, Int const ptlIdx)             { m_profileLevelTierIdx[olsIdx].push_back(ptlIdx); }
 #endif
   Int    calculateLenOfSyntaxElement( Int const numVal );

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

@@ -81 +81 @@
 #define O0109_VIEW_ID_LEN                1      ///< JCTVC-O0109: view_id_len_minus1 to view_id_len, and add constraint (1<<view_id_len) is greater than or equal to NumViews
 
-#define P0295_DEFAULT_OUT_LAYER_IDC      1      ///< JCTVC-P0295: modifify default_one_target_output_layer_idc to default_output_layer_idc
 #define O0109_DEFAULT_ONE_OUT_LAYER_IDC  1      ///< JCTVC-O0109: default_one_target_output_layer_flag to default_one_target_output_layer_idc