Changeset 588 in SHVCSoftware for trunk/source/Lib/TLibCommon/CommonDef.h

Timestamp:

1 Feb 2014, 23:50:54 (11 years ago)

Author:

seregin

Message:

merge with SHM-5.0-dev

Location:

trunk

Files:

• . (modified) (1 prop)
• source (modified) (1 prop)
• source/Lib/TLibCommon/CommonDef.h (modified) (4 diffs)

trunk/source/Lib/TLibCommon/CommonDef.h

@@ -57 +57 @@
 #if SVC_EXTENSION
 #include <vector>
-#define NV_VERSION        "4.1"                 ///< Current software version
+#define NV_VERSION        "5.0 (HM-12.1)"                 ///< Current software version
 #else
 #define NV_VERSION        "12.1"                ///< Current software version
@@ -284 +284 @@
 {
   Int m_targetLayerId;
-  Int m_outputLayerSetIdx;
+  Int m_targetOutputLayerSetIdx;
   std::vector<Int> *m_targetDecLayerIdSet; 
   Bool m_valueCheckedFlag;
@@ -290 +290 @@
   CommonDecoderParams(): 
     m_targetLayerId(0)
-    , m_outputLayerSetIdx(-1)
+    , m_targetOutputLayerSetIdx(-1)
     , m_targetDecLayerIdSet(NULL)
     , m_valueCheckedFlag(false)
@@ -298 +298 @@
   Int  getTargetLayerId()            { return m_targetLayerId;}
   
-  Void setOutputLayerSetIdx(const Int x) { m_outputLayerSetIdx = x;   }
-  Int  getOutputLayerSetIdx()            { return m_outputLayerSetIdx;}
+  Void setTargetOutputLayerSetIdx(const Int x) { m_targetOutputLayerSetIdx = x;   }
+  Int  getTargetOutputLayerSetIdx()            { return m_targetOutputLayerSetIdx;}
 
   Void               setTargetDecLayerIdSet(std::vector<Int> *x) { m_targetDecLayerIdSet = x;   }