Changeset 70 in 3DVCSoftware for branches/HTM-3.0-Vidyo/source/Lib/TLibCommon/TComSlice.h

Timestamp:

3 Jun 2012, 21:48:11 (12 years ago)

Author:

vidyo

Message:

 

File:

• branches/HTM-3.0-Vidyo/source/Lib/TLibCommon/TComSlice.h (modified) (6 diffs)

branches/HTM-3.0-Vidyo/source/Lib/TLibCommon/TComSlice.h

@@ -144 +144 @@
 #endif
 
+#if VIDYO_VPS_INTEGRATION
+/// VPS class
+
+class TComVPS
+{
+private:
+  Int         m_VPSId;
+        UInt                            m_uiMaxTLayers;
+        UInt                            m_uiMaxLayers;
+        Bool                            m_bTemporalIdNestingFlag;
+
+        UInt        m_uiExtensionType;
+  
+  Bool        m_bDependentFlag[MAX_LAYER_NUM];
+  UInt        m_uiViewId[MAX_LAYER_NUM];
+  Bool        m_bDepthFlag[MAX_LAYER_NUM];
+  Int         m_iViewOrderIdx[MAX_LAYER_NUM];
+  UInt        m_uiDependentLayer[MAX_LAYER_NUM];
+
+  UInt        m_numReorderPics[MAX_TLAYER];
+  UInt        m_uiMaxDecPicBuffering[MAX_TLAYER]; 
+  UInt        m_uiMaxLatencyIncrease[MAX_TLAYER];
+  
+public:
+  TComVPS();
+  virtual ~TComVPS();
+        
+  Int     getVPSId       ()                   { return m_VPSId;          }
+  Void    setVPSId       (Int i)              { m_VPSId = i;             }
+        
+  UInt    getMaxTLayers  ()                   { return m_uiMaxTLayers;   }
+  Void    setMaxTLayers  (UInt t)             { m_uiMaxTLayers = t; }
+    
+  UInt    getMaxLayers   ()                   { return m_uiMaxLayers;   }
+        Void    setMaxLayers   (UInt l)             { m_uiMaxLayers = l; }
+        
+  Bool    getTemporalNestingFlag   ()         { return m_uiMaxLayers;   }
+        Void    setTemporalNestingFlag   (UInt t)   { m_bTemporalIdNestingFlag = t; }
+  
+  Void    setExtensionType(UInt v)                     { m_uiExtensionType = v;    }
+  UInt    getExtensionType()                             { return m_uiExtensionType; }
+  
+  Void    setDependentFlag(Bool d, UInt layer)              { m_bDependentFlag[layer] = d;    }
+  Bool    getDependentFlag(UInt layer)                      { return m_bDependentFlag[layer]; }
+
+  Void    setViewId(UInt v, UInt layer)                     { m_uiViewId[layer] = v;    }
+  UInt    getViewId(UInt layer)                             { return m_uiViewId[layer]; }
+  
+  Void    setDepthFlag(Bool d, UInt layer)                  { m_bDepthFlag[layer] = d;    }
+  Bool    getDepthFlag(UInt layer)                          { return m_bDepthFlag[layer]; }
+
+  Void    setViewOrderIdx(Int v, UInt layer)                { m_iViewOrderIdx[layer] = v;    }
+  Int     getViewOrderIdx(UInt layer)                       { return m_iViewOrderIdx[layer]; }
+  
+  Void    setDependentLayer(UInt v, UInt layer)                     { m_uiDependentLayer[layer] = v;    }
+  UInt    getDependentLayer(UInt layer)                             { return m_uiDependentLayer[layer]; }
+  
+  Void    setNumReorderPics(UInt v, UInt tLayer)                { m_numReorderPics[tLayer] = v;    }
+  UInt    getNumReorderPics(UInt tLayer)                        { return m_numReorderPics[tLayer]; }
+  
+  Void    setMaxDecPicBuffering(UInt v, UInt tLayer)          { m_uiMaxDecPicBuffering[tLayer] = v;    }
+  UInt    getMaxDecPicBuffering(UInt tLayer)                  { return m_uiMaxDecPicBuffering[tLayer]; }
+  
+  Void    setMaxLatencyIncrease(UInt v, UInt tLayer)                { m_uiMaxLatencyIncrease[tLayer] = v;    }
+  UInt    getMaxLatencyIncrease(UInt tLayer)                        { return m_uiMaxLatencyIncrease[tLayer]; }
+  
+};
+
+#endif
+
 /// SPS class
 class TComSPS
 {
 private:
+#if VIDYO_VPS_INTEGRATION
+        Int                                     m_VPSId;
+#endif
   Int         m_SPSId;
   Int         m_ProfileIdc;
@@ -305 +378 @@
   TComSPS();
   virtual ~TComSPS();
-
+#if VIDYO_VPS_INTEGRATION
+        Int  getVPSId       ()         { return m_VPSId;          }
+  Void setVPSId       (Int i)    { m_VPSId = i;             }
+#endif
   Int  getSPSId       ()         { return m_SPSId;          }
   Void setSPSId       (Int i)    { m_SPSId = i;             }
@@ -1109 +1185 @@
   
   // access channel
+#if VIDYO_VPS_INTEGRATION
+  TComVPS*    m_pcVPS;
+#endif
   TComSPS*    m_pcSPS;
   TComPPS*    m_pcPPS;
@@ -1193 +1272 @@
   Void      initTiles();
 
-  
+#if VIDYO_VPS_INTEGRATION
+  Void      setVPS          ( TComVPS* pcVPS ) { m_pcVPS = pcVPS; }
+  TComVPS*  getVPS          () { return m_pcVPS; }
+#endif
   Void      setSPS          ( TComSPS* pcSPS ) { m_pcSPS = pcSPS; }
   TComSPS*  getSPS          () { return m_pcSPS; }
@@ -1538 +1620 @@
   ParameterSetManager();
   virtual ~ParameterSetManager();
-
+#if VIDYO_VPS_INTEGRATION
+  //! store video parameter set and take ownership of it 
+  Void storeVPS(TComVPS *vps) { m_vpsMap.storePS( vps->getVPSId(), vps); };
+  //! get pointer to existing video parameter set  
+  TComVPS* getVPS(Int vpsId)  { return m_vpsMap.getPS(vpsId); };
+  TComVPS* getFirstVPS()      { return m_vpsMap.getFirstPS(); };
+#endif
   //! store sequence parameter set and take ownership of it 
   Void storeSPS(TComSPS *sps) { m_spsMap.storePS( sps->getSPSId(), sps); };
@@ -1560 +1648 @@
   ParameterSetMap<TComPPS> m_ppsMap; 
   ParameterSetMap<TComAPS> m_apsMap; 
+#if VIDYO_VPS_INTEGRATION
+  ParameterSetMap<TComVPS> m_vpsMap; 
+#endif
 };