Changeset 171 in SHVCSoftware for branches/SHM-2.0-dev/source

Timestamp:

9 May 2013, 20:21:30 (12 years ago)

Author:

seregin

Message:

set VPS for a slice and derive NumDirectRefLayers

Location:

branches/SHM-2.0-dev/source/Lib

Files:

• TLibCommon/TComSlice.cpp (modified) (1 diff)
• TLibEncoder/TEncGOP.cpp (modified) (1 diff)
• TLibEncoder/TEncSlice.cpp (modified) (2 diffs)
• TLibEncoder/TEncSlice.h (modified) (1 diff)

branches/SHM-2.0-dev/source/Lib/TLibCommon/TComSlice.cpp

@@ -185 +185 @@
   if(layerId)
   {
-    m_aiNumILRRefIdx      = 1;  // to be set to NumDirectRefLayers[LayerIdInVps[nuh_layer_id]]
+    m_aiNumILRRefIdx            = m_pcVPS->getNumDirectRefLayers( layerId );
 #if JCTVC_M0458
     m_aiActiveNumILRRefIdx      = 1;         

branches/SHM-2.0-dev/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -483 +483 @@
 #if SVC_EXTENSION
     pcPic->setLayerId( m_layerId );
-#endif
+    m_pcSliceEncoder->initEncSlice ( pcPic, iPOCLast, pocCurr, iNumPicRcvd, iGOPid, pcSlice, m_pcEncTop->getSPS(), m_pcEncTop->getPPS(), m_pcEncTop->getVPS() );
+#else
     m_pcSliceEncoder->initEncSlice ( pcPic, iPOCLast, pocCurr, iNumPicRcvd, iGOPid, pcSlice, m_pcEncTop->getSPS(), m_pcEncTop->getPPS() );
+#endif
     pcSlice->setLastIDR(m_iLastIDR);
     pcSlice->setSliceIdx(0);

branches/SHM-2.0-dev/source/Lib/TLibEncoder/TEncSlice.cpp

@@ -178 +178 @@
  \param pPPS          PPS associated with the slice
  */
+#if SVC_EXTENSION
+//\param vps          VPS associated with the slice
+Void TEncSlice::initEncSlice( TComPic* pcPic, Int pocLast, Int pocCurr, Int iNumPicRcvd, Int iGOPid, TComSlice*& rpcSlice, TComSPS* pSPS, TComPPS *pPPS, TComVPS *vps )
+#else
 Void TEncSlice::initEncSlice( TComPic* pcPic, Int pocLast, Int pocCurr, Int iNumPicRcvd, Int iGOPid, TComSlice*& rpcSlice, TComSPS* pSPS, TComPPS *pPPS )
+#endif
 {
   Double dQP;
@@ -189 +194 @@
   rpcSlice->setPic( pcPic );
 #if SVC_EXTENSION
+  rpcSlice->setVPS( vps );
   rpcSlice->initSlice( pcPic->getLayerId() );
 #else

branches/SHM-2.0-dev/source/Lib/TLibEncoder/TEncSlice.h

@@ -116 +116 @@
   
   /// preparation of slice encoding (reference marking, QP and lambda)
+#if SVC_EXTENSION
+  Void    initEncSlice        ( TComPic*  pcPic, Int pocLast, Int pocCurr, Int iNumPicRcvd,
+                                Int iGOPid,   TComSlice*& rpcSlice, TComSPS* pSPS, TComPPS *pPPS, TComVPS *vps );
+#else
   Void    initEncSlice        ( TComPic*  pcPic, Int pocLast, Int pocCurr, Int iNumPicRcvd,
                                 Int iGOPid,   TComSlice*& rpcSlice, TComSPS* pSPS, TComPPS *pPPS );
+#endif
+
 #if RATE_CONTROL_LAMBDA_DOMAIN
   Void    resetQP             ( TComPic* pic, Int sliceQP, Double lambda );