Changeset 110 in SHVCSoftware for branches/HM-10.0-dev-SHM/source/Lib/TLibCommon

Timestamp:

3 Apr 2013, 21:34:49 (12 years ago)

Author:

qualcomm

Message:

Signal output layer sets in VPS extension (MACRO: VPS_EXTN_OP_LAYER_SETS)

Include signalling of output layer sets in the VPS extension. Does not include configuration support for specifying the output layer sets.

From: Adarsh K. Ramasubramonian <aramasub@…>

Location:

branches/HM-10.0-dev-SHM/source/Lib/TLibCommon

Files:

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

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

@@ -1474 +1474 @@
 , m_numLayerSets              (0)
 #endif
+#if VPS_EXTN_OP_LAYER_SETS
+, m_numOutputLayerSets        (0)  
+#endif
 {
 
@@ -1482 +1485 @@
     m_uiMaxLatencyIncrease[i] = 0;
   }
+#if VPS_EXTN_OP_LAYER_SETS
+  ::memset(m_layerIdIncludedFlag, 0, sizeof(m_layerIdIncludedFlag));
+  // Consider dynamic allocation for outputLayerSetIdx and outputLayerFlag
+  ::memset(m_outputLayerSetIdx, 0, sizeof(m_outputLayerSetIdx));
+  ::memset(m_outputLayerFlag, 0, sizeof(m_outputLayerFlag));
+#endif
 }
 

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

@@ -507 +507 @@
 #endif
 
+  // ------------------------------------------
+  // Variables related to VPS extensions
+  // ------------------------------------------
+#if VPS_EXTN_OP_LAYER_SETS
+  // .. More declarations here
+  // Target output layer signalling related
+  UInt       m_numOutputLayerSets;
+  UInt       m_outputLayerSetIdx[MAX_VPS_LAYER_SETS_PLUS1];
+  Bool       m_outputLayerFlag[MAX_VPS_LAYER_SETS_PLUS1][MAX_VPS_LAYER_ID_PLUS1];
+  // .. More declarations here
+#endif
+
 public:
   TComVPS();
@@ -570 +582 @@
 #if L0043_TIMING_INFO
   TimingInfo* getTimingInfo() { return &m_timingInfo; }
+#endif
+
+#if VPS_EXTN_OP_LAYER_SETS
+  // Target output layer signalling related
+  UInt   getNumOutputLayerSets()                                { return m_numOutputLayerSets;     } 
+  Void   setNumOutputLayerSets(Int x)                           { m_numOutputLayerSets = x;        }
+  
+  UInt   getOutputLayerSetIdx(Int idx)                          { return m_outputLayerSetIdx[idx]; }
+  Void   setOutputLayerSetIdx(Int idx, UInt x)                  { m_outputLayerSetIdx[idx] = x;    }
+
+  Bool   getOutputLayerFlag(Int layerSet, Int layerId)          { return m_outputLayerFlag[layerSet][layerId]; }
+  Void   setOutputLayerFlag(Int layerSet, Int layerId, Bool x)  { m_outputLayerFlag[layerSet][layerId] = x;    }
 #endif
 };

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

@@ -46 +46 @@
 #define VPS_RENAME                       1      ///< Rename variables max_layer_id and num_layer_sets_minus1 in VPS
 #define VPS_EXTNS                        1      ///< Include function structure for VPS extensions
+#if VPS_EXTNS
+#define VPS_EXTN_OP_LAYER_SETS           1      ///< Include output layer sets in VPS extension
+#endif
 #define MAX_LAYERS                       2      ///< max number of layers the codec is supposed to handle
 
@@ -135 +138 @@
 #if VPS_RENAME
 #define MAX_VPS_LAYER_SETS_PLUS1                  1024
-#define MAX_VPS_LAYER_ID_PLUS1                    1
+#define MAX_VPS_LAYER_ID_PLUS1                    2
 #else
 #define MAX_VPS_NUM_HRD_PARAMETERS                1