Changeset 377 in SHVCSoftware for branches/SHM-3.1-dev/source/Lib/TLibEncoder/TEncCfg.h

Timestamp:

30 Aug 2013, 03:29:41 (11 years ago)

Author:

seregin

Message:

remove REF_IDX_FRAMEWORK macro

File:

• branches/SHM-3.1-dev/source/Lib/TLibEncoder/TEncCfg.h (modified) (2 diffs)

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

@@ -363 +363 @@
   UInt      m_layerId;   
   UInt      m_numLayer;
-#endif 
-#if REF_IDX_FRAMEWORK
-  Int      m_elRapSliceBEnabled;
-#endif
+  Int       m_elRapSliceBEnabled;
 #if M0040_ADAPTIVE_RESOLUTION_CHANGE
-  Int      m_adaptiveResolutionChange;
+  Int       m_adaptiveResolutionChange;
+#endif
 #endif
 
@@ -868 +866 @@
   Void      setConformanceMode    (Int mode)     { m_conformanceMode = mode; }
   Void      setConformanceWindow(Window& conformanceWindow ) { m_conformanceWindow = conformanceWindow; }
-#endif
-#if REF_IDX_FRAMEWORK
   Void      setElRapSliceTypeB(Int bEnabled) {m_elRapSliceBEnabled = bEnabled;}
   Int       getElRapSliceTypeB()              {return m_elRapSliceBEnabled;}
-#endif
 #if M0040_ADAPTIVE_RESOLUTION_CHANGE
   Void      setAdaptiveResolutionChange(Int x) { m_adaptiveResolutionChange = x;    }
   Int       getAdaptiveResolutionChange()      { return m_adaptiveResolutionChange; }
 #endif
+#endif
 };