Changeset 1418 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibCommon/TComDataCU.h

Timestamp:

4 Aug 2015, 20:21:46 (9 years ago)

Author:

seregin

Message:

remove global variables g_reducedSetIntraModes and g_predefSetIntraModes, and make them TComDataCU members

File:

• branches/SHM-dev/source/Lib/TLibCommon/TComDataCU.h (modified) (3 diffs)

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

@@ -89 +89 @@
 #if SVC_EXTENSION
   UInt          m_layerId;          ///< layer id
+#if FAST_INTRA_SHVC
+  UChar         m_reducedSetIntraModes[NUM_INTRA_MODE-1];
+#endif
 #endif
 
@@ -474 +477 @@
  
 #if SVC_EXTENSION
-  Void          setLayerId (UInt layerId) { m_layerId = layerId; }
-  UInt          getLayerId ()               { return m_layerId; }
-  UInt          getLayerIdx ()              { return m_pcSlice->getVPS()->getLayerIdxInVps(m_layerId); }
+  Void          setLayerId (UInt layerId)       { m_layerId = layerId; }
+  UInt          getLayerId ()                   { return m_layerId; }
+  UInt          getLayerIdx ()                  { return m_pcSlice->getVPS()->getLayerIdxInVps(m_layerId); }
 #if N0383_IL_CONSTRAINED_TILE_SETS_SEI
   Bool          isInterLayerReference(UChar uhInterDir, TComMvField& cMvFieldL0, TComMvField& cMvFieldL1);
 #endif
 #if FAST_INTRA_SHVC
-  Int           reduceSetOfIntraModes              (  UInt   uiAbsPartIdx, Int* uiIntraDirPred, Int &fullSetOfModes );
+  Int           reduceSetOfIntraModes(  UInt   uiAbsPartIdx, Int* uiIntraDirPred, Int &fullSetOfModes );
 #endif
 #if REF_IDX_ME_ZEROMV
@@ -490 +493 @@
   TComDataCU*   getBaseColCU( UInt refLayerIdc, UInt pelX, UInt pelY, UInt &uiCUAddrBase, UInt &uiAbsPartIdxBase, Bool motionMapping = false );
   Void          scaleBaseMV( UInt refLayerIdc, TComMvField& rcMvFieldEnhance, TComMvField& rcMvFieldBase );
+#if FAST_INTRA_SHVC
+  UChar         getReducedSetIntraModes(UChar idx)     { assert( idx < NUM_INTRA_MODE-1 ); return m_reducedSetIntraModes[idx]; }
+#endif
 #endif
 };