Changeset 1494 in SHVCSoftware for branches

Timestamp:

3 Dec 2015, 01:27:13 (9 years ago)

Author:

seregin

Message:

add VPS to swapSliceObject

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

• TComPicSym.h (modified) (1 diff)
• TComSlice.h (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibCommon/TComPicSym.h

@@ -154 +154 @@
   const TComPPS&     getPPS()                 const                        { return m_pps; }
 
+#if SVC_EXTENSION
+  TComSlice *        swapSliceObject(TComSlice* p, UInt i)                 { p->setVPS(m_vps); p->setSPS(&m_sps); p->setPPS(&m_pps); TComSlice *pTmp=m_apSlices[i];m_apSlices[i] = p; pTmp->setVPS(0); pTmp->setSPS(0); pTmp->setPPS(0); return pTmp; }
+#else
   TComSlice *        swapSliceObject(TComSlice* p, UInt i)                 { p->setSPS(&m_sps); p->setPPS(&m_pps); TComSlice *pTmp=m_apSlices[i];m_apSlices[i] = p; pTmp->setSPS(0); pTmp->setPPS(0); return pTmp; }
+#endif
   UInt               getNumAllocatedSlice() const                          { return UInt(m_apSlices.size());       }
   Void               allocateNewSlice();

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

@@ -2102 +2102 @@
 #else
   Void                        initSlice();
-#endif
 
   Void                        setVPS( TComVPS* pcVPS )                               { m_pcVPS = pcVPS;                                              }
+#endif
   const TComVPS*              getVPS() const                                         { return m_pcVPS;                                               }
   Void                        setSPS( const TComSPS* pcSPS )                         { m_pcSPS = pcSPS;                                              }