Changeset 595 in SHVCSoftware for trunk/source/Lib/TLibDecoder/TDecTop.h

Timestamp:

2 Feb 2014, 06:01:53 (11 years ago)

Author:

seregin

Message:

merge with SHM-5.0-dev branch

Location:

trunk

Files:

• . (modified) (1 prop)
• source (modified) (1 prop)
• source/Lib/TLibDecoder/TDecTop.h (modified) (3 diffs)

trunk/source/Lib/TLibDecoder/TDecTop.h

@@ -4 +4 @@
  * granted under this license.  
  *
- * Copyright (c) 2010-2013, ITU/ISO/IEC
+ * Copyright (c) 2010-2014, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -221 +221 @@
   Void      xInitILRP(TComSPS *pcSPS);
 #endif
-#endif
+#if OUTPUT_LAYER_SET_INDEX
+  CommonDecoderParams*    getCommonDecoderParams() { return m_commonDecoderParams; }
+  Void                    setCommonDecoderParams(CommonDecoderParams* x) { m_commonDecoderParams = x; }
+  Void      checkValueOfTargetOutputLayerSetIdx(TComVPS *vps);
+#endif
+#if SCALINGLIST_INFERRING
+  ParameterSetManagerDecoder* getParameterSetManager() { return &m_parameterSetManagerDecoder; }
+#endif
+#if RESOLUTION_BASED_DPB
+  Void setSubDpbIdx(Int idx)    { m_subDpbIdx = idx; }
+  Int  getSubDpbIdx()           { return m_subDpbIdx; }
+  Void assignSubDpbs(TComVPS *vps);
+#endif
+#endif //SVC_EXTENSION
 #if AVC_SYNTAX || SYNTAX_OUTPUT
   Void      setBLSyntaxFile( fstream* pFile ) { m_pBLSyntaxFile = pFile; }
@@ -256 +269 @@
   Void setNoOutputOfPriorPicsFlags(Bool x)   { m_noOutputOfPriorPicsFlags = x;   }
 #endif
-public:
-#if OUTPUT_LAYER_SET_INDEX
-  CommonDecoderParams*    getCommonDecoderParams() { return m_commonDecoderParams; }
-  Void                    setCommonDecoderParams(CommonDecoderParams* x) { m_commonDecoderParams = x; }
-  Void      checkValueOfTargetOutputLayerSetIdx(TComVPS *vps);
-#endif
-#if SCALINGLIST_INFERRING
-  ParameterSetManagerDecoder* getParameterSetManager() { return &m_parameterSetManagerDecoder; }
-#endif
-#if RESOLUTION_BASED_DPB
-  Void setSubDpbIdx(Int idx)    { m_subDpbIdx = idx; }
-  Int  getSubDpbIdx()           { return m_subDpbIdx; }
-  Void assignSubDpbs(TComVPS *vps);
-#endif
 };// END CLASS DEFINITION TDecTop